lex-xin 7 months ago
parent
commit
230a19ec4f

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

@@ -3,7 +3,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/1732174608277.png" data-src="https://oss.dayaedu.com/ktyq/1732174608277.png" mode="aspectFill" catch:tap="onOpen" show-menu-by-longpress="true" catch:longtap="onPerview" class="iconImg"></image>
+      <image src="https://oss.dayaedu.com/ktyq/1732273441507.png" data-src="https://oss.dayaedu.com/ktyq/1732273441507.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>

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

@@ -25,6 +25,7 @@ Page({
     scrolIntoViewStr: '',
     scrolIntoView: '',
     scrollDiscount: false, // 是否扣减启
+    isScrollTT: false,
     scrollIntoViewType: false,
     headerHeight: 0, // 头部的高度
   },
@@ -210,9 +211,16 @@ Page({
         scrollTop: this.data.scrollDiscount ? top - this.data.headerHeight : top,
         scrollIntoViewType: false,
         scrollDiscount: false,
+        isScrollTT: true,
       })
     } else {
-      this.onChangeScroll()
+      if(!this.data.isScrollTT) {
+        this.onChangeScroll()
+      } else {
+        this.setData({
+          isScrollTT: false,
+        })
+      }
     }
   },
   onChangeScroll() {
@@ -237,9 +245,7 @@ Page({
           })
         }
       }).exec();
-    }, 600)()
-    
-    
+    }, 100)()
   },
   onTapAnchor(e: { currentTarget: { dataset: any } }) {
     const type = e.currentTarget.dataset.type

+ 6 - 5
miniprogram/pages/orders/order-result.ts

@@ -13,22 +13,22 @@ Page({
     statusList: {
       WAIT_PAY: {
         logo: './images/ing.png',
-        title: '待付款',
+        title: '待付款',
         content: '请尽快完成支付,以便我们为您处理订单'
       },
       PAID: {
         logo: './images/success.png',
-        title: '交易完成',
+        title: '完成',
         content: '登录「音乐数字课堂」APP使用AI学练'
       },
       CLOSED: {
         logo: './images/error.png',
-        title: '交易取消',
+        title: '取消',
         content: '您的交易订单已关闭'
       },
       WAIT_USE: {
         logo: './images/wait.png',
-        title: '待使用',
+        title: '待使用',
         content: '请尽快扫描下方二维码进行激活'
       },
       REFUNDING: {
@@ -186,6 +186,7 @@ Page({
                 this.setData({
                   canvasImg: res.tempFilePath,
                 });
+                // console.log(res.tempFilePath, 'res.tempFilePath', 'https://oss.dayaedu.com/ktyq/1732174043543.png')
               },
             },
             this
@@ -219,7 +220,7 @@ Page({
   async cancelRefound() {
     try {
       const {data} = await api_userPaymentCancelRefund(this.data.goodsInfo.refundOrderId)
-      console.log(data, 'data')
+      // console.log(data, 'data')
       if(data.code == 200) {
         wx.showToast({ title: '取消退款成功', icon: 'none' })
         // setTimeout(() => {

+ 3 - 4
miniprogram/pages/orders/order-result.wxml

@@ -40,17 +40,16 @@
         <view class="value">{{ goodsInfo.createTime }}</view>
       </view>
     </view>
-
     <view class="order-content" wx:if="{{ (goodsInfo.wechatStatus == 'PAID' || goodsInfo.wechatStatus == 'WAIT_USE') && showCanvas }}">
       <view class="qrcode-title" >{{ goodsInfo.wechatStatus == 'WAIT_USE' ? '请扫码激活' : '激活码已使用' }}</view>
       <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" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}">请<text>扫描下方二维码</text>激活</view>
         <view class="qrcode-text used" wx:else>登录「音乐数字课堂」APP,开启AI学练之旅~</view>
         <view class="qrcode-block">
-          <view class="left-text">{{goodsInfo.wechatStatus == 'PAID' ? '待使用' : '已使用'}}</view>
+          <view class="left-text">{{goodsInfo.wechatStatus == 'WAIT_USE' ? '待使用' : '已使用'}}</view>
           <view class="qrcode-wrap">
-            <image src="{{canvasImg}}" class='my_draw_canvas' show-menu-by-longpress="true"></image>
+            <image src="{{canvasImg}}" mode="scaleToFill" class='my_draw_canvas' style="opacity: {{ goodsInfo.wechatStatus == 'PAID' ? 0.5 : 1 }};" show-menu-by-longpress="true"></image>
           </view>
         </view>
       </view>

+ 7 - 7
miniprogram/pages/orders/orders.ts

@@ -130,12 +130,12 @@ Page({
   formatOrderStatus(status: string) {
     // 订单状态 WAIT_PAY:待付款,  WAIT_USE:待使用, SUCCESS:已完成, CLOSE:已取消
     const template: any = {
-      WAIT_PAY: '待付款',
-      WAIT_USE: '待使用',
-      PAID: '交易完成',
-      CLOSED: '交易取消',
-      REFUNDING: '售后中',
-      REFUNDED: '售后成功'
+      WAIT_PAY: '待付款',
+      WAIT_USE: '待使用',
+      PAID: '完成',
+      CLOSED: '取消',
+      REFUNDING: '退款中',
+      REFUNDED: '退款成功'
     }
     return template[status]
   },
@@ -271,7 +271,7 @@ Page({
       signType: prePayInfo.signType ? prePayInfo.signType : 'MD5',
       success() {
         wx.showToast({ title: '支付成功', icon: 'success' });
-        that.onRefoundComfirm()
+        // that.onRefoundComfirm()
       },
       fail(ressonInfo) {
         console.log('支付失败', ressonInfo)

+ 7 - 0
project.private.config.json

@@ -9,6 +9,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/login/login",
+          "pathName": "pages/login/login",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/orders/orders",
           "pathName": "pages/orders/orders",
           "query": "",