lex-xin 4 달 전
부모
커밋
d23c0b4b36
3개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 1
      miniprogram/pages/orders/order-result.ts
  2. 1 1
      miniprogram/pages/orders/order-result.wxml
  3. 2 2
      miniprogram/pages/orders/orders.ts

+ 3 - 1
miniprogram/pages/orders/order-result.ts

@@ -45,6 +45,7 @@ Page({
     timerCount: 0,
     timer: null as any,
     goodsInfo: {} as any,
+    tabIdx: 0, // 当前是从哪个tab来的
     orderNo: "" as string,
     showCanvas: false, // 是否显示二维码
     canvasImg: "" as string,
@@ -57,7 +58,8 @@ Page({
   onLoad(options: any) {
     if (options.orderNo) {
       this.setData({
-        orderNo: options.orderNo
+        orderNo: options.orderNo,
+        tabIdx: options.tabIdx
       }, () => {
         this.getDetail(this.onTimeout)
       });

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

@@ -75,7 +75,7 @@
   <canvas class='my_draw_canvas only_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas>
 
   <view class="order-btn" wx:if="{{ goodsInfo.wechatStatus != 'WAIT_PAY' }}">
-    <button type="primary" bind:tap="useRefound" wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' }}">申请退款</button>
+    <button type="primary" bind:tap="useRefound" wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' && tabIdx == 5 }}">申请退款</button>
     <block wx:else>
       <button type="primary" bind:tap="cancelRefound" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDING' }}">取消退款</button>
       <button type="primary" wx:else bind:tap="onSubmit">再次购买</button>

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

@@ -30,7 +30,7 @@ Page({
         label: "已取消",
       },
       {
-        id: 5,
+        id: 5, // 改编号会影响详情页的退款按钮
         label: "售后",
       },
     ],
@@ -207,7 +207,7 @@ Page({
       this.onSubmit({orderNo: dataset.orderno})
     } else {
       wx.navigateTo({
-        url: '../orders/order-result?orderNo=' + dataset.orderno
+        url: `../orders/order-result?orderNo=${dataset.orderno}&tabIdx=${this.data.tabIdx}`
       })
     }
   },