1002884655 4 лет назад
Родитель
Сommit
2f8658bdb0

+ 5
- 3
src/components/common/MainPageContainer/index.vue Просмотреть файл

151
               this.$router.push({ name: 'SignIn' })
151
               this.$router.push({ name: 'SignIn' })
152
             } else {
152
             } else {
153
               this.$emit('UserInfoChange')
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
           }).catch(() => {
160
           }).catch(() => {
159
             this.$router.push({ name: 'SignIn' })
161
             this.$router.push({ name: 'SignIn' })

+ 10
- 3
src/pages/WoDe/DianPuRenZheng/index.vue Просмотреть файл

1
 <template>
1
 <template>
2
   <div class="Page">
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
       <div class="Container">
4
       <div class="Container">
5
         <div class="Content">
5
         <div class="Content">
6
 
6
 
113
               <i class="iconfont iconjiantouright"></i>
113
               <i class="iconfont iconjiantouright"></i>
114
             </router-link> -->
114
             </router-link> -->
115
           </div>
115
           </div>
116
+          <div class="Btn">
117
+            <a @click="SaveForm" :class="{'active': !DataLock}">{{DataLock ? '正在提交...' : '保存'}}</a>
118
+          </div>
116
 
119
 
117
         </div>
120
         </div>
118
         <div class="MapContainer" v-show="ShowAreaSelect">
121
         <div class="MapContainer" v-show="ShowAreaSelect">
258
       }
261
       }
259
       this.ShopValid({ data: { ...Data } }).then((res) => {
262
       this.ShopValid({ data: { ...Data } }).then((res) => {
260
         this.Toast('认证提交成功')
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
       }).catch((res) => {
270
       }).catch((res) => {
264
         this.Toast(res.data.message)
271
         this.Toast(res.data.message)
265
         this.DataLock = false
272
         this.DataLock = false

+ 18
- 0
src/pages/WoDe/DianPuRenZheng/page.scss Просмотреть файл

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
     > .MapContainer {
166
     > .MapContainer {
149
       width: 100%;
167
       width: 100%;

+ 9
- 2
src/pages/WoDe/ShouYe/index.vue Просмотреть файл

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