调整

apis/login.js

@@ -1,16 +1,32 @@
  import requestWhite from '@/apis/utils/requestWhite.js';
+ import requestOpenId from '@/apis/utils/requestOpenId.js';
  
 import Qs from 'qs';
 
 export function findByOpenId(data) {
 	var url='/mobile/regUser/findByOpenId';
-	return requestWhite({
+	console.log(data)
+	return requestOpenId({
 		method: 'get',
 		data: data,
 		url: url
 	})
 }
 
+export function findByOpenIdDetailed(openId) {
+	var url='/mobile/regUser/findByOpenId';
+	console.log(data)
+	return requestOpenId({
+		method: 'get',
+		data: {
+			openId:openId,
+			detailed:1
+		},
+		url: url
+	})
+}
+
+
  export function findNoLTextConfigure(data) {
  	var url='/mobile/dataDictionary/findNoLTextConfigure';
  	return requestWhite({

apis/parents/classSchedule.js

@@ -1,4 +1,4 @@
-import requestStudent from '@/apis/utils/requestStudent.js';
+import requestStudent from '@/apis/utils/request.js';
 import Qs from 'qs';
 
 export function loadMySchedule(data) {

apis/parents/homePage.js

@@ -1,2 +1,2 @@
-import requestStudent from '@/apis/utils/requestStudent.js';
+import requestStudent from '@/apis/utils/request.js';
 import Qs from 'qs';

apis/parents/mine.js

@@ -1,4 +1,4 @@
-import requestStudent from '@/apis/utils/requestStudent.js';
+import requestStudent from '@/apis/utils/request.js';
 import Qs from 'qs';
 
 export function getStudentDtl(data) {

apis/utils/init.js

@@ -1,6 +1,7 @@
 import carhelp from '@/apis/utils/mixin.js'
 
 import * as API_WeiXin from '@/apis/weixin.js'
+import * as loginApi from '@/apis/login.js'
 
 import {
 	getUrlParam,
@@ -43,26 +44,19 @@ var app = {
 			return
 		  }
 		  
-		 var loginurl="/mobile/regUser/findByOpenId"
+		
 		  
-		 uni.request({
-		 	method:'get',
-		 	url: process.car.BASE_URL + loginurl,
-		 	data: {
-		 		openId:thisopenId,
-		 	},
-		 	header: {
-		 		'Content-Type': 'application/x-www-form-urlencoded',
-		 		'X-Requested-With': 'XMLHttpRequest',
-		 		//'Authorization':token
-		 	}
-		 }).then((response) => {
+		//debugger
+		loginApi.findByOpenId({
+						openId:thisopenId,
+					
+					}).then((response) => {
 		 	let [error, res] = response;
 		 	
-		 	if (res.data.code == 200&&res.data.result) {
+		 	if (res.code == 200&&res.result) {
 		 		
-		 		var token = res ? res.data.data.token : '';
-		 		carhelp.setPersonInfo(res.data.data.regUser );
+		 		var token = res ? res.token : '';
+		 		carhelp.setPersonInfo(res.data.regUser );
 		 		
 		 		carhelp.setToken(token);
 		 	 

apis/utils/request.js

@@ -2,6 +2,8 @@ import  carhelp from '@/apis/utils/mixin.js'
 import requestSon from './requestSon.js';
 import requestNum from './requestNum.js';
 
+import * as loginApi from '@/apis/login.js'
+
 
 const request = (options) => {
 	//记录请求次数和响应次数
@@ -25,24 +27,11 @@ const request = (options) => {
 	}
 	
 	return new Promise((resolve, reject) => {
-		 var loginurl="/mobile/regUser/findByOpenId"
+		// var loginurl="/mobile/regUser/findByOpenId"
 		 
 		
-		 
-		uni.request({
-			method:'get',
-			url: process.car.BASE_URL + loginurl,
-			data: {
-				openId:openId,
-			
-			},
-			
-			header: {
-				'Content-Type': 'application/x-www-form-urlencoded',
-				'X-Requested-With': 'XMLHttpRequest',
-				//'Authorization':token
-			}
-		}).then((response) => {
+		// debugger
+		loginApi.findByOpenIdDetailed(openId).then((response) => {
  			let [error, res] = response;
 			
 			

apis/utils/requestOpenId.js

@@ -0,0 +1,105 @@
+import  carhelp from '@/apis/utils/mixin.js'
+import * as loginApi from '@/apis/login.js'
+
+//记录请求次数和响应次数
+let reqCount = 0,
+	resCount = 0;
+//var token=carhelp.getToken();
+var baseUrl=process.car.BASE_URL;
+
+if (process.env.NODE_ENV === "development") {
+	//baseUrl="http://192.168.33.90:8086/jp-employment-server";
+}
+const request = (options) => {
+	var token=carhelp.getToken(options);
+	
+	reqCount++;
+	 
+	return new Promise((resolve, reject) => {
+		//如果特殊链接需要传入token
+		if(options&&options.token){
+			token=options.token;
+		}
+		uni.request({
+			method: options.method?options.method:'get',
+			url: baseUrl + options.url,
+			data: options.data?options.data:{},
+			
+			header: options.header?{
+				...options.header,
+				'Authorization':token
+			}:{
+				'Content-Type': 'application/x-www-form-urlencoded',
+				'X-Requested-With': 'XMLHttpRequest',
+				'Authorization':token
+			}
+		}).then((response) => {
+			//for(var t = Date.now(); Date.now() - t <= 2000;);
+			
+			resCount++
+			//防止连续请求多个接口时loading闪现
+			let [error, res] = response;
+			var returnObj=res.data
+			if (res.data.code == 415&&res.data.message=='请先注册信息') {
+				carhelp.signOut()
+				uni.redirectTo({
+					url: '/pages/login/index'
+				})
+				return;
+			}
+			
+			if (res.data.code != 200) {
+				reject(res.data.message)
+			} else {
+				var obj={
+					"result": false,
+					"message": "openid不存在",
+					"data": null,
+					"code": 200
+				}
+				
+				if(options.detailed){
+					returnObj=res
+				}
+				//console.log(res.data.data.regUser.userType)
+				if(res.data.result){
+					var url=window.location.href.split("#")[1]
+					
+					if(res.data.data.regUser.userType=="1"){
+						if(url.indexOf("/pages/parents/") == 0){
+							resolve(returnObj);
+						}
+					}
+					if(res.data.data.regUser.userType=="2"){
+						if(url.indexOf("/pages/teacher/") == 0){
+							resolve(returnObj);
+						}
+					}
+					if(res.data.data.regUser.userType=="1,2"){
+						resolve(returnObj);
+					}
+					console.log("findByOpenId 查询为空 ")
+					resolve(obj);
+				
+				}else{	
+					resolve(returnObj);
+				}
+				
+				
+				
+			
+			}
+		}).catch(error => {
+			resCount++
+		
+			let [err, res] = error;
+			if(options.detailed){
+				reject(error)
+			}else{
+				reject(err)
+			}
+			
+		})
+	});
+}
+export default request

apis/utils/requestStudent.js

@@ -1,94 +0,0 @@
-import  carhelp from '@/apis/utils/mixin.js'
-import requestSon from './requestSon.js';
-import requestNum from './requestNum.js';
-
-
-const request = (options) => {
-	//记录请求次数和响应次数
-	var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
-	var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
-	
-	var token=carhelp.getToken(options);
-	
-	 if(token_tdate&&token_tdate==tdate){
-	 	return requestSon(options);
-	 }
-	 var openId=carhelp.getOpenId()
-	var  urlindex="/wechat/findUserInfo"
-	var k=options.url.indexOf(urlindex)==-1;
-	
-	 if(!openId&&k){
-		 return
-	 }
-	if(!k){
-		return requestSon(options);
-	}
-	
-	return new Promise((resolve, reject) => {
-		 var loginurl="/mobile/regUser/findByOpenId"
-		 
-		 
-		 
-		uni.request({
-			method:'get',
-			url: process.car.BASE_URL + loginurl,
-			data: {
-				openId:openId,
-			
-			},
-			
-			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.setToken(token);
-				carhelp.setPersonInfoPlus(res.data.data);
-				
-				options.token=token
-				
-				var isson= requestSon(options)
-				//requestNum(options);
-				resolve(isson);
-				 
-			} else  if(res.data.code == 415||(res.data.code == 200&&!res.data.result)||res.data.code == 400){
-				
-				//var url=window.location.href.split("#")[1]
-			
-				console.log("没有免登陆 ----------------"+options.url)
-				//var url="/pages/login/index?message=请登录&back="+ url+"&phone="+options.data.phone
-				var thisurl='/pages/login/login';
-				
-				if(options&&options.data&&options.data.jpcode){
-					thisurl+="?jpcode="+options.data.jpcode
-				}
-				carhelp.signOut()
-				uni.redirectTo({
-					url: thisurl
-				})
-				
-				
-				
-			 
-				
-			}else{
-		
-				reject(res.data.message)
-			}
-		}).catch(error => {
-			
-			let [err, res] = error;
-			reject(err)
-		})
-	});
-}
-export default request

apis/utils/requestTeacher.js

@@ -1,94 +0,0 @@
-import  carhelp from '@/apis/utils/mixin.js'
-import requestSon from './requestSon.js';
-import requestNum from './requestNum.js';
-
-
-const request = (options) => {
-	//记录请求次数和响应次数
-	var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
-	var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
-	
-	var token=carhelp.getToken(options);
-	
-	 if(token_tdate&&token_tdate==tdate){
-	 	return requestSon(options);
-	 }
-	 var openId=carhelp.getOpenId()
-	var  urlindex="/wechat/findUserInfo"
-	var k=options.url.indexOf(urlindex)==-1;
-	
-	 if(!openId&&k){
-		 return
-	 }
-	if(!k){
-		return requestSon(options);
-	}
-	
-	return new Promise((resolve, reject) => {
-		 var loginurl="/mobile/regUser/findByOpenId"
-		 
-		  
-		 
-		uni.request({
-			method:'get',
-			url: process.car.BASE_URL + loginurl,
-			data: {
-				openId:openId,
-			
-			},
-			
-			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.setToken(token);
-				carhelp.setPersonInfoPlus(res.data.data);
-				
-				options.token=token
-				
-				var isson= requestSon(options)
-				//requestNum(options);
-				resolve(isson);
-				 
-			} else  if(res.data.code == 415||(res.data.code == 200&&!res.data.result)||res.data.code == 400){
-				
-				//var url=window.location.href.split("#")[1]
-			
-				console.log("没有免登陆 ----------------"+options.url)
-				//var url="/pages/login/index?message=请登录&back="+ url+"&phone="+options.data.phone
-				var thisurl='/pages/login/login';
-				
-				if(options&&options.data&&options.data.jpcode){
-					thisurl+="?jpcode="+options.data.jpcode
-				}
-				carhelp.signOut()
-				uni.redirectTo({
-					url: thisurl
-				})
-				
-				
-				
-			 
-				
-			}else{
-		
-				reject(res.data.message)
-			}
-		}).catch(error => {
-			
-			let [err, res] = error;
-			reject(err)
-		})
-	});
-}
-export default request

pages/index/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-	<view class="welcome">
+		<view>index/index</view>
+	<view class="welcome" v-if="false">
 		
 		<view class="welcome-state1" >
 			<view class="welcome-next" style="z-index: 999;" @click="gotoIndex()">{{step?step+'|':''}}跳过</view>
@@ -47,7 +48,8 @@
 		onReady() {
 			
 		},
-		onLoad(op) {
+		onLoad(op) {
+			return;
 			this.findNoLTextConfigure()
 			this.findByOpenId()
 			if(op.friends){
@@ -141,17 +143,8 @@
 						},1000)
 						return
 					}
-					uni.request({
-						method:'get',
-						url: process.car.BASE_URL + "/mobile/regUser/findByOpenId",
-						data: {
-							openId:openId,			
-						},
-						header: {
-							'Content-Type': 'application/x-www-form-urlencoded',
-							'X-Requested-With': 'XMLHttpRequest',
-						}
-					}).then((response) => {
+					loginApi.findByOpenIdDetailed(openId).then((response) => {
+						
 						let [error, res] = response;
 						 
 						if (res.data.code == 200&&res.data.result) {			

pages/student/index.vue

@@ -1,52 +0,0 @@
-<template>
-	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view class="text-area">
-			<text class="title">11{{title}}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title: 'Hello'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
-	}
-</style>