|
|
@@ -274,15 +274,6 @@ export default {
|
|
|
that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
|
|
|
getShopInfo(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
|
|
|
that.setUserShopAll()
|
|
|
- // #ifdef APP-PLUS
|
|
|
- //保存安卓的clientId
|
|
|
- let hasClientId = !that.$util.isEmpty(subRes.data.admin.clientId) ? subRes.data.admin.clientId : ''
|
|
|
- const clientInfo = plus.push.getClientInfo()
|
|
|
- let currentClientId = !that.$util.isEmpty(clientInfo.clientid) ? clientInfo.clientid : ''
|
|
|
- if(hasClientId == '' || hasClientId != currentClientId){
|
|
|
- replaceClientId({id:currentClientId})
|
|
|
- }
|
|
|
- // #endif
|
|
|
|
|
|
//返回上一页带参数
|
|
|
let pages = getCurrentPages();
|
|
|
@@ -363,15 +354,6 @@ export default {
|
|
|
that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
|
|
|
getShopInfo(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
|
|
|
that.setUserShopAll()
|
|
|
- // #ifdef APP-PLUS
|
|
|
- //保存安卓的clientId
|
|
|
- let hasClientId = !that.$util.isEmpty(subRes.data.admin.clientId) ? subRes.data.admin.clientId : ''
|
|
|
- const clientInfo = plus.push.getClientInfo()
|
|
|
- let currentClientId = !that.$util.isEmpty(clientInfo.clientid) ? clientInfo.clientid : ''
|
|
|
- if(hasClientId == '' || hasClientId != currentClientId){
|
|
|
- replaceClientId({id:currentClientId})
|
|
|
- }
|
|
|
- // #endif
|
|
|
|
|
|
//返回上一页带参数
|
|
|
let pages = getCurrentPages();
|