.

.env.development

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://192.168.50.212:8080/
+VUE_APP_BASE_URL=http://localhost:8080

.env.production

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://192.168.50.212:8080/
+VUE_APP_BASE_URL=http://localhost:8080

src/main.js

@@ -26,6 +26,7 @@ export default {
         pages: [
             'pages/login',
             'pages/home',
+            'pages/withdrawalExamine',
             'pages/my',
             'pages/repairReport',
             'pages/cleanReport',

src/pages/electricDetails.vue

@@ -24,17 +24,17 @@
             <div class="title2">
                 <div class="text1">
                     <div class="text2">设备厂商</div>
-                    <div class="text3">{{ ammeterInfo.typeDesc }}</div>
+                    <div class="text3">{{ ammeterInfo.typeDesc || '暂无' }}</div>
                 </div>
                 <div class="text1">
                     <div class="text2">电费价格</div>
-                    <div class="text3">{{ ammeterInfo.price }}元/度</div>
+                    <div class="text3">{{ ammeterInfo.price || 0 }}元/度</div>
                 </div>
             </div>
             <div class="title2">
                 <div class="text1">
                     <div class="text2">电表编号</div>
-                    <div class="text3">{{ ammeterInfo.id }}</div>
+                    <div class="text3">{{ ammeterInfo.id || '暂无' }}</div>
                 </div>
                 <div class="text1">
                     <div class="text2">电表状态</div>

src/pages/walletdetails.vue

@@ -38,7 +38,7 @@
                     <span>微信钱包</span>
                 </div>
             </div>
-            <div class="btn2" @click="Withdrawal(notWithdrawal)">申请提现</div>
+            <div class="btn2" :disabled="notWithdrawal" @click="Withdrawal(notWithdrawal)">申请提现</div>
         </div>
     </div>
 </template>
@@ -114,7 +114,7 @@ export default {
                             title: '提现审核中'
                         });
                         setTimeout(() => {
-                            this.navigateTo('/pages/withdrawalSuccess');
+                            this.navigateTo('/pages/withdrawalExamine');
                         }, 1000);
                         // this.navigateTo('/pages/walletreview?attach=' + res.id);
                     })
@@ -136,7 +136,7 @@ export default {
                             title: '提现审核中'
                         });
                         setTimeout(() => {
-                            this.navigateTo('/pages/withdrawalSuccess');
+                            this.navigateTo('/pages/withdrawalExamine');
                         }, 1000);
                     })
                     .catch(e => {

src/pages/withdrawalDetails.vue

@@ -88,6 +88,7 @@ export default {
         }
         this.$http.get('/roomMoneyWithdrawApply/all', query).then(res => {
             this.list = res.content;
+            this.empty = res.empty;
             let countArr = this.list.filter(item => {
                 return item.amount > 0;
             });

src/pages/withdrawalExamine.vue

@@ -0,0 +1,66 @@
+<config>
+{
+    "navigationBarTitleText": "提交成功"
+}
+</config>
+<template>
+    <div class="pay">
+        <div class="pay1">
+            <img class="pay-img" src="../native/shenqing_shenhezhong@3x.png" alt="" />
+            <div class="name">提交成功</div>
+            <div class="name1">您已成功申请提现服务，待审核成功后钱款将在72小时内提现到您的账户，请注意查收</div>
+        </div>
+        <div class="btn1" @click="jump">返回</div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {};
+    },
+    methods: {
+        jump() {
+            wx.navigateBack({
+                delta: 1
+            });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.pay {
+    .pay1 {
+        padding: 56px 33px 0;
+        text-align: center;
+        .pay-img {
+            width: 103px;
+            height: 78px;
+        }
+        .name {
+            font-size: 20px;
+            font-weight: bold;
+            color: #000000;
+            line-height: 20px;
+            margin: 30px 0 20px;
+        }
+        .name1 {
+            font-size: 14px;
+            font-weight: 400;
+            color: #000000;
+            line-height: 20px;
+            margin-bottom: 50px;
+        }
+    }
+    .btn1 {
+        width: 290px;
+        height: 48px;
+        background: #00ba64;
+        border-radius: 24px;
+        line-height: 48px;
+        text-align: center;
+        color: #fff;
+        font-size: 16px;
+        margin: 0 auto;
+    }
+}
+</style>