Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/mixins/globalMixins.js

@@ -78,7 +78,16 @@ export default {
 			if (this.init) {
 				this.init()
 			}
-		}
+    }
+    if (uni.setStorageSync('OPEN_SHOP_ID') == '2') {
+      this.MODEL_TITLE = '已申请'
+      this.MODEL_BTN_TEXT = '查看申请进度'
+      this.AUTHORITY_SHOW = true
+      uni.hideTabBar()
+    } else if (uni.setStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
+      this.AUTHORITY_SHOW = true;
+      uni.hideTabBar()
+    }
 
 	},
 	methods: {
@@ -88,7 +97,6 @@ export default {
         if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
           this.$util.pageTo({
             url: "/pagesClient/official/index",
-            type: 2,
             query: {
               ...this.option
             }
@@ -103,7 +111,6 @@ export default {
             }
             this.$util.pageTo({
               url: '/admin/home/result',
-              type: 2,
               query: {
                 status
               }

ghsApp/src/pagesClient/official/index.vue

@@ -4,7 +4,7 @@
       <image :src="`${constant.imgUrl}/ghs/home_page/logo.png`" mode="widthFix"></image>
 
 					<view class="header_logo-more">
-						<view class="experience" v-if="getLoginInfo.showDemo==1" @tap="experienceFun">体验</view>
+						<!-- <view class="experience" v-if="getLoginInfo.showDemo==1" @tap="experienceFun">体验</view> -->
 						<view @click="register()" class="free_register" v-if="getLoginInfo.openShop == 1">免费注册</view>
 						<view v-if="getLoginInfo.openShop != 1" class="free_register">已申请</view>
 					</view>
@@ -125,7 +125,7 @@ export default {
   },
   onShow() {
     // 隐藏返回首页按钮。
-    uni.hideHomeButton()
+    // uni.hideHomeButton()
   },
   methods: {
 			...mapActions(['setUserShopAll']),

ghsApp/src/pagesClient/official/pay.vue

@@ -92,7 +92,6 @@ export default {
     paySuccess() {
       this.$util.pageTo({
         url: "/official/callback",
-        type: 2,
         query: {
           pagestatus: 1
         }

ghsApp/src/pagesClient/official/result.vue

@@ -5,10 +5,7 @@
         </view>
 		<button 
             class="admin-button-com blue big" 
-            @click="pageTo({
-                url: '/admin/home/workbench',
-                type: 4
-              })"
+            @click="close"
             >
             关闭
             </button>
@@ -25,6 +22,10 @@ export default {
     methods:{
         handleContact(e){
             console.log(e)
+        },
+        close() {
+          this.pageTo({url: '/admin/home/workbench', type: 4})
+          uni.setStorageSync('OPEN_SHOP_ID', '2')
         }
     }
 };

hdApp/src/mixins/globalMixins.js

@@ -79,7 +79,16 @@ export default {
 			if (this.init) {
 				this.init()
       }
-		}
+    }
+    if (uni.setStorageSync('OPEN_SHOP_ID') == '2') {
+      this.MODEL_TITLE = '已申请'
+      this.MODEL_BTN_TEXT = '查看申请进度'
+      this.AUTHORITY_SHOW = true
+      uni.hideTabBar()
+    } else if (uni.setStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
+      this.AUTHORITY_SHOW = true;
+      uni.hideTabBar()
+    }
 	},
 	methods: {
     ...mapActions(['setUserShopAll']),
@@ -88,7 +97,6 @@ export default {
         if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
           this.$util.pageTo({
             url: "/pagesClient/official/index",
-            type: 2,
             query: {
               ...this.option
             }
@@ -103,7 +111,6 @@ export default {
             }
             this.$util.pageTo({
               url: '/admin/home/result',
-              type: 2,
               query: {
                 status
               }

hdApp/src/pagesClient/official/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-content">
-			<view class="experience" v-if="getLoginInfo.showDemo==1" @tap="experienceFun">体验</view>
+			<!-- <view class="experience" v-if="getLoginInfo.showDemo==1" @tap="experienceFun">体验</view> -->
     <div class="tab-wrap">
       <div class="logo-img">
         <img :src="`${constant.imgUrl}/retail/official/logo.png`" alt />
@@ -50,7 +50,7 @@
       <img :src="`${constant.imgUrl}/retail/common/trademark.png`" alt />
     </div>
     <!-- buttom -->
-    <div class="app-footer" @click="pageTo({url: '/pagesClient/official/pay',query:{...option}})" v-if="getLoginInfo.openShop == 1">申请试用</div>
+    <div class="app-footer" @click="pageTo({url: '/pagesClient/official/pay',type: 2,query:{...option}})" v-if="getLoginInfo.openShop == 1">申请试用</div>
     <div class="app-footer" v-if="getLoginInfo.openShop != 1">已申请</div>
   </div>
 </template>
@@ -142,7 +142,7 @@ export default {
   },
   mounted() {
     // 隐藏返回首页按钮。
-    uni.hideHomeButton()
+    // uni.hideHomeButton()
   },
   methods: {
 			...mapActions(['setUserShopAll']),

hdApp/src/pagesClient/official/result.vue

@@ -5,10 +5,7 @@
         </view>
 		<button 
             class="admin-button-com blue big" 
-            @click="pageTo({
-                url: '/admin/home/workbench',
-                type: 4
-              })"
+            @click="close"
             >
             关闭
             </button>
@@ -25,6 +22,10 @@ export default {
     methods:{
         handleContact(e){
             console.log(e)
+        },
+        close() {
+          this.pageTo({url: '/admin/home/workbench', type: 4})
+          uni.setStorageSync('OPEN_SHOP_ID', '2')
         }
     }
 };