From b1c9086c703727f48d717d9303d5786e2321a87d Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 25 Sep 2023 17:15:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=85=E5=80=BC=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95,=20=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95=E7=9A=84?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                              |  4 ++--
 subpkg/topUp/topUp.vue                     | 16 +++++++++++++---
 subpkg/withdrawDeposit/company.vue         | 15 ++++++++++++---
 subpkg/withdrawDeposit/withdrawDeposit.vue | 15 ++++++++++++---
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/manifest.json b/manifest.json
index 74fc960..a26f066 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
     // "appid" : "__UNI__3A527D1",
     "appid" : "__UNI__B5B1EDD",
     "description" : "",
-    "versionName" : "1.1.3",
-    "versionCode" : 113,
+    "versionName" : "1.1.6",
+    "versionCode" : 116,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 9840daa..418f3d9 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -19,6 +19,7 @@
       </view>
       <input v-if="priceList[changeMoney]=='自定义'" class="input" type="digit" placeholder="输入充值金额(元)" v-model="payMoney.money" />
       <button class="btn" @click="pay">充值</button>
+      <button class="btn btn2" @click="navToRecord">充值记录</button>
     </view>
 <!--    <view class="tip">
       <view class="title">注意事项</view>
@@ -50,9 +51,7 @@
     // 点击充值记录
     onNavigationBarButtonTap(res){
       if (res.index === 0) {
-        uni.navigateTo({
-          url: '/subpkg/topUpList/topUpList'
-        })
+        this.navToRecord();
       }
     },
     onLoad(options) {
@@ -68,6 +67,12 @@
         if(this.priceList[index]=='自定义')this.payMoney.money = '';
         else this.payMoney.money = this.priceList[index].split('元')[0];
       },
+      // 跳转充值记录
+      navToRecord(){
+        uni.navigateTo({
+          url: '/subpkg/topUpList/topUpList'
+        })
+      },
       // 加载任务
       async loadTask(){
         uni.showLoading({
@@ -321,6 +326,11 @@
       font-weight: 400;
       color: #FFFFFF;
     }
+    .btn2{
+      background-color: #fff;
+      color: #333;
+      border: 1px solid #eee;
+    }
   }
 
   .tip {
diff --git a/subpkg/withdrawDeposit/company.vue b/subpkg/withdrawDeposit/company.vue
index 752132c..a486630 100644
--- a/subpkg/withdrawDeposit/company.vue
+++ b/subpkg/withdrawDeposit/company.vue
@@ -42,6 +42,7 @@
       <button v-if="is_draw" class="btn" @click="pay">全部提现</button>
       <button else class="btn disabled" @click="noPay">暂时不可提现</button>
     </view>
+    <view class="price"><button class="btn btn2" @click="navToRecord">提现记录</button></view>
     <u-modal :show="modelShow" title="提醒" content="删除后上传的文件将会消失,你确定要删除吗?" showCancelButton
       @confirm="clear(del_name);modelShow=false" @cancel="modelShow=false"></u-modal>
   </view>
@@ -81,9 +82,7 @@
     // 点击提现记录
     onNavigationBarButtonTap(res) {
       if (res.index === 0) {
-        uni.navigateTo({
-          url: '/subpkg/withdrawList/withdrawList'
-        })
+        this.navToRecord();
       }
     },
     onLoad() {
@@ -101,6 +100,11 @@
       }
     },
     methods: {
+      navToRecord(){
+        uni.navigateTo({
+          url: '/subpkg/withdrawList/withdrawList'
+        })
+      },
       /**
        * 某文件上传结束回调(成功失败都回调)
        * @param {Object} item 当前上传完成的文件
@@ -368,6 +372,11 @@
       font-weight: 400;
       color: #FFFFFF;
     }
+    .btn2{
+      background-color: #fff;
+      color: #333;
+      border: 1px solid #eee;
+    }
     .disabled{
       background-color: #666;
     }
diff --git a/subpkg/withdrawDeposit/withdrawDeposit.vue b/subpkg/withdrawDeposit/withdrawDeposit.vue
index 2511eeb..af41d8a 100644
--- a/subpkg/withdrawDeposit/withdrawDeposit.vue
+++ b/subpkg/withdrawDeposit/withdrawDeposit.vue
@@ -25,6 +25,7 @@
       <input v-if="priceList[changeMoney]=='自定义'" class="input" type="digit" placeholder="输入充值金额(元)"
         v-model="payMoney.money" />
       <button class="btn" @click="pay">申请提现</button>
+      <button class="btn btn2" @click="navToRecord">提现记录</button>
     </view>
 <!--    <view class="tip">
       <view class="title">备注</view>
@@ -55,9 +56,7 @@
     // 点击提现记录
     onNavigationBarButtonTap(res){
       if (res.index === 0) {
-        uni.navigateTo({
-          url: '/subpkg/withdrawList/withdrawList'
-        })
+        this.navToRecord();
       }
     },
     onLoad() {
@@ -67,6 +66,11 @@
       })
     },
     methods: {
+      navToRecord(){
+        uni.navigateTo({
+          url: '/subpkg/withdrawList/withdrawList'
+        })
+      },
       copyPhone(str = "") {
         uni.setClipboardData({
           data: str + "",
@@ -249,6 +253,11 @@
       font-weight: 400;
       color: #FFFFFF;
     }
+    .btn2{
+      background-color: #fff;
+      color: #333;
+      border: 1px solid #eee;
+    }
   }
 
   .tip {