From a89742253c1e52e43593f08bc0ce7c0e69a86ff8 Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Wed, 18 May 2022 13:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E4=B8=8A=E5=AE=B6=E5=9B=AD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=B7=E7=99=BB=E5=87=BA=20=E5=AE=85?=
 =?UTF-8?q?=E5=9F=BA=E5=9C=B0=E4=BF=9D=E5=AD=98=E5=B9=B6=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homestead/homeApplication/proposerLite.vue           | 9 ++++++---
 src/views/onlineHome/my.vue                              | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 03dc5183..50e080ae 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1085,7 +1085,7 @@ export default {
     },
     // 通用设置地图数据函数
     setMapData(map, data) {
-      console.log(map, data ? true : false);
+      //console.log(map, data ? true : false);
       if(!map) return;
       if(data)
       {
@@ -1423,7 +1423,7 @@ export default {
           this.formEnabled.baseApplyForm.groupFormEnabled = hasGroupLevel && this.isProposeStatus(houseApplyStatus, ['32']) && this.isInRoles(role, 'village_group_leader');
           this.formEnabled.baseApplyForm.villageFormEnabled = this.isProposeStatus(houseApplyStatus, ["31"]) && this.isInRoles(role, 'village_leader');
           this.formEnabled.baseApplyForm.townFormEnabled = this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader');
-          console.log(this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader')+'11111111');
+          //console.log(this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader')+'11111111');
           this.formEnabled.landscopeEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);
           this.formEnabled.landscopeForm.baseFormEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);
 
@@ -1773,7 +1773,10 @@ export default {
       console.log("进行保存", this.applicationDetail);
       saveHouseBaseInfo(this.applicationDetail).then((response) => {
         if(submit)
+        {
+          this.id = response.data;
           this.submitApplyProposer();
+        }
         else
         {
           this.notify("保存成功", 'success');
@@ -2097,7 +2100,7 @@ export default {
       {
         this.selectedTabName = index;
       }
-      console.log(index, this.active,this.selectedTabName);
+      //console.log(index, this.active,this.selectedTabName);
     },
     // 保存开工(是否提交)
     startProposerApply(submit) {
diff --git a/src/views/onlineHome/my.vue b/src/views/onlineHome/my.vue
index 9904fa26..2414e061 100644
--- a/src/views/onlineHome/my.vue
+++ b/src/views/onlineHome/my.vue
@@ -97,7 +97,6 @@
 <script>
   import onlineHomeIndex from "../onlineHomeIndex";
   import {getInfo, logout} from "../../api/login";
-  import request from '@/utils/request'
   export default {
       components: {
         onlineHomeIndex
@@ -124,9 +123,12 @@
       },
       methods: {
         logout(){
-          logout().then(res => {
+          /*logout().then(res => {
             this.$router.push({path:"../onlineHomeLogin"})
-          })
+          })*/
+          this.$store.dispatch('LogOut').then(() => {
+            this.$router.push({path:"../onlineHomeLogin"})
+          });
         }
       },
     }