保存clientId

ghsApp/src/admin/home/workbench.vue

@@ -112,6 +112,7 @@ import {appLogin} from '@/api/common'
 import { getDictionaries } from '@/api/mini'
 import productMins from "@/mixins/product";
 import { allProduct } from '@/api/product'
+import { replaceClientId } from '@/api/admin'
 export default {
 	name: "admin-workbench",
 	components: {
@@ -196,39 +197,50 @@ export default {
 		...mapActions(['setUserShopAll']),
 
 		loginFun(mobile,password){
+			let that = this
 			uni.showLoading({mask:true})
 			//有几个地方涉及登陆，需要统一方法，请搜索关键词 uni_login
 			appLogin({mobile,password}).then(subRes=>{
 
 				if(subRes.code == 1){
 
-					if (this.$util.isEmpty(subRes)) {
+					if (that.$util.isEmpty(subRes)) {
 						return false
 					}
 					uni.setStorageSync('token', subRes.data.token)
 					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
 					getDictionaries({ token: subRes.data.token }).then(res => {
-						if (this.$util.isEmpty(res)) {
+						if (that.$util.isEmpty(res)) {
 							return false
 						}
-						this.$store.commit('setDictionariesInfo', { ...res.data.dict, ...res.data })
-						this.$store.commit('setMyShopInfo', { ...res.data.shop, ...res.data })
+						that.$store.commit('setDictionariesInfo', { ...res.data.dict, ...res.data })
+						that.$store.commit('setMyShopInfo', { ...res.data.shop, ...res.data })
 					})
-					this.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
+					that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 
-					this.show_login_model = false
+					that.show_login_model = false
 
 					uni.showTabBar()
 
 					getUser(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
 
 					//#ifdef APP-PLUS
-					this.skCustomId = subRes.data.skCustomId
-					this.listenPDAkd()
+					that.skCustomId = subRes.data.skCustomId
+					that.listenPDAkd()
 					// #endif
-					this.setUserShopAll()
-					this.init()
+
+					that.setUserShopAll()
+					that.init()
 					uni.hideLoading()
+					// #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}).then(res=>{ })
+					}
+					// #endif
 				}
 			})
 

ghsApp/src/api/admin/index.js

@@ -3,3 +3,8 @@ import https from "@/plugins/luch-request_0.0.7/request";
 export const modifyPassword = data => {
 	return https.get("/admin/modify-password", data);
 };
+
+//添加修改安卓clientId
+export const replaceClientId = data => {
+	return https.get("/admin/replace-client-id", data);
+}