Browse Source

修改bug

cr 4 years ago
parent
commit
7b01f2408a
3 changed files with 28 additions and 21 deletions
  1. 1 1
      src/pages/manage/index.vue
  2. 2 2
      src/pages/wallet/bill.vue
  3. 25 18
      src/pages/wallet/index.vue

+ 1 - 1
src/pages/manage/index.vue

@@ -76,7 +76,7 @@
76
 
76
 
77
         <!-- <button class="btn" @click="layout">退出登录</button> -->
77
         <!-- <button class="btn" @click="layout">退出登录</button> -->
78
 
78
 
79
-        <div class="ver">0.5.31</div>
79
+        <div class="ver">0.5.33</div>
80
         <wyg-bottom-tab
80
         <wyg-bottom-tab
81
             ref="tabbar"
81
             ref="tabbar"
82
             :tabIndex="2"
82
             :tabIndex="2"

+ 2 - 2
src/pages/wallet/bill.vue

@@ -1,9 +1,9 @@
1
 <template>
1
 <template>
2
     <div class="page">
2
     <div class="page">
3
         <ul class="list">
3
         <ul class="list">
4
-            <li class="item" v-for="item of list" :key="item.id" @click="goDetail(item)">
4
+            <li class="item" v-for="item of list" :key="item.id">
5
                 <div class="name">
5
                 <div class="name">
6
-                    {{ item.createdTime | dateFormat("yyy/MM/dd") }}
6
+                    {{ item.date | dateFormat("yyy/MM/dd") }}
7
                     <span class="status">{{ item.status | status }}</span>
7
                     <span class="status">{{ item.status | status }}</span>
8
                 </div>
8
                 </div>
9
                 <div class="right">
9
                 <div class="right">

+ 25 - 18
src/pages/wallet/index.vue

@@ -32,13 +32,22 @@
32
             </div>
32
             </div>
33
         </div>
33
         </div>
34
         <div class="money card">
34
         <div class="money card">
35
-            <h1 class="tit">可提现金额</h1>
35
+            <h1 class="tit">店铺余额</h1>
36
             <div class="money-num">
36
             <div class="money-num">
37
-                <div class="num">¥{{ balance / 100 }}</div>
37
+                <div class="num">¥{{ total / 100 }}</div>
38
                 <div class="view" @click="jump('/pages/wallet/bill')">
38
                 <div class="view" @click="jump('/pages/wallet/bill')">
39
                     查看账单
39
                     查看账单
40
                 </div>
40
                 </div>
41
             </div>
41
             </div>
42
+        </div>
43
+        <div class="money card">
44
+            <h1 class="tit">可提现金额</h1>
45
+            <div class="money-num">
46
+                <div class="num">¥{{ balance / 100 }}</div>
47
+                <!-- <div class="view" @click="jump('/pages/wallet/bill')">
48
+                    查看账单
49
+                </div> -->
50
+            </div>
42
             <p class="tip">最低提现2元,单日上线20000元</p>
51
             <p class="tip">最低提现2元,单日上线20000元</p>
43
             <div class="input">
52
             <div class="input">
44
                 <input
53
                 <input
@@ -49,7 +58,7 @@
49
                 />
58
                 />
50
             </div>
59
             </div>
51
             <p class="tip tip-color" v-if="showErr">
60
             <p class="tip tip-color" v-if="showErr">
52
-                {{errStr}}
61
+                {{ errStr }}
53
             </p>
62
             </p>
54
             <button
63
             <button
55
                 v-if="!loading && account"
64
                 v-if="!loading && account"
@@ -61,7 +70,7 @@
61
             </button>
70
             </button>
62
         </div>
71
         </div>
63
         <div class="card record">
72
         <div class="card record">
64
-            <h1 class="tit">提现记录 共{{total}}条</h1>
73
+            <h1 class="tit">提现记录</h1>
65
             <ul class="table">
74
             <ul class="table">
66
                 <li class="row">
75
                 <li class="row">
67
                     <div class="item">申请时间</div>
76
                     <div class="item">申请时间</div>
@@ -116,10 +125,10 @@ export default {
116
             withdrawalTotal: "",
125
             withdrawalTotal: "",
117
             account: null,
126
             account: null,
118
             balance: 0,
127
             balance: 0,
119
-            total:0,
128
+            total: 0,
120
             loading: false,
129
             loading: false,
121
             showErr: false,
130
             showErr: false,
122
-            errStr:''
131
+            errStr: "",
123
         };
132
         };
124
     },
133
     },
125
     filters: {
134
     filters: {
@@ -134,13 +143,13 @@ export default {
134
             let str = obj[v];
143
             let str = obj[v];
135
             return str || "";
144
             return str || "";
136
         },
145
         },
137
-        method(v){
146
+        method(v) {
138
             let obj = {
147
             let obj = {
139
-                1:'微信',
140
-                2:'银行卡'
141
-            }
142
-            return obj[v] || '';
143
-        }
148
+                1: "微信",
149
+                2: "银行卡",
150
+            };
151
+            return obj[v] || "";
152
+        },
144
     },
153
     },
145
     onLoad() {},
154
     onLoad() {},
146
     async onShow() {
155
     async onShow() {
@@ -178,9 +187,7 @@ export default {
178
                 );
187
                 );
179
             }
188
             }
180
             if (this.formVal * 100 < 200) {
189
             if (this.formVal * 100 < 200) {
181
-                return this.fn.showToast(
182
-                    "提现金额不能小于2元"
183
-                );
190
+                return this.fn.showToast("提现金额不能小于2元");
184
             }
191
             }
185
             // this.$refs.popup.open({
192
             // this.$refs.popup.open({
186
             //     type: "dialog",
193
             //     type: "dialog",
@@ -223,12 +230,12 @@ export default {
223
                 let val = Number(this.formVal);
230
                 let val = Number(this.formVal);
224
                 if (val > this.balance / 100) {
231
                 if (val > this.balance / 100) {
225
                     this.showErr = true;
232
                     this.showErr = true;
226
-                    this.errStr = '提现金额超出总金额,请重新填写'
233
+                    this.errStr = "提现金额超出总金额,请重新填写";
227
                     return;
234
                     return;
228
                 }
235
                 }
229
-                if(val<2){
236
+                if (val < 2) {
230
                     this.showErr = true;
237
                     this.showErr = true;
231
-                    this.errStr = '提现金额不能小于2元,请重新填写'
238
+                    this.errStr = "提现金额不能小于2元,请重新填写";
232
                     return;
239
                     return;
233
                 }
240
                 }
234
             }
241
             }