xuqiang пре 4 година
родитељ
комит
8d129389a5

+ 4 - 0
src/pages/cleanReport.vue

@@ -54,6 +54,10 @@ export default {
             }
         }
     },
+    // onShow() {
+    //     this.content = '';
+    //     this.imagesList = [];
+    // },
     methods: {
         afterRead(file) {
             this.showLoading();

+ 10 - 1
src/pages/feeDetail.vue

@@ -11,7 +11,7 @@
         <van-sticky :offset-top="0">
             <div class="box">
                 <div class="time-box" @click="newShow = true">
-                    <div class="text">{{ yearMonth ? yearMonth : '请选择时间' }}</div>
+                    <div class="text">{{ yearMonth ? yearMonth : '全部' }}</div>
                 </div>
                 <div class="money1">共充值 ¥{{ count || 0 }}</div>
             </div>
@@ -55,6 +55,7 @@ export default {
             time: 0,
             count: 0,
             yearMonth: '',
+            nowDate: '',
             empty: false,
             newShow: false,
             list: [
@@ -72,6 +73,13 @@ export default {
         ...mapState(['roomInfo', 'userInfo'])
     },
     mounted() {
+        this.nowDate = new Date();
+        let date = {
+            year: this.nowDate.getFullYear(),
+            month: this.nowDate.getMonth() + 1
+        };
+        let systemDate = date.year + '-' + date.month;
+        this.yearMonth = systemDate;
         this.Info();
     },
     methods: {
@@ -85,6 +93,7 @@ export default {
                 sort: 'settleTime,desc',
                 yearMonth: this.yearMonth
             };
+            console.log(this.yearMonth);
             query.roomId = this.roomInfo.roomId;
             this.$http
                 .get('/api/mp/roomFeeRecord', query)

+ 1 - 1
src/pages/home.vue

@@ -134,7 +134,7 @@ export default {
     mounted() {
         this.$http.get('/api/mp/getRoomInfo').then(res => {
             this.list = res;
-            console.log(this.list);
+            // console.log(this.list);
             if (this.list.checkInType === 'INDIVIDUAL') {
                 wx.setTabBarItem({
                     index: 0,

+ 2 - 2
src/pages/login.vue

@@ -318,8 +318,8 @@ export default {
     // width: 100%;
     padding-left: 20px;
     img {
-        width: 231px;
-        height: 47px;
+        width: 182px;
+        height: 54px;
         margin: 60px 0 30px;
     }
 }

+ 1 - 1
src/pages/my.vue

@@ -136,7 +136,7 @@ export default {
         };
     },
     mounted() {
-        console.log(this.roomInfo);
+        // console.log(this.roomInfo);
         this.$http.get('/api/mp/getRoomInfo').then(res => {
             this.list = res;
             console.log(this.list);

+ 9 - 1
src/pages/personDetail.vue

@@ -11,7 +11,7 @@
         <van-sticky :offset-top="0">
             <div class="box">
                 <div class="time-box" @click="newShow = true">
-                    <div class="text">{{ yearMonth ? yearMonth : '请选择时间' }}</div>
+                    <div class="text">{{ yearMonth ? yearMonth : '全部' }}</div>
                 </div>
                 <div class="money1">共充值 ¥{{ count || 0 }}</div>
             </div>
@@ -48,6 +48,7 @@ export default {
             page: 0,
             last: false,
             yearMonth: '',
+            nowDate: '',
             empty: false,
             time: 0,
             newShow: false,
@@ -70,6 +71,13 @@ export default {
         }
     },
     mounted() {
+        this.nowDate = new Date();
+        let date = {
+            year: this.nowDate.getFullYear(),
+            month: this.nowDate.getMonth() + 1
+        };
+        let systemDate = date.year + '-' + date.month;
+        this.yearMonth = systemDate;
         this.Info();
     },
     methods: {

+ 6 - 0
src/pages/repairReport.vue

@@ -66,6 +66,12 @@ export default {
             }
         }
     },
+    // onShow() {
+    //     this.name = '';
+    //     this.phone = '';
+    //     this.description = '';
+    //     this.imagesList = [];
+    // },
     methods: {
         afterRead(file) {
             this.showLoading();

+ 1 - 1
src/pages/successfuls.vue

@@ -22,7 +22,7 @@ export default {
         jump() {
             wx.navigateBack(
                 {
-                    delta: 1
+                    delta: 2
                 },
                 1000
             );

+ 10 - 2
src/pages/withdrawalDetails.vue

@@ -72,6 +72,7 @@ export default {
             count: 0,
             empty: false,
             newShow: false,
+            nowDate: '',
             yearMonth: '',
             list: [
                 // {
@@ -99,6 +100,13 @@ export default {
         }
     },
     mounted() {
+        this.nowDate = new Date();
+        let date = {
+            year: this.nowDate.getFullYear(),
+            month: this.nowDate.getMonth() + 1
+        };
+        let systemDate = date.year + '-' + date.month;
+        this.yearMonth = systemDate;
         this.Info();
     },
     methods: {
@@ -118,7 +126,7 @@ export default {
                 };
                 query.roomId = this.roomInfo.roomId;
                 this.$http
-                    .get('/roomMoneyWithdrawApply/all', query)
+                    .get('/roomMoneyWithdrawApply/maSearch', query)
                     .then(res => {
                         wx.hideLoading();
                         // this.list = res.content;
@@ -151,7 +159,7 @@ export default {
                 };
                 query.userId = this.userInfo.id;
                 this.$http
-                    .get('/userMoneyWithdrawApply/all', query)
+                    .get('/userMoneyWithdrawApply/maSearch', query)
                     .then(res => {
                         wx.hideLoading();
                         this.list = res.content;