修改

miniprogram/components/navigation-bar/navigation-bar.ts

@@ -64,6 +64,7 @@ Component({
       const wxWindowInfo = wx.getWindowInfo()
       const isAndroid = wxDeviceInfo.platform === 'android'
       const isDevtools = wxDeviceInfo.platform === 'devtools'
+      console.log(wxWindowInfo, wxDeviceInfo, 'wxDeviceInfo----')
       this.setData({
         ios: !isAndroid,
         innerPaddingRight: `padding-right: ${wxWindowInfo.windowWidth - rect.left}px`,

miniprogram/pages/index/index.ts

@@ -12,11 +12,11 @@ Page({
    */
   data: {
     imgList: [
-      'https://oss.dayaedu.com/ktyq/1732101023155.png',
-      'https://oss.dayaedu.com/ktyq/1732101058157.png',
-      'https://oss.dayaedu.com/ktyq/1732101072881.png',
-      'https://oss.dayaedu.com/ktyq/1732101091093.png',
-      'https://oss.dayaedu.com/ktyq/1732101102921.png',
+      'https://oss.dayaedu.com/ktyq/1732613770828.png',
+      'https://oss.dayaedu.com/ktyq/1732613781003.png',
+      'https://oss.dayaedu.com/ktyq/1732613795513.png',
+      'https://oss.dayaedu.com/ktyq/1732613807112.png',
+      // 'https://oss.dayaedu.com/ktyq/1732101102921.png',
     ],
     
     goodsImgList: [

miniprogram/pages/index/index.wxml

@@ -2,7 +2,7 @@
 <scroll-view class="scrollarea" scroll-y="{{popupShow ? false : true}}" type="list">
   <view class="container">
     <!-- <view class="topShadow"></view> -->
-    <view class="slider-count">{{current + 1}}/{{5}}</view>
+    <view class="slider-count">{{current + 1}}/{{imgList.length}}</view>
     <swiper indicator-dots="{{false}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" bindchange="changeSwiper">
       <swiper-item wx:for="{{imgList}}" wx:key="index">
         <view class="swiper-item">

miniprogram/pages/orders/order-result.less

@@ -325,5 +325,11 @@ page {
     font-size: 32rpx;
     color: #FFFFFF;
     line-height: 44rpx;
+    &[disabled][type=primary] {
+      color: #fff;
+      background: linear-gradient( 315deg, #FF4A00 0%, #FE8C00 100%);
+      color: #FFFFFF;
+      opacity: 0.7;
+    }
   }
 }

miniprogram/pages/orders/order-result.ts

@@ -1,6 +1,6 @@
 // pages/orders/order-detail.ts
 import drawQrcode from "../../utils/weapp.qrcode.esm";
-import { api_userPaymentCancelRefund, api_userPaymentOrderDetail, api_userPaymentOrderRefundPayment } from "../../api/login";
+import { api_userPaymentCancelRefund, api_userPaymentOrderDetail } from "../../api/login";
 
 // 获取应用实例
 Page({
@@ -48,7 +48,8 @@ Page({
     orderNo: "" as string,
     showCanvas: false, // 是否显示二维码
     canvasImg: "" as string,
-    refoundStatus: false
+    refoundStatus: false,
+    cancelRefoundStatus: false
   },
 
   /**
@@ -213,21 +214,25 @@ Page({
   },
   /** 申请退款 */
   async cancelRefound() {
-    try {
-      const {data} = await api_userPaymentCancelRefund(this.data.goodsInfo.refundOrderId)
-      // console.log(data, 'data')
-      if(data.code == 200) {
-        wx.showToast({ title: '你已成功取消退款', icon: 'none' })
-        // setTimeout(() => {
-        //   wx.navigateBack({
-        //     delta: 1
-        //   })
-        // }, 1000);
-        this.getDetail()
-      } else {
-        wx.showToast({ title: data.message, icon: 'none' })
-      }
-    } catch {}
+    this.setData({
+      cancelRefoundStatus: true
+    }, async () => {
+      try {
+        const {data} = await api_userPaymentCancelRefund(this.data.goodsInfo.refundOrderId)
+        // console.log(data, 'data')
+        if(data.code == 200) {
+          wx.showToast({ title: '取消退款成功', icon: 'none' })
+          this.getDetail()
+        } else {
+          wx.showToast({ title: data.message, icon: 'none' })
+        }
+        setTimeout(() => {
+          this.setData({
+            cancelRefoundStatus: false
+          })
+        }, 500);
+      } catch {}
+    })
   },
   /** 申请退款 */
   useRefound() {

miniprogram/pages/orders/order-result.wxml

@@ -76,7 +76,7 @@
   <view class="order-btn" wx:if="{{ goodsInfo.wechatStatus != 'WAIT_PAY' }}">
     <!-- <button type="primary" bind:tap="useRefound" wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' }}">申请退款</button>
     <block wx:else> -->
-      <button type="primary" bind:tap="cancelRefound" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDING' }}">取消退款</button>
+      <button type="primary" bind:tap="cancelRefound" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDING' }}" disabled="{{cancelRefoundStatus}}">取消退款</button>
       <button type="primary" wx:else bind:tap="onSubmit">再次购买</button>
     <!-- </block> -->
   </view>

miniprogram/pages/orders/orders.less

@@ -88,7 +88,7 @@ page {
     padding-bottom: 24rpx;
     
     .item-mid {
-      color: #131415;
+      color: #999999;
     }
 
     > text {

miniprogram/pages/orders/orders.ts

@@ -43,7 +43,7 @@ Page({
     recordList: [],
     maxPage: 1, // 总分页数
     refoundStatus: false,
-    cancelRefoundStatus: true,
+    cancelRefoundStatus: false,
     goodsInfo: {}, // 选中的数据
   },