Explorar el Código

1.提交跳过登录

zhangmengjie hace 5 años
padre
commit
3cf9a8ee66
Se han modificado 3 ficheros con 36 adiciones y 32 borrados
  1. 25 27
      pages/Login.js
  2. 1 0
      pages/SchoolAge.js
  3. 10 5
      pages/components/MainPage.js

+ 25 - 27
pages/Login.js

@@ -179,33 +179,31 @@ export default class Login extends BasePage {
 		http_user.jumpLogin(this.state.deviceCode, commonutil.getAppCode()).then((result) => {
 			if (result.code == 200) {
 				//登陆成功了,可以存储用户数据到本地
-				if (result.code == 200) {
-					let info = {
-						avatar: result.data.user.avatar,
-						ageGroup: result.data.visitor.ageGroup,
-						birthday: result.data.visitor.birthday,
-						channel: result.data.visitor.channel,
-						city: result.data.visitor.city,
-						country: result.data.visitor.country,
-						eid: result.data.visitor.eid,
-						gmtCreated: result.data.visitor.gmtCreated,
-						gmtModified: result.data.visitor.gmtModified,
-						mobile: result.data.visitor.mobile,
-						nickName: result.data.visitor.nickName, //=== '' ? '未设置' : result.data.user.nickName,
-						province: result.data.visitor.province,
-						school: result.data.visitor.school,
-						sex: result.data.visitor.sex,
-						status: result.data.visitor.status,
-						uid: result.data.visitor.uid,
-						isVisitor: result.data.isVisitor.toUpperCase() === 'TRUE' ? true : false
-					};
-					global.userInfo = info;
-					console.log('================跳过登录====================');
-					console.log('global.userInfo', global.userInfo);
-					console.log('====================================');
-					commonutil.saveUserInfo();
-					this.clearPageToNext('SchoolAge');
-				}
+				let info = {
+					avatar: '',
+					ageGroup: 'PRESCHOOL',
+					birthday: '',
+					channel: result.data.visitor.channel,
+					city: '',
+					country: '',
+					eid: '',
+					gmtCreated: result.data.visitor.gmtCreated,
+					gmtModified: result.data.visitor.gmtModified,
+					mobile: '',
+					nickName: result.data.visitor.nickName, //=== '' ? '未设置' : result.data.user.nickName,
+					province: '',
+					school: '',
+					sex: '',
+					status: result.data.visitor.status,
+					uid: '',
+					isVisitor: result.data.isVisitor.toUpperCase() === 'TRUE' ? true : false
+				};
+				global.userInfo = info;
+				console.log('================跳过登录====================');
+				console.log('global.userInfo', global.userInfo);
+				console.log('====================================');
+				commonutil.saveUserInfo();
+				this.clearPageToNext('SchoolAge');
 			} else {
 				ToastAndroid.show(result.message, ToastAndroid.SHORT);
 			}

+ 1 - 0
pages/SchoolAge.js

@@ -89,6 +89,7 @@ export default class SchoolAge extends BasePage {
 			console.log('游客登录');
 			//是访客登录
 			global.userInfo.ageGroup = group;
+			this.clearPageToNext('MainPage');
 			commonutil.saveUserInfo();
 			return true;
 		} else {

+ 10 - 5
pages/components/MainPage.js

@@ -134,8 +134,8 @@ export default class MainPage extends BasePage {
 	}
 	onBackAndroid = () => {
 		// global.storage.remove({ key: 'userInfo' });
-		BackHandler.exitApp();
-		return true;
+		// BackHandler.exitApp();
+		// return true;
 	};
 
 	switchGrade = (index) => {
@@ -144,9 +144,14 @@ export default class MainPage extends BasePage {
 			currentSwitch: obj
 		});
 		this.hideGradeMenu();
-		// if (obj.param === this.state.currentSwitch.param) return
-		//这里更新个人信息学龄选项
-		this.updateUserInfo(obj.param);
+		if (!global.userInfo.isVisitor) {
+			//这里更新个人信息学龄选项
+			this.updateUserInfo(obj.param);
+		} else {
+			global.userInfo.ageGroup = obj.param;
+			commonutil.saveUserInfo();
+		}
+
 		this.updateRender(obj.param);
 	};