调整

apis/utils/init.js

@@ -1,4 +1,4 @@
-import carhelp from '@/apis/utils/mixin.js'
+import carhelp from '@/apis/utils/mixin.js'
 
 import * as API_WeiXin from '@/apis/weixin.js'
 
@@ -10,139 +10,152 @@ import {
 var checkOpenId = true; //是否需要获取openId
 var openId = carhelp.getOpenId();
 var uid = carhelp.getUID();
+var unionPhone=carhelp.getUnionPhone()
+var app = {
 
-var app = {
-	
 	init: function() {
 		// isWeiXin()|| 
+		const jpuid = getUrlParam('unionid');
+		const otherUserId = getUrlParam('otherUserId');
+		var unionPhone = getUrlParam('unionPhone');
 		
-			if (isWeiXin()||(process.env.NODE_ENV === "development")) {
-				console.log(openId,uid)
-				if (checkOpenId) {
-					if (!openId&&!uid) {
-						this.ckUid();
-						
-					}else {
-						this.getPersion(openId)
-					}
+		if (jpuid) {
+			var obj = carhelp.get("xpgj_wx_user_info")
+			if (obj == null || obj == '') {
+				obj = {
+					
 				}
-			} else{
-				var NODE_NAME=  process.env['NODE_NAME']
-				if(NODE_NAME=="production"){
-					alert("请使用微信打开本页面")
+			}
+			obj.unionId = jpuid
+			obj.otherUserId = otherUserId
+			obj.unionPhone=unionPhone
+			carhelp.set("xpgj_wx_user_info", obj)
+			uid = carhelp.getUID();
+			unionPhone=carhelp.getUnionPhone()
+		}
+
+		if (isWeiXin() || (process.env.NODE_ENV === "development")) {
+
+			if (checkOpenId) {
+				if (uid&&unionPhone) {
+					this.ckUid();
+				} else if (!openId) {
+					this.getOpenId();
+
+				} else {
+					this.getPersion(openId)
 				}
 			}
-		
-		
-		
-	},
-	ckUid(){
-		
-		const jpuid = getUrlParam('unionid');
-		var otherUserId = getUrlParam('otherUserId');
-		var unionPhone = getUrlParam('unionPhone');
-		
-		
-		if (jpuid) {
-			carhelp.set("xpgj_wx_user_info",{
-				unionPhone:unionPhone,
-				unionId:jpuid,
-			})
-			API_WeiXin.findByPhone(jpuid,unionPhone).then(response => {
-				
-				 carhelp.setOpenId(response.data.regUser.openId)
-				 openId = response.data.openId;
-				 carhelp.set("xpgj_wx_user_info",{
-					 unionPhone:unionPhone,
-					 openId:response.data.regUser.openId,
-					 unionId:response.data.regUser.unionId,
-				 })
-				 
-				 
-				var token = response ? response.data.token : '';
-				carhelp.setPersonInfo(response.data.tenantInfo );
-				carhelp.setPersonInfoPlus(response.data );
-				
-				carhelp.setToken(token);
-				location.reload();
-			}).catch(error => {
-				console.log(error);
-				//this.getOpenId()
-			});
-			
-		}else{
-			//this.getOpenId();
-		}
+		} else {
+			var NODE_NAME = process.env['NODE_NAME']
+			if (NODE_NAME == "production") {
+				alert("请使用微信打开本页面")
+			}
+		}
+
+
+
 	},
-	 getPersion(thisopenId){
-		 console.log("init")
-		 var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
-		 var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
-		 
-		  if(token_tdate&&token_tdate==tdate){
+	ckUid() {
+
+	
+		if (uid&&unionPhone) {
+			
+			API_WeiXin.findByPhone(uid, unionPhone).then(response => {
+
+				carhelp.setOpenId(response.data.regUser.openId)
+				openId = response.data.openId;
+				carhelp.set("xpgj_wx_user_info", {
+					unionPhone: unionPhone,
+					openId: response.data.regUser.openId,
+					unionId: response.data.regUser.unionId,
+				})
+
+
+				var token = response ? response.data.token : '';
+				carhelp.setPersonInfo(response.data.tenantInfo);
+				carhelp.setPersonInfoPlus(response.data);
+
+				carhelp.setToken(token);
+				//location.reload();
+			}).catch(error => {
+				console.log(error);
+				//this.getOpenId()
+			});
+
+		} else {
+			this.getOpenId();
+		}
+	},
+	getPersion(thisopenId) {
+		console.log("init")
+		var tdate = new Date(+new Date() + 8 * 3600 * 1000).toJSON().substr(0, 15).replace("T", " ")
+		var token_tdate = carhelp.get("token_tdate"); //每10分钟存储一次token
+
+		if (token_tdate && token_tdate == tdate) {
 			return
-		  }
-		  
-		 var loginurl="/mobile/employeeUser/findByOpenId"
-		 var data={
-		 		openId:thisopenId,
-				unionid:carhelp.getUID(),
-
-				//data.type="5"
-				code:"reading"
-		 	}
-		  var obj= carhelp.get("xpgj_wx_user_info")
-		  if(obj&&obj.unionPhone){
-			loginurl="/mobile/employeeUser/findByPhone"
-			data.phone=obj.unionPhone
-		  }
-		 uni.request({
-		 	method:'get',
-		 	url: process.car.BASE_URL + loginurl,
-		 	data:data ,
-		 	header: {
-		 		'Content-Type': 'application/x-www-form-urlencoded',
-		 		'X-Requested-With': 'XMLHttpRequest',
-		 		//'Authorization':token
-		 	}
-		 }).then((response) => {
-		 	let [error, res] = response;
-		 	
-		 	if (res.data.code == 200&&res.data.result) {
-		 		
-		 		var token = res ? res.data.data.token : '';
-		 		carhelp.setPersonInfo(res.data.data.regUser );
-		 		carhelp.setPersonInfoPlus(res.data.data );
-		 		
-		 		carhelp.setToken(token);
-		 	 
-		 	}else{
-				carhelp.logoff();
+		}
+
+		var loginurl = "/mobile/employeeUser/findByOpenId"
+		var data = {
+			openId: thisopenId,
+			unionid: carhelp.getUID(),
+
+			//data.type="5"
+			code: "reading"
+		}
+		var obj = carhelp.get("xpgj_wx_user_info")
+		if (obj && obj.unionPhone) {
+			loginurl = "/mobile/employeeUser/findByPhone"
+			data.phone = obj.unionPhone
+		}
+		uni.request({
+			method: 'get',
+			url: process.car.BASE_URL + loginurl,
+			data: data,
+			header: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				'X-Requested-With': 'XMLHttpRequest',
+				//'Authorization':token
+			}
+		}).then((response) => {
+			let [error, res] = response;
+
+			if (res.data.code == 200 && res.data.result) {
+
+				var token = res ? res.data.data.token : '';
+				carhelp.setPersonInfo(res.data.data.regUser);
+				carhelp.setPersonInfoPlus(res.data.data);
+
+				carhelp.setToken(token);
+
+			} else {
+				carhelp.logoff();
 			}
-		 }).catch(error => {
-		 	
-		 	
-		 })
-	 },
+		}).catch(error => {
+
+
+		})
+	},
 	getOpenId() {
-		
+
 		const code = getUrlParam('code');
 		var openId = carhelp.getOpenId()
 		if (!openId) {
 			if (!code) {
 				var url = document.URL;
-				var getUrl= getWeixinRedirectURI(process.car.VUE_APP_WXAPPID, url);
-				 
+				var getUrl = getWeixinRedirectURI(process.car.VUE_APP_WXAPPID, url);
+
 				window.location.href = getUrl;
 			} else {
-				
+
 				API_WeiXin.getDataByCode(code).then(response => {
-					
+
 					carhelp.setOpenId(response.data.openid)
 					openId = response.data.openid;
-					carhelp.set("xpgj_wx_user_info",response.data)
-					
-					 location.reload();
+					carhelp.set("xpgj_wx_user_info", response.data)
+
+					location.reload();
 				}).catch(error => {
 					console.log(error);
 				});
@@ -150,4 +163,4 @@ var app = {
 		}
 	}
 }
-module.exports = app
+module.exports = app

apis/utils/mixin.js

@@ -1,128 +1,138 @@
-
 var prefix = 'jp-housekeep-manage-' + process.car.NODE_ENV + '_';
-
-var app = {
- 
-	getGzDate : (key) => {
-		var tdate=new Date( ).toJSON().substr(0,10).replace("T"," ")
-		var date= uni.getStorageSync( prefix + "is_gz_date")
-		
-		if(tdate==date){
-			return false
-		}else{
-			return  true;
-		}
-		
-	},
-		getUID:()=>{
-			var obj=uni.getStorageSync(prefix + 'xpgj_wx_user_info')
-			if(!obj){
-				obj={}
-			}
-			if(obj.unionid&&!obj.unionId){
-				obj.unionId=obj.unionid
-			}
-			return obj.unionId
-		},
-
-	setGzDate : () => uni.setStorageSync(prefix + "is_gz_date", new Date( ).toJSON().substr(0,10).replace("T"," ") ),
-	
-	getGunIdCharge :()=>{
-
-		var date= uni.getStorageSync( prefix + "GunId_Date_charge")
-		var now=new Date().getTime()
-		if(date+5*60*1000>now){
-			return  uni.getStorageSync(prefix +  "GunId_Date_Show_charge")
-		}else{
-			return "";
-		}
-	},
-	
-	setGunIdCharge : ( value) => {
-		uni.setStorageSync(prefix + "GunId_Date_Show_charge", value)
-		uni.setStorageSync(prefix + "GunId_Date_charge", new Date().getTime())
-		
-	},
-	
-	
-	getPrefix:()=> prefix,
-	get : key =>  uni.getStorageSync(prefix + key),
-
-	set : (key, value) => uni.setStorageSync(prefix + key, value),
-	remove: key =>  uni.removeStorageSync(prefix + key),
-	setConfig : (value) => uni.setStorageSync(prefix + '_config_$', value),
-	getConfig : () => {
-		var config = uni.getStorageSync(prefix + '_config_$')
-		var configure={}
-		if(config){
-			for(var  i in config){
-				var con=config[i];
-				configure[con.key]=con.value
-			}
-		}
-		 return configure;
-	},
-	
-	setConfigMessage : (value) => uni.setStorageSync(prefix + '_config_tips_$', value),
-	getConfigMessage : () => {
-		var config = uni.getStorageSync(prefix + '_config_tips_$')
-		if(!config){
-			config=[]
-		}
-		 return config;
-	},
-	
-	logoff:()=>{
-		uni.removeStorageSync(prefix + 'token_tdate')
-		uni.removeStorageSync(prefix + 'token')
-		uni.removeStorageSync(prefix  + 'personInfo');
+
+var app = {
+
+	getGzDate: (key) => {
+		var tdate = new Date().toJSON().substr(0, 10).replace("T", " ")
+		var date = uni.getStorageSync(prefix + "is_gz_date")
+
+		if (tdate == date) {
+			return false
+		} else {
+			return true;
+		}
+
+	},
+	getUID: () => {
+		var obj = uni.getStorageSync(prefix + 'xpgj_wx_user_info')
+		if (!obj) {
+			obj = {}
+		}
+		if (obj.unionid && !obj.unionId) {
+			obj.unionId = obj.unionid
+		}
+		return obj.unionId
+	},
+	getUnionPhone: () => {
+		var obj = uni.getStorageSync(prefix + 'xpgj_wx_user_info')
+		if (!obj) {
+			obj = {}
+		}
+		
+		return obj.unionPhone
+		// if(!(process.env.NODE_ENV === "development") ){
+
+		// }else{
+		// 	return process.car.unionid
+		// }
+	},
+	setGzDate: () => uni.setStorageSync(prefix + "is_gz_date", new Date().toJSON().substr(0, 10).replace("T", " ")),
+
+	getGunIdCharge: () => {
+
+		var date = uni.getStorageSync(prefix + "GunId_Date_charge")
+		var now = new Date().getTime()
+		if (date + 5 * 60 * 1000 > now) {
+			return uni.getStorageSync(prefix + "GunId_Date_Show_charge")
+		} else {
+			return "";
+		}
+	},
+
+	setGunIdCharge: (value) => {
+		uni.setStorageSync(prefix + "GunId_Date_Show_charge", value)
+		uni.setStorageSync(prefix + "GunId_Date_charge", new Date().getTime())
+
+	},
+
+
+	getPrefix: () => prefix,
+	get: key => uni.getStorageSync(prefix + key),
+
+	set: (key, value) => uni.setStorageSync(prefix + key, value),
+	remove: key => uni.removeStorageSync(prefix + key),
+	setConfig: (value) => uni.setStorageSync(prefix + '_config_$', value),
+	getConfig: () => {
+		var config = uni.getStorageSync(prefix + '_config_$')
+		var configure = {}
+		if (config) {
+			for (var i in config) {
+				var con = config[i];
+				configure[con.key] = con.value
+			}
+		}
+		return configure;
+	},
+
+	setConfigMessage: (value) => uni.setStorageSync(prefix + '_config_tips_$', value),
+	getConfigMessage: () => {
+		var config = uni.getStorageSync(prefix + '_config_tips_$')
+		if (!config) {
+			config = []
+		}
+		return config;
+	},
+
+	logoff: () => {
+		uni.removeStorageSync(prefix + 'token_tdate')
+		uni.removeStorageSync(prefix + 'token')
+		uni.removeStorageSync(prefix + 'personInfo');
 		uni.removeStorageSync(prefix + 'personInfoPlus');
-	//	uni.removeStorageSync(prefix + 'getElderModeClass');
-		//uni.removeStorageSync(prefix+'wx_openId');
-		
-	},
-	
-	getPersonInfo : () => {
-		 return uni.getStorageSync(prefix + 'personInfo')
-	},
-	getPersonInfoPlus : () => {
-		 return uni.getStorageSync(prefix + 'personInfoPlus')
+		//	uni.removeStorageSync(prefix + 'getElderModeClass');
+		//uni.removeStorageSync(prefix+'wx_openId');
+
 	},
-	signOut:()=>  uni.removeStorageSync(prefix  + 'personInfo'),
-	getOpenId : () =>   uni.getStorageSync(prefix + 'wx_openId'+process.car.VUE_APP_WXAPPID),
-	setOpenId : (value) => uni.setStorageSync(prefix + 'wx_openId'+process.car.VUE_APP_WXAPPID, value),
-	
-	getOpenIdALI : () =>   uni.getStorageSync(prefix + 'ali_openId'+process.car.VUE_APP_WXAPPID),
-	setOpenIdALI : (value) => uni.setStorageSync(prefix + 'ali_openId'+process.car.VUE_APP_WXAPPID, value),
-	
-	getUserInfo : () => {
-		 return uni.getStorageSync(prefix + 'xpgj_wx_user_info')
+
+	getPersonInfo: () => {
+		return uni.getStorageSync(prefix + 'personInfo')
+	},
+	getPersonInfoPlus: () => {
+		return uni.getStorageSync(prefix + 'personInfoPlus')
 	},
+	signOut: () => uni.removeStorageSync(prefix + 'personInfo'),
+	getOpenId: () => uni.getStorageSync(prefix + 'wx_openId' + process.car.VUE_APP_WXAPPID),
+	setOpenId: (value) => uni.setStorageSync(prefix + 'wx_openId' + process.car.VUE_APP_WXAPPID, value),
 
-	setPersonInfo : (value) => uni.setStorageSync(prefix + 'personInfo', value),
-	setPersonInfoPlus : (value) => uni.setStorageSync(prefix + 'personInfoPlus', value),
-	
-	setUserInfo : (value) => uni.setStorageSync(prefix + 'xpgj_wx_user_info', value),
-	
-	getToken : (options) => {
-		//不同权限 ，不同token
-	
-		return uni.getStorageSync(prefix + 'token')
-	},
-	setToken : (value) => {
-		uni.setStorageSync(prefix + 'token', value)
-		
-		if(value){
-			var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
-			uni.setStorageSync(prefix + 'token_tdate', tdate)
-		}
-	}
-	,
-	getGetElderModeClass : () => {
-		 return uni.getStorageSync(prefix + 'getElderModeClass')
+	getOpenIdALI: () => uni.getStorageSync(prefix + 'ali_openId' + process.car.VUE_APP_WXAPPID),
+	setOpenIdALI: (value) => uni.setStorageSync(prefix + 'ali_openId' + process.car.VUE_APP_WXAPPID, value),
+
+	getUserInfo: () => {
+		return uni.getStorageSync(prefix + 'xpgj_wx_user_info')
 	},
-	setGetElderModeClass : (value) => uni.setStorageSync(prefix + 'getElderModeClass', value),
-	
+
+	setPersonInfo: (value) => uni.setStorageSync(prefix + 'personInfo', value),
+	setPersonInfoPlus: (value) => uni.setStorageSync(prefix + 'personInfoPlus', value),
+
+	setUserInfo: (value) => uni.setStorageSync(prefix + 'xpgj_wx_user_info', value),
+
+	getToken: (options) => {
+		//不同权限 ，不同token
+
+		return uni.getStorageSync(prefix + 'token')
+	},
+	setToken: (value) => {
+		uni.setStorageSync(prefix + 'token', value)
+
+		if (value) {
+			var tdate = new Date(+new Date() + 8 * 3600 * 1000).toJSON().substr(0, 15).replace("T", " ")
+			uni.setStorageSync(prefix + 'token_tdate', tdate)
+		}
+	},
+	getGetElderModeClass: () => {
+		return uni.getStorageSync(prefix + 'getElderModeClass')
+	},
+	setGetElderModeClass: (value) => uni.setStorageSync(prefix + 'getElderModeClass', value),
+
 }
 
-module.exports = app
+module.exports = app

config/.env.dev.js

@@ -3,7 +3,7 @@ const UNI_APP = {
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 
 	BASE_URL: 'https://youdian-test.hbjp.com.cn/electric-manager-api/', //test
-	//BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
+	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
 	//BASE_URL: 'https://dgj.jzrccs.com/electric-manager-api/',
 	
 	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz

pages/tenantList/remindList.vue

@@ -58,6 +58,7 @@
 				companyId: '',
 				show1: false, // 时间选择
 				defaultTime: '',
+				unionPhone:false,
 				params: {
 					year: true,
 					month: true,
@@ -137,6 +138,9 @@
 			if(op.id) {
 				this.companyId = op.id;
 			}
+			if(op.unionPhone) {
+				this.unionPhone = true;
+			}
 			
 			var date = new Date();
 			var year = date.getFullYear();
@@ -173,7 +177,7 @@
 					pageIndex: this.pageIndex,
 					pageSize: 20,
 					companyId: this.companyId,
-					queryParent:this.companyId?1:0,
+					queryParent:this.companyId||this.unionPhone?1:0,
 					level:this.list[this.current].level
 				}).then((res) => {
 					uni.hideLoading();