zhengkaixin 1 år sedan
förälder
incheckning
0f81cd28fe

+ 1 - 0
apis/pagejs/index.js

@@ -80,6 +80,7 @@ export function findByOpenId(data) {
 	var url='/mobile/employeeUser/findByOpenId';
 	if(data){
 		//data.type="2"
+		data.code="detector"
 	}
 	return request({
 		method: 'get',

+ 3 - 1
apis/pagejs/user.js

@@ -60,6 +60,7 @@ export function findByOpenId(data) {
 	var url = '/mobile/employeeUser/findByOpenId';
 	if(data){
 		//data.type="2"
+		data.code="detector"
 	}
 	return requestWhite({
 		method: 'get',
@@ -71,7 +72,8 @@ export function findByOpenId(data) {
 
 
 export function login(data) {
-	var url = '/mobile/employeeUser/login';
+	var url = '/mobile/employeeUser/login';
+	data.code="detector"
 	return requestWhite({
 		method: 'post',
 		data: data,

+ 2 - 1
apis/utils/init.js

@@ -68,7 +68,8 @@ var app = {
 		 	url: process.car.BASE_URL + loginurl,
 		 	data: {
 		 		openId:thisopenId,
-				//type:'2'
+				//type:'2'
+				code:"detector"
 		 	},
 		 	header: {
 		 		'Content-Type': 'application/x-www-form-urlencoded',

+ 1 - 0
apis/utils/request.js

@@ -33,6 +33,7 @@ const request = (options) => {
 			data: {
 				openId:openId,
 			//	type:'2'
+				code:"detector"
 			},
 			
 			header: {

+ 1 - 0
config/.env.dev.js

@@ -17,6 +17,7 @@ const UNI_APP = {
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	 openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	// openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
+	//openId:"oLowyuB1PliW0qAnJJ56axydeUOM", //sz
 	//openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //wang
 	//openId:"oLowyuFTU3SzpvU4pGNzWk7NC9y0", //me
 	

+ 12 - 2
pages/login/login.vue

@@ -109,8 +109,18 @@
 					
 				}).then((response) => {
 					
-					this.loginset(response)
-					
+					if(response.message){
+						if(response.message=='没有权限'){
+							uni.hideLoading();
+							uni.showModal({
+								title:"提示",
+								showCancel:false,
+								content:"没有权限"
+							})
+						}
+					}else{
+						this.loginset(response)
+					}
 				
 				}).catch(error => {
 					uni.hideLoading();

+ 3 - 2
pages/statistics/statistics.vue

@@ -491,7 +491,7 @@
 						name: '变压器巡检仪'
 					},
 					{
-						name: '费控电表量仪'
+						name: '费控电表量仪'
 					}
 				],
 				
@@ -1092,7 +1092,8 @@
 		position: fixed;
 		left: 0;
 		right: 0;
-		top: 0;
+		top: 0;
+		    font-weight: bold;
 		z-index: 999999;
 
 		.img {