Merge branch 'master' of http://192.168.18.147:9000/root/digital_park_static

digital-park-web/digital-park/src/views/investment-service/InvestmentServiceList/InvestmentServiceList.vue

@@ -194,7 +194,6 @@ export default {
         },
         // 获取列表数据
         getListData() {
-            console.log(this.$cloneDeep(this.queryParams), "this.queryParams");
             if (this.cutTab == "parkServices") {
                 this.getListApi(
                     getParkServiceProduct,
@@ -215,7 +214,6 @@ export default {
                         // console.log(this.$cloneDeep(data),key)
                         this[key] = data.list;
                         this.queryParams.total = data.total;
-                        console.log(data.total, "res.total");
                     } else if (res.data.status === 102) {
                         this.$router.push("/login");
                     } else {

digital-park-web/digital-park/src/views/investment-service/InvestmentServiceList/components/PropertyManage.vue

@@ -15,7 +15,7 @@
                 <div class="main-des">
                     <span class="first">最短起租：{{ item.shortestRent }}</span>|
                     <span>总面积：{{ item.housingInformationList[0].housingArea }}m²</span>|
-                    <span>支付方式：{{ item.payment.housingArea }}</span>|
+                    <span>支付方式：{{ item.payment }}</span>|
                     <span>{{ item.type }}</span>
                 </div>
                 <div class="main-advantageList" :title="item.advantageList.join('、')">

digital-park-web/digital-park/src/views/investment-service/property-detail/PropertyDetail.vue

@@ -148,7 +148,7 @@ export default {
                 },
                 {
                     prop: "housingArea",
-                    label: "房源面积",
+                    label: "房源面积㎡",
                 },
                 {
                     prop: "maxCapacity",

digital-park-web/digital-park/src/views/login/LoginFrom/LoginFrom.vue

@@ -486,11 +486,13 @@ export default {
                         this.loginMethodChange(1);
                     } else {
                         sendMsg(0, data.msg);
+                        this.getVerificationCode();
                     }
                     this.loginLoading = false;
                 })
                 .catch((err) => {
                     sendMsg(0, "修改失败");
+                    this.getVerificationCode();
                     console.log(err);
                     this.loginLoading = false;
                 });
@@ -510,11 +512,13 @@ export default {
                         this.loginSuccessFn();
                     } else {
                         sendMsg(0, data.msg);
+                        this.getVerificationCode();
                     }
                     this.loginLoading = false;
                 })
                 .catch((err) => {
                     sendMsg(0, "登录失败");
+                    this.getVerificationCode();
                     console.log(err);
                     this.loginLoading = false;
                 });
@@ -549,12 +553,14 @@ export default {
                         this.loginSuccessFn();
                     } else {
                         sendMsg(0, data.msg);
+                        this.getVerificationCode();
                     }
                     this.loginLoading = false;
                 })
                 .catch((err) => {
                     sendMsg(0, "注册失败");
                     console.log(err);
+                    this.getVerificationCode();
                     this.loginLoading = false;
                 });
         },

digital-park-web/digital-park/src/views/my-related/business/Business.vue

@@ -281,6 +281,7 @@ export default {
                     let { resultData } = data;
                     this.myMsgList = resultData.list;
                     this.notRead = resultData.total - data.readCount;
+                    this.notRead = this.notRead < 0 ? 0 : this.notRead;
                     }else if(res.data.status == 102){
                         this.$router.push('/login')
                     }else {

digital-park-web/digital-park/src/views/my-related/mseeage/Message.vue

@@ -154,6 +154,7 @@ export default {
                         );
                         this.queryParams.total = resultData.total;
                         this.notRead = resultData.total - data.readCount;
+                        this.notRead = this.notRead < 0 ? 0 : this.notRead;
                     } else if (res.data.status == 102) {
                         this.$router.push("/login");
                     } else {