Merge branch 'master' of http://git.ycjcjy.com/xuchengxiang/niucai-admin

src/pages/WoDe/ZhiFuBaoRenZheng/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer @ShopInfoChange="ShopInfoChange" :ShowMainHeader="true" :MainHeaderTitle="`店铺认证`" :ShowMainHeaderBack="true" :ShowMainHeaderMore="true" :MainHeaderMoreIcon="`iconbaocun`" :MainHeaderMoreText="CurrentShopInfo !== null ? CurrentShopInfo.isAliAuthed ? `保存` : `授权` : ``" :MainHeaderMoreClick="SaveForm">
+    <MainPageContainer @ShopInfoChange="ShopInfoChange" :ShowMainHeader="true" :MainHeaderTitle="`店铺认证`" :ShowMainHeaderBack="true" :ShowMainHeaderMore="true" :MainHeaderMoreIcon="`iconbaocun`" :MainHeaderMoreText="`保存`" :MainHeaderMoreClick="SaveForm">
       <div class="Container">
         <div class="Content">
 
@@ -112,6 +112,9 @@
               <div class="flex-item"></div>
               <i class="iconfont iconjiantouright"></i>
             </router-link>
+            <div class="Btn">
+              <a @click="ShowQrCodeLayer = true">授权</a>
+            </div>
           </div>
 
         </div>
@@ -255,42 +258,38 @@ export default {
       return true
     },
     SaveForm () { // 保存认证
-      if (this.CurrentShopInfo.isAliAuthed) {
-        if (this.DataLock || !this.CheckForm()) return
-        this.DataLock = true
-        let Data = {
-          shop: {
-            businessLicense: this.ZZImg,
-            address: this.AddressDetail,
-            cityId: this.City,
-            keeperId: this.UserInfo.keeperId,
-            lat: this.Lat,
-            lng: this.Lng,
-            name: this.ShopName,
-            provinceId: this.Province,
-            openTime: this.StartTime,
-            closeTime: this.EndTime
-          },
-          shopkeeper: {
-            avatar: this.UserInfo.avatar,
-            backIdCard: this.SfzfmImg,
-            frontIdCard: this.SfzzmImg,
-            keeperId: this.UserInfo.keeperId,
-            name: this.UserInfo.name,
-            phone: this.UserInfo.phone
-          }
+      if (this.DataLock || !this.CheckForm()) return
+      this.DataLock = true
+      let Data = {
+        shop: {
+          businessLicense: this.ZZImg,
+          address: this.AddressDetail,
+          cityId: this.City,
+          keeperId: this.UserInfo.keeperId,
+          lat: this.Lat,
+          lng: this.Lng,
+          name: this.ShopName,
+          provinceId: this.Province,
+          openTime: this.StartTime,
+          closeTime: this.EndTime
+        },
+        shopkeeper: {
+          avatar: this.UserInfo.avatar,
+          backIdCard: this.SfzfmImg,
+          frontIdCard: this.SfzzmImg,
+          keeperId: this.UserInfo.keeperId,
+          name: this.UserInfo.name,
+          phone: this.UserInfo.phone
         }
-        this.ShopValid({ data: { ...Data } }).then((res) => {
-          this.Toast('认证提交成功')
-          this.GetCurrentShopInfo()
-          this.DataLock = false
-        }).catch((res) => {
-          this.Toast(res.data.message)
-          this.DataLock = false
-        })
-      } else {
-        this.ShowQrCodeLayer = true
       }
+      this.ShopValid({ data: { ...Data } }).then((res) => {
+        this.Toast('认证提交成功')
+        this.GetCurrentShopInfo()
+        this.DataLock = false
+      }).catch((res) => {
+        this.Toast(res.data.message)
+        this.DataLock = false
+      })
     },
     EndTimeConfirm (e) { // 确定选择结束时间
       this.EndTime = this.CurrentEndDate

src/pages/WoDe/ZhiFuBaoRenZheng/page.scss

@@ -61,6 +61,20 @@
             margin-left: 0.1rem;
           }
         }
+        > .Btn {
+          padding: 0 0.15rem;
+          margin-top: 0.2rem;
+          padding-bottom: 0.2rem;
+          > a {
+            font-size: 0.14rem;
+            color: #fff;
+            background: #d91e36;
+            border-radius: 0.06rem;
+            line-height: 0.4rem;
+            display: block;
+            text-align: center;
+          }
+        }
         > .PhotoList {
           font-size: 0;
           padding-bottom: 0.15rem 0.15rem 0;