Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

utils/request.js

@@ -46,7 +46,7 @@ const request = (options) => {
 			}
 		}).then((response) => {
  			let [error, res] = response;
- 		  
+			
 			if (res.data.code == 200&&res.data.result) {
 				
 				var token = res ? res.data.data.token : '';
@@ -63,22 +63,18 @@ const request = (options) => {
 			} else  if(res.data.code == 415||(res.data.code == 200&&!res.data.result)||res.data.code == 400){
 				
 				//var url=window.location.href.split("#")[1]
-				if(options&&options.jp_identity){
-					
-				}else{
-					
-					
-				}
-				
-				var url="/pages/login/index?message=请登录&back="+ url+"&phone="+options.data.phone
+			
+				console.log(options.url)
+				//var url="/pages/login/index?message=请登录&back="+ url+"&phone="+options.data.phone
 				carhelp.signOut()
 				uni.redirectTo({
-					url: '/pages/login/index'
+					url: '/pages/login/login'
 				})
 				
 			 
 				
 			}else{
+		
 				reject(res.data.message)
 			}
 		}).catch(error => {