lex-xin 3 months ago
parent
commit
32a9a52fbd

+ 9 - 7
miniprogram/components/apply-refound/apply-refound.less

@@ -26,10 +26,10 @@
     border-radius: 32rpx 32rpx 0rpx 0rpx;
     .icon-close {
       position: absolute;
-      width: 38rpx;
-      height: 38rpx;
-      top: 40rpx;
-      right: 40rpx;
+      right: 44rpx;
+      top: 44rpx;
+      width: 30rpx;
+      height: 30rpx;
     }
     .use-title {
       font-weight: 600;
@@ -43,11 +43,13 @@
     .use-form {
       background: #F7F8F9;
       border-radius: 20rpx;
-      padding: 22rpx 24rpx 24rpx 30rpx;
+      padding: 22rpx 24rpx 24rpx 30rpx !important;
       textarea {
-        height: 140rpx;
+        height: 180rpx;
         font-size: 30rpx;
         width: 100%;
+        padding: 0;
+        margin: 0;
         &::placeholder {
           color: #AAAAAA;
         }
@@ -98,7 +100,7 @@
         padding: 22rpx 84rpx;
         font-weight: 500;
         font-size: 32rpx;
-        color: #FBEAC9;
+        color: #fff;
         line-height: 44rpx;
       }
     }

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

@@ -1,6 +1,6 @@
 <!--components/apply-refound/apply-refound.wxml-->
 <view class="useRefound-pop" wx:if="{{ refoundStatus }}">
-    <view class="useRefound-mask"></view>
+    <view class="useRefound-mask" bind:tap="onRefoundClose"></view>
     <view class="useRefound-container">
       <image bind:tap="onRefoundClose" class="icon-close" src="./images/icon-close.png"></image>
       <view class="use-title">申请退款</view>
@@ -12,7 +12,7 @@
         </view>
       </view>
       <view class="use-form__input">
-        <view class="title"><text class="red">*</text>联系方式 <text class="sencd">(必填)</text></view>
+        <view class="title"><text class="red">*</text>联系方式</view>
         <input placeholder="请输入手机号码" type="number" maxlength="11" bindinput="phoneInput" value="{{ refoundPhone }}"></input>
       </view>
       <view class="btnSection">

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


+ 1 - 1
miniprogram/components/service/service.wxml

@@ -2,7 +2,7 @@
 <view class="service-container" wx:if="{{ popShow }}">
   <view class="service-mask" bind:tap="onClose"></view>
   <view class="service-section" bind:tap="onClose">
-    <image src="https://oss.dayaedu.com/ktyq/1732607920916.png" data-src="https://oss.dayaedu.com/ktyq/1732607920916.png" mode="aspectFill" catch:tap="onOpen" show-menu-by-longpress="true" catch:longtap="onPerview" class="iconImg"></image>
+    <image src="https://oss.dayaedu.com/ktyq/1732682074265.png" data-src="https://oss.dayaedu.com/ktyq/1732682074265.png" mode="aspectFill" catch:tap="onOpen" show-menu-by-longpress="true" catch:longtap="onPerview" class="iconImg"></image>
 
     <image src="./images/icon-close.png" catch:tap="onClose" class="iconClose"></image>
   </view>

BIN
miniprogram/pages/index/images/icon-close.png


+ 8 - 6
miniprogram/pages/index/index.less

@@ -62,7 +62,7 @@ page {
   background: #FFFFFF;
   border-radius: 20rpx;
   margin: 16rpx 16rpx 0;
-  padding: 24rpx;
+  padding: 24rpx 24rpx 40rpx;
   .showPrice {
     display: flex;
     justify-content: space-between;
@@ -78,6 +78,7 @@ page {
     color: #FE2451;
     font-family: DINAlternate, DINAlternate;
     .stuff {
+      padding-right: 2rpx;
       font-size: 36rpx;
     }
     .priceZ {
@@ -283,10 +284,10 @@ page {
 
   .iconClose {
     position: absolute;
-    right: 40rpx;
-    top: 40rpx;
-    width: 38rpx;
-    height: 38rpx;
+    right: 44rpx;
+    top: 44rpx;
+    width: 30rpx;
+    height: 30rpx;
   }
 
   .product-section {
@@ -312,6 +313,7 @@ page {
         color: #FE2451;
         font-family: DINAlternate, DINAlternate;
         .stuff {
+          padding-right: 2rpx;
           font-size: 36rpx;
         }
         .priceZ {
@@ -327,7 +329,7 @@ page {
         color: #AAAAAA;
         line-height: 44rpx;
         text-decoration: line-through;
-        padding-top: 30rpx;
+        padding-top: 32rpx;
       }
     }
   }

+ 26 - 4
miniprogram/pages/index/index.ts

@@ -33,6 +33,7 @@ Page({
     isOverSaled: false, // 是否所有商品都没有库存
     selected: {} as any,
     showService: false,
+    isFromPreviewImage: false
   },
 
   /**
@@ -190,25 +191,46 @@ Page({
   onPreivewBannerImg(e: { currentTarget: { dataset: any } }) {
     wx.previewImage({
       current: e.currentTarget.dataset.src,
-      urls: this.data.imgList
+      urls: this.data.imgList,
+      success: () => {
+        this.setData({
+          isFromPreviewImage: true
+        })
+      }
     })
   },
   onPreivewGoodsImg(e: { currentTarget: { dataset: any } }) {
     wx.previewImage({
       current: e.currentTarget.dataset.src,
-      urls: this.data.goodsImgList
+      urls: this.data.goodsImgList,
+      success: () => {
+        this.setData({
+          isFromPreviewImage: true
+        })
+      }
     })
   },
   onPreivewGoods(e: { currentTarget: { dataset: any } }) {
     wx.previewImage({
       current: e.currentTarget.dataset.src,
-      urls: [e.currentTarget.dataset.src]
+      urls: [e.currentTarget.dataset.src],
+      success: () => {
+        this.setData({
+          isFromPreviewImage: true
+        })
+      }
     })
   },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    this.onInit()
+    if(!this.data.isFromPreviewImage) {
+      this.onInit()
+    } else {
+      this.setData({
+        isFromPreviewImage: false
+      })
+    }
   },
 })

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

@@ -64,7 +64,7 @@
     </view>
 
     <view class="popup-section" wx:if="{{popupShow}}">
-      <view class="popup-mask"></view>
+      <view class="popup-mask" bind:tap="onClose"></view>
       <view class="popup-container">
         <image bind:tap="onClose" src="./images/icon-close.png" class="iconClose"></image>
 

+ 2 - 0
miniprogram/pages/login/login.less

@@ -47,6 +47,8 @@
     padding-top: 80rpx;
     font-size: 26rpx;
     color: #3C3C3C;
+    width: 100%;
+    text-align: center;
     line-height: 36rpx;
     .radioSection {
       height: 36rpx;

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

@@ -169,7 +169,7 @@ page {
     .desc {
       font-weight: 500;
       font-size: 28rpx;
-      color: #131415;
+      color: #777;
       line-height: 40rpx;
       padding-top: 20rpx;
       flex-shrink: 0;

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

@@ -52,7 +52,7 @@
         </view>
       </view>
 
-      <view class="order-time" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDED' }}">
+      <view class="order-time" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDED' || goodsInfo.wechatStatus == 'REFUNDING' }}">
         <view class="order-item">
           <view class="title">{{ goodsInfo.wechatStatus == 'REFUNDED' ? '退款时间' : '申请退款时间' }}</view>
           <view class="value">{{ goodsInfo.refundTime }}</view>
@@ -61,7 +61,7 @@
           <view class="title">退款金额</view>
           <view class="value red">¥{{ goodsInfo.refundAmount }}</view>
         </view>
-        <view class="order-item">
+        <view class="order-item" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDED' }}">
           <view class="title">退款路径</view>
           <view class="value">{{ goodsInfo.refundStyleStr }}</view>
         </view>

+ 1 - 1
project.config.json

@@ -14,7 +14,7 @@
     },
     "coverView": false,
     "postcss": false,
-    "minified": false,
+    "minified": true,
     "enhance": true,
     "showShadowRootInWxmlPanel": false,
     "packNpmRelationList": [],

+ 14 - 1
project.private.config.json

@@ -4,5 +4,18 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.5.8"
+  "libVersion": "3.5.8",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "pages/login/login",
+          "pathName": "pages/login/login",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        }
+      ]
+    }
+  }
 }