1002884655 4 anni fa
parent
commit
2f8658bdb0

+ 5
- 3
src/components/common/MainPageContainer/index.vue Vedi File

@@ -151,9 +151,11 @@ export default {
151 151
               this.$router.push({ name: 'SignIn' })
152 152
             } else {
153 153
               this.$emit('UserInfoChange')
154
-              this.GetCurrentShopInfo().then(() => { // 获取当前店铺信息
155
-                this.$emit('ShopInfoChange')
156
-              })
154
+              if (this.CurrentShopInfo === null) {
155
+                this.GetCurrentShopInfo().then(() => { // 获取当前店铺信息
156
+                  this.$emit('ShopInfoChange')
157
+                })
158
+              }
157 159
             }
158 160
           }).catch(() => {
159 161
             this.$router.push({ name: 'SignIn' })

+ 10
- 3
src/pages/WoDe/DianPuRenZheng/index.vue Vedi File

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div class="Page">
3
-    <MainPageContainer @ShopInfoChange="ShopInfoChange" :ShowMainHeader="true" :MainHeaderTitle="`店铺认证`" :ShowMainHeaderBack="true" :ShowMainHeaderMore="true" :MainHeaderMoreIcon="`iconbaocun`" :MainHeaderMoreText="`保存`" :MainHeaderMoreClick="SaveForm">
3
+    <MainPageContainer @ShopInfoChange="ShopInfoChange" :ShowMainHeader="true" :MainHeaderTitle="`店铺认证`" :ShowMainHeaderBack="true" :ShowMainHeaderMore="true">
4 4
       <div class="Container">
5 5
         <div class="Content">
6 6
 
@@ -113,6 +113,9 @@
113 113
               <i class="iconfont iconjiantouright"></i>
114 114
             </router-link> -->
115 115
           </div>
116
+          <div class="Btn">
117
+            <a @click="SaveForm" :class="{'active': !DataLock}">{{DataLock ? '正在提交...' : '保存'}}</a>
118
+          </div>
116 119
 
117 120
         </div>
118 121
         <div class="MapContainer" v-show="ShowAreaSelect">
@@ -258,8 +261,12 @@ export default {
258 261
       }
259 262
       this.ShopValid({ data: { ...Data } }).then((res) => {
260 263
         this.Toast('认证提交成功')
261
-        this.GetCurrentShopInfo()
262
-        this.DataLock = false
264
+        this.GetCurrentShopInfo().then(() => {
265
+          this.DataLock = false
266
+          this.$router.go(-1)
267
+        }).catch(() => {
268
+          this.DataLock = false
269
+        })
263 270
       }).catch((res) => {
264 271
         this.Toast(res.data.message)
265 272
         this.DataLock = false

+ 18
- 0
src/pages/WoDe/DianPuRenZheng/page.scss Vedi File

@@ -144,6 +144,24 @@
144 144
           }
145 145
         }
146 146
       }
147
+      > .Btn {
148
+        padding: 0 0.15rem;
149
+        margin-top: 0.2rem;
150
+        background: none;
151
+        padding-bottom: 0.2rem;
152
+        > a {
153
+          font-size: 0.14rem;
154
+          color: #fff;
155
+          background: #ccc;
156
+          border-radius: 0.06rem;
157
+          line-height: 0.4rem;
158
+          display: block;
159
+          text-align: center;
160
+          &.active {
161
+            background: #d91e36;
162
+          }
163
+        }
164
+      }
147 165
     }
148 166
     > .MapContainer {
149 167
       width: 100%;

+ 9
- 2
src/pages/WoDe/ShouYe/index.vue Vedi File

@@ -50,7 +50,7 @@
50 50
 <script>
51 51
 import MainPageContainer from '../../../components/common/MainPageContainer'
52 52
 import { createNamespacedHelpers } from 'vuex'
53
-const { mapState: mapUserState } = createNamespacedHelpers('user')
53
+const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedHelpers('user')
54 54
 export default {
55 55
   name: 'index',
56 56
   data () {
@@ -79,10 +79,17 @@ export default {
79 79
   },
80 80
   mounted () {
81 81
     this.$nextTick(() => {
82
-      this.Init()
82
+      this.GetCurrentShopInfo().then(() => {
83
+        this.Init()
84
+      }).catch(() => {
85
+        this.Init()
86
+      })
83 87
     })
84 88
   },
85 89
   methods: {
90
+    ...mapUserActions([
91
+      'GetCurrentShopInfo'
92
+    ]),
86 93
     Init () {
87 94
       if (this.CurrentShopInfo !== null) {
88 95
         this.UserTab.map((item) => {