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

ghs/src/App.vue

@@ -16,8 +16,9 @@
 			// uni.clearStorage()
 			const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
 			uni.setStorageSync('account', extConfig.account)
+			
 			// #endif
-			wxLoginFn()
+			wxLoginFn(true)
 				.then(res => {
 					//花店员工和未知身份可以访问的地址
 					var urlArr = ['admin/shopAdmin/bind', 'pagesClient/official','pagesClient/member/bind','pagesShare/pay'];
@@ -62,6 +63,7 @@
 					getUser(true)
 					//获取门店信息
 					this.setUserShopAll()
+					
 				})
 		},
 		onLoad(){

ghs/src/utils/auth.js

@@ -77,12 +77,13 @@ export async function getSelfInfo(update) {
  * @parmas update为true时会重新触发请求，重置vuex的数据
  */
 export async function wxLoginFn(update) {
+	
 	let dataInfo = null
 	let loginInfo = store.state.login.loginInfo
 	if (!util.isEmpty(loginInfo) && !update) {
 		return loginInfo
 	}
-	return new Promise(resolve => {
+	return new Promise((resolve,reject) => {
 		uni.login({
 			provider: 'weixin',
 			success: res => {
@@ -129,6 +130,9 @@ export async function wxLoginFn(update) {
 					}
 
 				})
+			},
+			fail:err=>{
+				reject(err)
 			}
 		})
 	})