.

src/pages/feeDetail.vue

@@ -13,7 +13,7 @@
                 <div class="time-box" @click="newShow = true">
                     <div class="text">{{ yearMonth ? yearMonth : '全部' }}</div>
                 </div>
-                <div class="money1">共充值 ¥{{ count || 0 }}</div>
+                <div class="money1">共计 ¥{{ count || 0 }}</div>
             </div>
         </van-sticky>
         <template v-if="!empty">
@@ -21,12 +21,12 @@
                 <div class="con1">
                     <img class="con-img" src="../native/mingxi_icon_chongzhi@3x.png" alt="" />
                     <div>
-                        <div class="text1">{{ item.name }}</div>
-                        <div class="text2">{{ item.payTime }}</div>
+                        <div class="text1">{{ item.remark }}</div>
+                        <div class="text2">{{ item.createdAt }}</div>
                     </div>
                 </div>
-                <div class="money" :class="{ prim: item.amount > 0 }">
-                    {{ item.amount > 0 ? '+' : '' }}{{ item.amount }}
+                <div class="money" :class="{ prim: item.money > 0 }">
+                    {{ item.money > 0 ? '+' : '' }}{{ item.money }}
                 </div>
             </div>
         </template>
@@ -99,15 +99,15 @@ export default {
                 .get('/api/mp/roomFeeRecord', query)
                 .then(res => {
                     wx.hideLoading();
-                    // console.log(res);
+                    console.log(res);
                     this.list = res.content;
                     this.empty = res.empty;
                     let countArr = this.list.filter(item => {
-                        return item.amount > 0;
+                        return item.money;
                     });
                     if (countArr.length > 0) {
                         this.count = countArr.reduce((total, item) => {
-                            return total + item.amount;
+                            return total + item.money;
                         }, 0);
                     }
                 })

src/pages/my.vue

@@ -73,10 +73,10 @@
                     <img class="tit-img" src="../native/tabbar/wode_icon_dasao@3x.png" alt="" />
                     <div class="text">打扫申请</div>
                 </div>
-                <div class="div" @click="navigateTo('/pages/complaint')">
+                <!-- <div class="div" @click="navigateTo('/pages/complaint')">
                     <img class="tit-img" src="../native/tabbar/wode_icon_tousu@3x.png" alt="" />
                     <div class="text">投诉/建议</div>
-                </div>
+                </div> -->
                 <div class="div" @click="navigateTo('/pages/help')">
                     <img class="tit-img" src="../native/tabbar/wode_icon_shouming@3x.png" alt="" />
                     <div class="text">帮助说明</div>

src/pages/personDetail.vue

@@ -13,7 +13,7 @@
                 <div class="time-box" @click="newShow = true">
                     <div class="text">{{ yearMonth ? yearMonth : '全部' }}</div>
                 </div>
-                <div class="money1">共充值 ¥{{ count || 0 }}</div>
+                <div class="money1">共计 ¥{{ count || 0 }}</div>
             </div>
         </van-sticky>
         <template v-if="!empty">
@@ -22,7 +22,7 @@
                     <img class="con-img" src="../native/mingxi_icon_chongzhi@3x.png" alt="" />
                     <div>
                         <div class="text1">{{ item.name }}</div>
-                        <div class="text2">{{ item.payTime }}</div>
+                        <div class="text2">{{ item.time }}</div>
                     </div>
                 </div>
                 <div class="money" :class="{ prim: item.amount > 0 }">
@@ -98,7 +98,7 @@ export default {
                     wx.hideLoading();
                     this.list = res.content;
                     let countArr = this.list.filter(item => {
-                        return item.amount > 0;
+                        return item.amount;
                     });
                     if (countArr.length > 0) {
                         this.count = countArr.reduce((total, item) => {

src/pages/walletdetails.vue

@@ -12,7 +12,7 @@
         <div class="box-con">
             <p>提现金额</p>
             <div class="num">
-                <span>全部可提现 ¥{{ roomInfo.money || 0 }}</span>
+                <span>全部可提现 ¥{{ money || 0 }}</span>
             </div>
             <div class="box">
                 <div class="money">
@@ -60,13 +60,25 @@ export default {
             this.form.amount > this.moneyInfo.money ? (flag = true) : (flag = false);
             return flag;
         },
-        ...mapState(['roomInfo']),
+        ...mapState(['roomInfo', 'userInfo', 'ammeterInfo']),
         type() {
             return this.$mp.query.type;
+        },
+        money() {
+            switch (this.type) {
+                case 'ROOM':
+                    return (this.roomInfo ? this.roomInfo.balance : 0).toFixed(2);
+                case 'PERSON':
+                    return (this.roomInfo.money || 0).toFixed(2);
+                // case 'AMMETER':
+                //     return (this.ammeterInfo.rest || 0).toFixed(2);
+                default:
+                    return '';
+            }
         }
     },
     mounted() {
-        // console.log(this.roomInfo);
+        console.log(this.type);
     },
     methods: {
         seeFn() {

src/pages/withdrawalDetails.vue

@@ -22,7 +22,7 @@
                     <img class="con-img" :src="getIcon(item.status)" />
                     <div>
                         <div class="text1">
-                            {{ item.name + '-' }}
+                            <!-- {{ item.name + '-' }} -->
                             <span
                                 class="span"
                                 :class="{
@@ -129,7 +129,7 @@ export default {
                     .get('/roomMoneyWithdrawApply/maSearch', query)
                     .then(res => {
                         wx.hideLoading();
-                        // this.list = res.content;
+                        this.list = res.content;
                         this.empty = res.empty;
                         let countArr = this.list.filter(item => {
                             return item.amount > 0;

src/pages/withdrawalSuccess.vue

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