From 1aecb5f7e80ce5be8d24920910ddcf25c4f8d59f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 25 Jul 2023 16:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/company/company.vue             |  2 +-
 subpkg/topUp/topUp.vue                     | 58 +++++++++++-----------
 subpkg/withdrawDeposit/withdrawDeposit.vue |  8 ++-
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/components/company/company.vue b/components/company/company.vue
index 2f3f5f8..dad972c 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -20,7 +20,7 @@
               <uni-icons type="location"></uni-icons>
               <view class="location">区域:</view>
             </view>
-            <view style="flex: 1;">{{company.province_name+company.city_name+company.area_name+company.address}}</view>
+            <view style="flex: 1;">{{company.province_name+company.city_name+company.area_name+company.street_name+company.address}}</view>
           </view>
         </view>
       </block>
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 6a435d8..31793af 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -78,34 +78,34 @@
         }
         else Toast(this.timeCount+'秒后再支付!')
       },
-      async goRecharge() {
-        let { data } = await recharge({
-          money: this.payMoney.money
-        });
-        let res = await payWay({
-          order_id: data.order_id,
-          from: data.from,
-        })
-        // console.log(res);
-        let res1 = await payPrepay({
-          from: data.from,
-          order_id: data.order_id,
-          pay_way: res.data.lists[0].pay_way
-        })
-        // console.log(res1.data, res1.data.config.package.split('=')[1]);
-        let obj = {
-          "appid": res1.data.config.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
-          "noncestr": res1.data.config.nonceStr, // 随机字符串
-          "package": res1.data.config.package, // 固定值
-          "partnerid": res1.data.config.partnerid, // 微信支付商户号
-          "prepayid": res1.data.config.package.split('=')[1], // 统一下单订单号 
-          "timestamp": res1.data.config.timestamp, // 时间戳（单位：秒）
-          "sign": res1.data.config.paySign
-        }
+      goRecharge() {
         // console.log(obj);
         uni.showLoading({
-          title:'获取微信支付信息',
-          success: () => {
+          title:'获取支付信息',
+          success: async () => {
+            let { data } = await recharge({
+              money: this.payMoney.money
+            });
+            let res = await payWay({
+              order_id: data.order_id,
+              from: data.from,
+            })
+            // console.log(res);
+            let res1 = await payPrepay({
+              from: data.from,
+              order_id: data.order_id,
+              pay_way: res.data.lists[0].pay_way
+            })
+            // console.log(res1.data, res1.data.config.package.split('=')[1]);
+            let obj = {
+              "appid": res1.data.config.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
+              "noncestr": res1.data.config.nonceStr, // 随机字符串
+              "package": res1.data.config.package, // 固定值
+              "partnerid": res1.data.config.partnerid, // 微信支付商户号
+              "prepayid": res1.data.config.package.split('=')[1], // 统一下单订单号 
+              "timestamp": res1.data.config.timestamp, // 时间戳（单位：秒）
+              "sign": res1.data.config.paySign
+            }
             uni.getProvider({
               service: 'payment',
               success: (paymentList) => {
@@ -119,7 +119,7 @@
                   // orderInfo: res1.data.config,
                   orderInfo: obj,
                   success: (e) => {
-                    console.log('成功', e);
+                    // console.log('成功', e);
                     uni.hideLoading();
                     payStatus({
                       order_id: data.order_id,
@@ -141,7 +141,9 @@
                       title: '支付失败!'
                     })
                   },
-                  complete: () => {},
+                  complete: () => {
+                    this.payMoney.money = '';
+                  },
                 });
               }
             })
diff --git a/subpkg/withdrawDeposit/withdrawDeposit.vue b/subpkg/withdrawDeposit/withdrawDeposit.vue
index ce5c35f..08ce09a 100644
--- a/subpkg/withdrawDeposit/withdrawDeposit.vue
+++ b/subpkg/withdrawDeposit/withdrawDeposit.vue
@@ -100,10 +100,14 @@
         let res = await userWithdraw({
           amount: this.payMoney.money
         });
-        Toast(res.msg);
+        uni.showToast({
+          icon:'success',
+          title: res.msg
+        })
         // 重新显示余额
         let info = this.$store.state.app.userInfo;
-        info.user_money -= this.payMoney.money;
+        this.payMoney.money = '';
+        info.user_money = (info.user_money - this.payMoney.money).toFixed(2);
         this.$store.commit('setUserInfo', info);
       }
     },