Merge remote-tracking branch 'origin/master'

rk

2025-08-21 c76bbf920f7ea32d2c604cdc529b865950ea24ac

 small-program/pages/withdrawal/withdrawal.vue

@@ -35,9 +35,39 @@
      data() {
         return {
            tips:'',//
            wxTips:'',
            canTransfer:false,
            changing1:false,
            amount: null
         };
      },
      onLoad(){
         var that =this
         that.canTransfer = false
         if (wx.canIUse('requestMerchantTransfer')) {
            //that.tips='您的微信版本支持该功能'
            that.canTransfer = true
         }else{
            that.tips='您的微信版本过低，请更新至最新版本使用该功能'
            uni.showToast({
               title:'您的微信版本过低，请更新至最新版本使用该功能。'
            })
         }
         /* wx.ready(function () {
           wx.checkJsApi({
             jsApiList: ['requestMerchantTransfer'],
             success: function (res) {
               if (res.checkResult['requestMerchantTransfer']) {
                  that.canTransfer = true
               } else {
                 that.tips='您的微信版本过低，请更新至最新版本使用该功能'
                 uni.showToast({
                    title:'您的微信版本过低，请更新至最新版本使用该功能。'
                 })
               }
             }
           });
         }); */
      },
      methods: {
         jump() {
@@ -51,7 +81,45 @@
         changeAmount(){
            this.tips=''
         },
         wxMerchantTransfer(param){	
            wx.requestMerchantTransfer({
                mchId: param.mchId,
                appId: param.appId,
                package: param.packageInfo,
                success: (res) => {
                  // res.err_msg将在页面展示成功后返回应用时返回ok，并不代表付款成功
                  uni.navigateTo({
                     url: '/pages/withdrawal-successful/withdrawal-successful'
                  })
                },
                fail: (res) => {
                  uni.showToast({
                     title:'对不起，提现失败。'+res.err_msg
                  })
                },
              });
            /* WeixinJSBridge.invoke('requestMerchantTransfer',param,
              function (res) {
               if (res.err_msg === 'requestMerchantTransfer:ok') {
                 // res.err_msg将在页面展示成功后返回应用时返回success，并不代表付款成功
                 uni.navigateTo({
                    url: '/pages/withdrawal-successful/withdrawal-successful'
                 })
               }else{ 
                  uni.showToast({
                     title:'对不起，提现失败。'+res.err_msg
                  })
               }
              }
            );    */			      
         },
         submit() {
              if(!this.canTransfer){
                 uni.showToast({
                    title:'您的微信版本过低，请更新至最新版本使用该功能。'
                 })
                 return;
              }
              if(this.changing1){
                  return
              }
@@ -72,9 +140,10 @@
              that.$u.api.applyWithdrawal(param)
              .then(res =>{
                  if(res.code ===200){
                     uni.navigateTo({
                        url: '/pages/withdrawal-successful/withdrawal-successful'
                     })
                     that.wxMerchantTransfer(res.data);
                     // uni.navigateTo({
                     //    url: '/pages/withdrawal-successful/withdrawal-successful'
                     // })
                  } 
               }).finally(() => {
                  that.changing1 = false