。

src/pages/electricDetails.vue

@@ -86,11 +86,11 @@ export default {
             newShow: false,
             yearMonth: '',
             list: [
-                {
-                    // name: '夏秋雨',
-                    // payTime: '2020-10-19',
-                    // amount: 100
-                }
+                // {
+                // name: '夏秋雨',
+                // payTime: '2020-10-19',
+                // amount: 100
+                // }
             ],
             currentDate: new Date().getTime()
             // minDate: new Date().getTime()

src/pages/personDetail.vue

@@ -154,7 +154,6 @@ export default {
     }
     .money1 {
         font-size: 12px;
-        font-family: PingFangSC-Regular, PingFang SC;
         font-weight: normal;
         color: #646566;
         line-height: 17px;
@@ -174,14 +173,12 @@ export default {
         }
         .text1 {
             font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
             font-weight: normal;
             color: #000000;
             line-height: 20px;
         }
         .text2 {
             font-size: 13px;
-            font-family: PingFangSC-Regular, PingFang SC;
             font-weight: normal;
             color: #aaacad;
             line-height: 18px;
@@ -189,7 +186,6 @@ export default {
     }
     .money {
         font-size: 16px;
-        font-family: PingFangSC-Semibold, PingFang SC;
         font-weight: bold;
         color: #000000;
         line-height: 24px;

src/pages/recharge.vue

@@ -115,12 +115,9 @@ export default {
                                 title: '支付成功'
                             });
                             setTimeout(() => {
-                                wx.navigateBack(
-                                    {
-                                        delta: 1
-                                    },
-                                    1000
-                                );
+                                wx.navigateBack({
+                                    delta: 1
+                                });
                             }, 1000);
                         },
                         fail: e => {
@@ -134,7 +131,11 @@ export default {
                     });
                 })
                 .catch(e => {
-                    console.log(e);
+                    wx.hideLoading();
+                    wx.showToast({
+                        icon: 'none',
+                        title: e.error
+                    });
                 });
         },
         detail() {

src/pages/successful.vue

@@ -41,7 +41,6 @@ export default {
         }
         .name {
             font-size: 20px;
-            font-family: PingFangSC-Medium, PingFang SC;
             font-weight: bold;
             color: #000000;
             line-height: 20px;
@@ -49,7 +48,6 @@ export default {
         }
         .name1 {
             font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
             color: #000000;
             line-height: 20px;

src/pages/successfuls.vue

@@ -41,7 +41,6 @@ export default {
         }
         .name {
             font-size: 20px;
-            font-family: PingFangSC-Medium, PingFang SC;
             font-weight: bold;
             color: #000000;
             line-height: 20px;
@@ -49,7 +48,6 @@ export default {
         }
         .name1 {
             font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
             color: #000000;
             line-height: 20px;

src/pages/wallet.vue

@@ -11,7 +11,7 @@
         <van-sticky :offset-top="0">
             <div class="box">
                 <div class="time-box" @click="newShow = true">
-                    <div class="text">{{ startTime ? startTime : '请选择时间' }}</div>
+                    <div class="text">{{ yearMonth ? yearMonth : '请选择时间' }}</div>
                 </div>
             </div>
         </van-sticky>
@@ -34,7 +34,13 @@
             </van-empty>
         </template>
         <van-popup :show="newShow" position="bottom" @close="newShow = false">
-            <van-datetime-picker type="year-month" :value="currentDate" :min-date="minDate" @confirm="onConfirm" />
+            <van-datetime-picker
+                type="year-month"
+                @cancel="newShow = false"
+                :value="currentDate"
+                :min-date="minDate"
+                @confirm="onConfirm"
+            />
         </van-popup>
     </div>
 </template>
@@ -45,24 +51,15 @@ export default {
     name: 'Wallet',
     data() {
         return {
-            moneyInfo: {},
-            time: 0,
-            times: 'user',
-            dateList: [],
             newShow: false,
-            startTime: '',
+            yearMonth: '',
             list: [],
-            flag: '',
-            nameList: '',
             currentDate: new Date().getTime(),
-            minDate: new Date().getTime(),
+            // minDate: new Date().getTime(),
             empty: false
         };
     },
     computed: {
-        canSubmit() {
-            return this.flag;
-        },
         ...mapState(['roomInfo', 'ammeterInfo'])
     },
     // created() {
@@ -86,7 +83,7 @@ export default {
         onConfirm(event) {
             this.currentDate = event.detail;
             var timeValue = this.timeFormat(new Date(event.detail), 'yyyy-MM');
-            this.startTime = timeValue;
+            this.yearMonth = timeValue;
             this.newShow = false;
         }
     }