lex-xin пре 3 месеци
родитељ
комит
2f56b1672b

+ 2 - 2
miniprogram/components/apply-refound/apply-refound.less

@@ -24,8 +24,8 @@
     border-radius: 32rpx 32rpx 0rpx 0rpx;
     .icon-close {
       position: absolute;
-      width: 38rpx;
-      height: 38rpx;
+      width: 30rpx;
+      height: 30rpx;
       top: 40rpx;
       right: 40rpx;
     }

BIN
miniprogram/components/apply-refound/images/icon-close.png


+ 2 - 2
miniprogram/pages/index/index.less

@@ -545,8 +545,8 @@ page {
     position: absolute;
     right: 40rpx;
     top: 40rpx;
-    width: 38rpx;
-    height: 38rpx;
+    width: 30rpx;
+    height: 30rpx;
   }
 
 

+ 7 - 1
miniprogram/pages/index/index.ts

@@ -239,7 +239,8 @@ Page({
     const top = e.detail.scrollTop || 0 
     // 从100开始显示
     this.setData({
-      opacity: top < 100 ? 0 : (top - 100) > 150 ? 1 : (top - 100) / 150
+      // opacity: top < 100 ? 0 : (top - 100) > 150 ? 1 : (top - 100) / 150
+      opacity: top < 100 ? 0 : (top - 100) > 150 ? 1 : 1
     })
     if(this.data.scrollIntoViewType) {
       this.setData({
@@ -290,5 +291,10 @@ Page({
       scrollDiscount: type !== 'type3' ? true : false,
       scrollIntoViewType: true,
     })
+  },
+  onLookMore() {
+    this.setData({
+      popupShow: true
+    })
   }
 })

+ 1 - 1
miniprogram/pages/index/index.wxml

@@ -55,7 +55,7 @@
             </view>
           </view>
         </view>
-        <image wx:if="{{ list.length > 3 }}" class="iconMore" src="./images/icon-more.png"></image>
+        <image wx:if="{{ list.length > 3 }}" bind:tap="onLookMore" class="iconMore" src="./images/icon-more.png"></image>
       </view>
 
       <!-- 有选择商品的时候  -->

+ 1 - 1
miniprogram/pages/orders/order-detail.ts

@@ -13,7 +13,7 @@ Page({
     statusList: {
       ing: {
         logo: './images/ing.png',
-        title: '等待付款',
+        title: '确认订单',
         content: '请尽快完成支付,以便我们为您处理订单'
       },
     },

+ 7 - 6
miniprogram/pages/orders/order-result.less

@@ -122,10 +122,10 @@ page {
   left: 50%;
   right: 0;
   bottom: 0;
-  margin-top: -50rpx;
-  margin-left: -50rpx;
+  margin-top: -25rpx;
+  margin-left: -25rpx;
   z-index: 9;
-  width: 100rpx;
+  width: 50rpx;
   aspect-ratio: 1;
   border-radius: 50%;
   background: 
@@ -212,14 +212,15 @@ page {
     width: 202rpx;
     height: 202rpx;
     background-color: #fff;
+    padding: 6rpx;
   }
   .qrcode-text {
     font-size: 28rpx;
-    color: #131415;
+    color: #777;
     line-height: 40rpx;
     border-radius: 12rpx;
-    font-size: 24rpx;
-    border: 2rpx solid #F2F2F2;
+    font-size: 26rpx;
+    border: 2rpx solid #ECCEA0;
     padding: 16rpx 24rpx;
     text-align: left;
     text {

+ 1 - 1
miniprogram/pages/orders/order-result.wxml

@@ -45,7 +45,7 @@
       <view class="qrcode-line"></view>
       <view class="qrcode-section">
         <view class="qrcode-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}">请<text>扫描下方二维码</text>激活</view>
-        <view class="qrcode-text used" wx:else>登录「音乐数字课堂」APP,开启AI学练之旅~</view>
+        <view class="qrcode-text used" wx:else>登录<text>「音乐数字课堂」</text>APP,开启AI学练之旅~</view>
         <view class="qrcode-block">
           <view class="left-text">{{goodsInfo.wechatStatus == 'WAIT_USE' ? '待使用' : '已使用'}}</view>
           <view class="qrcode-wrap">

+ 4 - 4
miniprogram/pages/orders/orders.less

@@ -148,7 +148,7 @@ page {
         font-size: 26rpx;
         color: #A76D1C;
         line-height: 36rpx;
-        padding: 0 12rpx;
+        padding: 2rpx 12rpx 0;
       }
       .goods-num {
         font-size: 28rpx;
@@ -182,7 +182,7 @@ page {
 
     button {
       margin: 0;
-      border-radius: 36rpx;
+      border-radius: 76rpx;
       background-color: #FFFFFF;
       border: 2rpx solid #DCDCDC;
       font-weight: 500;
@@ -194,9 +194,9 @@ page {
     }
     .sure {
       background: linear-gradient( 90deg, #544F4A 0%, #302F2B 100%);
-      border-radius: 26rpx;
+      border-radius: 76rpx;
       border: none;
-      color: #FFFFFF;
+      color: #FBEAC9;
     }
   }
 }