1.修改遗漏补全 2.修复bug

hdPad/src/pages/home/components/leftArea.vue

@@ -2,7 +2,7 @@
     <view class="itemList-box">
         <view class="title">
             列表
-            <text style="float:right;">{{ getMyShopInfo.shopName=='首店'? getMyShopInfo.merchantName: getMyShopInfo.merchantName+' '+getMyShopInfo.shopName}}</text>
+            <text style="float:right;">{{ getMyShopInfo.shop.shopName=='首店'? getMyShopInfo.shop.merchantName: getMyShopInfo.shop.merchantName+' '+getMyShopInfo.shop.shopName}}</text>
         </view>
         <view class="itemList-item_box">
             <view v-for="item in selectList" :key="item.id" class="show-item_box">

hdPad/src/pages/home/components/nav.vue

@@ -81,6 +81,7 @@ export default {
       }
 		},
     goTo(item) {
+      let that = this
       this.$util.hitVoice()
 
       if(item.flag == 'close'){

hdPad/src/pages/home/login.vue

@@ -76,7 +76,7 @@ export default {
 							return false
 						}
 						that.$store.commit('setDictionariesInfo', { ...res.data.dict, ...res.data })
-						that.$store.commit('setMyShopInfo', { ...res.data.shop, ...res.data })
+						that.$store.commit('setMyShopInfo', { ...res.data }) //...res.data.shop,
 					})
 					that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 					getUser(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })

hdPad/src/utils/auth.js

@@ -89,7 +89,7 @@ export async function wxMiniLogin(update) {
 							return false
 						}
 						store.commit('setDictionariesInfo', { ...res.data.dict, ...res.data })
-						store.commit('setMyShopInfo', { ...res.data.shop, ...res.data })
+						store.commit('setMyShopInfo', { ...res.data }) //...res.data.shop,
 					})
 					store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 					//启动更新逻辑 shish 2020.5.18