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