1.修改跳过登录

pages/Login.js

@@ -183,30 +183,29 @@ export default class Login extends BasePage {
 		http_user.jumpLogin(this.state.deviceCode, commonutil.getAppCode()).then((result) => {
 			if (result.code == 200) {
 				//登陆成功了,可以存储用户数据到本地
-				console.log('====================================');
-				console.log('jumpLogin-result:', result);
-				console.log('====================================');
-				var usermap = new Map();
-				usermap.set('isVisitor', result.data.isVisitor);
-				usermap.set('birthday', result.data.user.birthday);
-				usermap.set('channel', result.data.user.channel);
-				usermap.set('city', result.data.user.city);
-				usermap.set('country', result.data.user.country);
-				usermap.set('eid', result.data.user.eid);
-				usermap.set('gmtCreated', result.data.user.gmtCreated);
-				usermap.set('gmtModified', result.data.user.gmtModified);
-				usermap.set('grade', result.data.user.grade);
-				usermap.set('mobile', result.data.user.mobile);
-				usermap.set('nickName', result.data.user.nickName);
-				usermap.set('province', result.data.user.province);
-				usermap.set('school', result.data.user.school);
-				usermap.set('sex', result.data.user.sex);
-				usermap.set('status', result.data.user.status);
-				usermap.set('uid', result.data.user.uid);
-				usermap.set('ageGroup', result.data.user.ageGroup);
-				usermap.set('avatar', result.data.user.avatar);
-				this.saveUserInfo(commonutil.mapToJson(usermap));
-				this.clearPageToNext('SchoolAge');
+				if (result.data.isVisitor) {
+					var usermap = new Map();
+					usermap.set('isVisitor', result.data.isVisitor);
+					usermap.set('channel', result.data.visitor.channel + '');
+					usermap.set('birthday', '');
+					usermap.set('city', '');
+					usermap.set('gmtCreated', result.data.visitor.gmtCreated + '');
+					usermap.set('gmtModified', result.data.visitor.gmtModified + '');
+					usermap.set('country', '');
+					usermap.set('eid', '');
+					usermap.set('grade', '');
+					usermap.set('mobile', '');
+					usermap.set('nickName', '');
+					usermap.set('province', '');
+					usermap.set('school', '');
+					usermap.set('sex', '');
+					usermap.set('status', '');
+					usermap.set('uid', '');
+					usermap.set('ageGroup', 'PRESCHOOL');
+					usermap.set('avatar', '');
+					this.saveUserInfo(commonutil.mapToJson(usermap));
+					this.clearPageToNext('SchoolAge');
+				}
 			} else {
 				ToastAndroid.show(result.message, ToastAndroid.SHORT);
 			}

pages/SchoolAge.js

@@ -101,6 +101,27 @@ export default class SchoolAge extends BasePage {
 			});
 	}
 	async updateUserInfo(group) {
+		if (this.state.file_user_data.get('isVisitor')) {
+			this.state.file_user_data.set('ageGroup', group);
+			this.state.file_user_data.set('channel', this.state.file_user_data.get('channel'));
+			this.state.file_user_data.set('gmtCreated', this.state.file_user_data.get('gmtCreated'));
+			this.state.file_user_data.set('gmtModified', this.state.file_user_data.get('gmtModified'));
+			this.state.file_user_data.set('birthday', '');
+			this.state.file_user_data.set('city', '');
+			this.state.file_user_data.set('country', '');
+			this.state.file_user_data.set('eid', '');
+			this.state.file_user_data.set('grade', '');
+			this.state.file_user_data.set('mobile', '');
+			this.state.file_user_data.set('nickName', '');
+			this.state.file_user_data.set('province', '');
+			this.state.file_user_data.set('school', '');
+			this.state.file_user_data.set('sex', '');
+			this.state.file_user_data.set('status', '');
+			this.state.file_user_data.set('uid', '');
+			this.saveUserInfo(commonutil.mapToJson(this.state.file_user_data));
+			this.clearPageToNext('MainPage');
+			return true;
+		}
 		let opts = {
 			method: 'PUT', //请求方法
 			body: { ageGroup: group } //请求体
@@ -122,7 +143,6 @@ export default class SchoolAge extends BasePage {
 			this.state.file_user_data.set('sex', res.data.sex);
 			this.state.file_user_data.set('status', res.data.status);
 			this.state.file_user_data.set('uid', res.data.uid);
-			console.log(commonutil.mapToJson(this.state.file_user_data));
 			this.saveUserInfo(commonutil.mapToJson(this.state.file_user_data));
 			this.clearPageToNext('MainPage');
 		});

pages/components/MainPage.js

@@ -141,8 +141,11 @@ export default class MainPage extends BasePage {
 		});
 		this.hideGradeMenu();
 		// if (obj.param === this.state.currentSwitch.param) return
-		//这里更新个人信息学龄选项
-		var bool = this.updateUserInfo(obj.param);
+		if (!this.state.file_user_data.get('isVisitor')) {
+			//这里更新个人信息学龄选项
+			var bool = this.updateUserInfo(obj.param);
+		}
+
 		this.updateRender(obj.param);
 	};