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

ghs/src/admin/staff/add.vue

@@ -107,8 +107,8 @@
     <div v-show="showMiniCodeArea">
       <view style="text-align:center;">
           <image style="width:200px;height:200px;margin:0 auto;" :src="miniCodeSrc"></image>
-          <view style="text-align:center;margin-top:20px;margin-bottom:20px;">请扫描上方小程序码完成绑定</view>
-          <button class="admin-button-com big blue" @click="complete" style="padding-left:18px;padding-right:18px;">完成</button>
+          <view style="text-align:center;margin-top:20px;margin-bottom:20px;">请让员工扫描上方太阳码完成绑定</view>
+          <button class="admin-button-com big blue" @click="complete" style="padding-left:23px;padding-right:23px;">完成</button>
       </view>
     </div>
   </div>

ghs/src/utils/auth.js

@@ -92,15 +92,13 @@ export async function wxLoginFn(update) {
 						return false
 					}
 
-					// @傅威 明天要发版，我做了个临时解决方案，这块请优化好
-
 					var pages = getCurrentPages();
 					var page = (pages[pages.length - 1]).route;
 
 					resolve({ redirectPage: page, ...subRes })
 
 					uni.setStorageSync('token', subRes.data.token)
-					uni.setStorageSync('shopId', subRes.data.shopId)
+					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
 					store.commit('setLoginInfo', subRes.data.admin)
 
 					//启动更新逻辑 shish 2020.5.18