门店显示问题

ghs/src/sass/shop/shop.vue

@@ -1,13 +1,8 @@
 <template>
     <div class="app-list-content">
         <x-crud class="liu-crud-wrap" @load="onLoad">
-            <!-- 收款二维码 -->
             <template #table-column-gatheringCode="{scope}">
-                <el-button type="text" @click="gotoPage(1,scope.row)">查看</el-button>
-            </template>
-            <!--会员申请码 -->
-            <template #table-column-applyCode="{scope}">
-                <el-button type="text" @click="gotoPage(2,scope.row)">查看</el-button>
+                <el-button type="text" @click="gotoPage(1,scope.row)"></el-button>
             </template>
         </x-crud>
     </div>
@@ -72,11 +67,6 @@
                                 prop: 'gatheringCode',
                                 label: '收款二维码',
                                 align: 'center',
-                            },
-                            {
-                                prop: 'applyCode',
-                                label: '会员申请码',
-                                align: 'center',
                             }
                         ],
                         // 操作列

ghsApp/src/admin/home/order.vue

@@ -129,7 +129,6 @@
       themeColor="#4C83D6"
       fields="day"
     ></rangeDatePick>
-    <kd-entrance></kd-entrance>
   </div>
 </template>
 

ghsApp/src/admin/shop/add.vue

@@ -5,7 +5,7 @@
 			<div class="module-com input-line-wrap">
 				<tui-list-cell class="line-cell" :hover="false">
 					<div class="tui-title required">门店名称</div>
-					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称" maxlength="50" type="text" />
+					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称，如同安店" maxlength="50" type="text" />
 				</tui-list-cell>
 			<tui-list-cell class="line-cell" :hover="false">
 			<div class="tui-title required" >门店图片</div>

hdApp/src/admin/shop/add.vue

@@ -5,7 +5,7 @@
 			<div class="module-com input-line-wrap">
 				<tui-list-cell class="line-cell" :hover="false">
 					<div class="tui-title required">门店名称</div>
-					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称" maxlength="50" type="text" />
+					<input v-model="form.shopName" placeholder-class="phcolor" class="tui-input" name="shopName" placeholder="请输入名称，如同安店" maxlength="50" type="text" />
 				</tui-list-cell>
 			<tui-list-cell class="line-cell" :hover="false">
 			<div class="tui-title required" >门店图片</div>

mallApp/src/mixins/globalMixins.js

@@ -46,36 +46,42 @@ export default {
 		// 登录
 		if (isLogin()) {
 			if (this.init) {
-				this.init()
-				// let self = this
-				// //切换门店，需要先确认有没生成客户id shish 2021.5.2
-				// if (oldAccount != option.account) {
-				// 	getShopUser(true).then(res => {
-				// 		if (!this.$util.isEmpty(res)) {
-				// 			self.init()
-				// 		}
-				// 	})
-				// } else {
-				// 	this.init()
-				// }
+				let self = this
+				//查看不同门店商城时，需要先确认有没生成客户id shish 2021.5.2
+				if (option.account && oldAccount != option.account) {
+
+					console.log('已经登陆，有切换门店',option.account,oldAccount)
+
+					getShopUser(true).then(res => {
+						if (!this.$util.isEmpty(res)) {
+							self.init()
+						}
+					})
+				} else {
+					console.log('已经登陆，并且没有切换门店')
+					this.init()
+				}
 			}
 		} else {
-			console.log(1112)
 			wxLoginFn().then(res => {
-				this.init()
-				// if (this.init) {
-				// 	let self = this
-				// 	//切换门店，需要先确认有没生成客户id shish 2021.5.2
-				// 	if (oldAccount != option.account) {
-				// 		getShopUser(true).then(res => {
-				// 			if (!this.$util.isEmpty(res)) {
-				// 				self.init()
-				// 			}
-				// 		})
-				// 	} else {
-				// 		this.init()
-				// 	}
-				// }
+				if (this.init) {
+					console.log(11113)
+					let self = this
+					//查看不同门店商城时，需要先确认有没生成客户id shish 2021.5.2
+					if (option.account && oldAccount != option.account) {
+
+						console.log('登陆后有切换门店',option.account,oldAccount)
+
+						getShopUser(true).then(res => {
+							if (!this.$util.isEmpty(res)) {
+								self.init()
+							}
+						})
+					} else {
+						console.log('登陆后没有切换门店')
+						this.init()
+					}
+				}
 			})
 		}
 

mallApp/src/pages/home/index.vue

@@ -5,6 +5,7 @@
       :list="ad"
       @detail="adDetailFn"
     />
+    <!-- <div @click="pageTo({url: '/pages/home/recent'})">返回首页</div> -->
     <block v-if="!$util.isEmpty(category)">
       <div
         class="goods-module"

mallApp/src/pages/home/recent.vue

@@ -16,7 +16,7 @@
           <!-- <app-avatar-module :src="item.shopImg" /> -->
           <image :src="item.avatar"></image>
           <view class="tit">
-            {{item.shopName}}
+            {{item.showName}}
           </view>
         </view>
       </template>