chengjunhui преди 2 часа
родител
ревизия
a777e6c5bb

+ 2 - 2
app.js

@@ -7,9 +7,9 @@ App({
   /**
    * 全局变量
    */
-  // apiRoot: "https://qingyunhui.songlanyun.com/qyh/api/", // 正式环境api地址
+  apiRoot: "https://qingyunhui.songlanyun.com/qyh/api/", // 正式环境api地址
   // apiRoot: 'http://192.168.0.101:8687/qyh/api/',
-  apiRoot: 'http://192.168.0.68:8687/qyh/api/',
+  // apiRoot: 'http://192.168.0.68:8687/qyh/api/',
 
   // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.232:8687/wjxy/api/', //黄理志

BIN
assets/images/tabbar/tab1.png


BIN
assets/images/tabbar/tab11.png


BIN
assets/images/tabbar/tab2.png


BIN
assets/images/tabbar/tab22.png


BIN
assets/images/tabbar/tab3.png


BIN
assets/images/tabbar/tab33.png


BIN
assets/images/tabbar/tab4.png


BIN
assets/images/tabbar/tab44.png


BIN
assets/images/tabbar/tab5.png


BIN
assets/images/tabbar/tab55.png


+ 26 - 8
pages/my/myWallet/index.js

@@ -242,20 +242,38 @@ Page({
       },
       (res) => {
         if (res.code === 0) {
+          if (!res.data.packageInfo) {
+            wx.showToast({
+              title: "该数据异常,请稍后重试",
+              icon: "none"
+            });
+            setTimeout(() => {
+              _this.getWalletInfo();
+              _this.getWithdrawRecords();
+            }, 500);
+            return;
+          }
           // console.log(res.data);
           // 小程序前端代码示例
           wx.requestMerchantTransfer({
             mchId: res.data.mchId,       // 商户号
             appId: 'wx0ca047da2ecada85',       // 小程序AppID
-            package: res.data.package,   // 后端返回的加密包
+            package: res.data.packageInfo,   // 后端返回的加密包
             success(res) {
-              wx.showToast({
-                title: "确认收款成功",
-                icon: "success",
-              });
-              // 重新请求接口更新数据
-              _this.getWalletInfo();
-              _this.getWithdrawRecords();
+              // console.log("确认收款成功", res);
+              try {
+                wx.showToast({
+                  title: "确认收款成功",
+                  icon: "none",
+                });
+              } catch (error) {
+                
+              }
+              setTimeout(() => {
+                _this.getWalletInfo();
+                _this.getWithdrawRecords();
+                // console.log("确认收款成功,刷新钱包信息和提现记录");
+              }, 1000);
             },
             fail(res) {
               // 用户取消或网络错误

+ 11 - 1
pages/my/myWallet/withdrawalHistory/index.js

@@ -107,12 +107,22 @@ Page({
       },
       (res) => {
         if (res.code === 0) {
+          if (!res.data.packageInfo) {
+            wx.showToast({
+              title: "该数据异常,请稍后重试",
+              icon: "none"
+            });
+            setTimeout(() => {
+              _this.fetchWithdrawalList(true);
+            }, 500);
+            return;
+          }
           // console.log(res.data);
           // 小程序前端代码示例
           wx.requestMerchantTransfer({
             mchId: res.data.mchId,       // 商户号
             appId: 'wx0ca047da2ecada85',       // 小程序AppID
-            package: res.data.package,   // 后端返回的加密包
+            package: res.data.packageInfo,   // 后端返回的加密包
             success(res) {
               wx.showToast({
                 title: "确认收款成功",