切换登录流程顺序,初步优化项目结构

information/parent.js

@@ -23,18 +23,15 @@ export default {
 		parentdetail: {
 			phoneNumber: '17882237075',
 			name: '家长姓名',
-			defaultChild: 'tmdid01',
 			childrenList: [{
-				avatar: '/static/boy.png',
+				avatar: '/static/default-icons/boy.png',
 				name: '张三',
 				classid: '0301',
-				className: '三年级一班',
 				tmdid: 'tmdid01'
 			}, {
-				avatar: '/static/girl.png',
+				avatar: '/static/default-icons/girl.png',
 				name: '张梅',
 				classid: '0504',
-				className: '五年级四班',
 				tmdid: 'tmdid03'
 			},
 			]

subpkg/guide/guide.vue

@@ -3,10 +3,9 @@
 		<!-- 标题 -->
 		<view class="tips">
 			<view class="title">选择您的孩子</view>
-			<view class="detail" v-show="!show" @click="getUserInfo">点击获取您的孩子信息</view>
+			<button class="detail" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-show="!show">点击获取您的孩子信息</button>
 		</view>
 		
-		
 		<!-- 孩子选择界面 -->
 		<view class="children-item" v-show="show">
 			<view class="com-box">
@@ -19,12 +18,13 @@
 			</view>
 		</view>
 		
-		
 	</view>
 </template>
 
 <script>
 	import {mapState,mapMutations} from 'vuex'
+	//引入解密工具
+	import WXBizDataCrypt from "@/utils/WXBizDataCrypt.js";
 	
 	export default {
 		data() {
@@ -33,12 +33,9 @@
 			};
 		},
 		computed:{
-			...mapState('m_parent',['parentdetail','parentinfo'])
+			...mapState('m_parent',['parentdetail','token'])
 		},
 		onLoad(){
-			//获得家长详细信息
-			// if(parentdetail === '')
-			// this.getParentDetail();
 			//判断用户信息
 			this.hasParentInfo()
 		},
@@ -46,9 +43,6 @@
 			...mapMutations('m_children',['updateChildrenInfo']),
 			...mapMutations('m_parent',['updateParentInfo']),
 			
-			// async getParentDetail(){
-			// 	const res = await uni.$http.post('',);
-			// }
 			//选择孩子并跳转首页传入id查询显示孩子信息
 			chooseChildren(item){
 				console.log(item.tmdid);
@@ -57,34 +51,52 @@
 					url:'/pages/home/home'
 				})
 			},
-			//获取用户信息事件
-			async getUserInfo() {
-				console.log(uni.getStorageSync('parentinfo'));
-				  if (!uni.getStorageSync('parentinfo')) {
-					await uni.getUserProfile({
-						desc: '获取您的基本信息',
-						success: infoRes => {
-							 if (infoRes.errMsg === 'getUserProfile:ok') {
-								this.updateParentInfo(infoRes.userInfo)
-								this.show = true
-							  } else {
-								uni.$showMsg('获取不到您的基本信息!')
-							  }
-						 },
-						fail: err => {
-							console.log('getUserInfo-error', JSON.stringify(err))
-						}
-					});
-				 }
-			},
+			
+			// //获取用户信息事件
+			// async getUserInfo() {
+			// 	console.log(uni.getStorageSync('parentinfo'));
+			// 	  if (!uni.getStorageSync('parentinfo')) {
+			// 		await uni.getUserProfile({
+			// 			desc: '获取您的基本信息',
+			// 			success: infoRes => {
+			// 				 if (infoRes.errMsg === 'getUserProfile:ok') {
+			// 					this.updateParentInfo(infoRes.userInfo)
+			// 					this.show = true
+			// 				  } else {
+			// 					uni.$showMsg('获取不到您的基本信息!')
+			// 				  }
+			// 			 },
+			// 			fail: err => {
+			// 				console.log('getUserInfo-error', JSON.stringify(err))
+			// 			}
+			// 		});
+			// 	 }
+			// },
+			
 			//判断用户基本信息是否存在
 			hasParentInfo(){
-				if(!uni.getStorageSync('parentinfo'))
-					this.show = false
-				else
+				if(uni.getStorageSync('parentdetail'))
 					this.show = true
-			}
+				else
+					this.show = false
+			},
 			
+			//获取用户手机号
+			async getPhoneNumber(e) {
+				if (e.detail.errMsg !== "getPhoneNumber:ok") {
+					//用户决绝授权  
+					return uni.$showMsg('拒绝授权获取不到您的孩子信息!')
+				} else {
+					if (this.token) {
+						let proof = await new WXBizDataCrypt('wx5705da8747c77cfe', this.token.session_key)
+						let numData = await proof.decryptData(e.detail.encryptedData, e.detail.iv)
+						console.log(numData.phoneNumber)
+						// const parentDetailData = await uni.$http.post('',numData.phoneNumber)
+						// this.updateParentDetail(parentDetailData)
+						this.show = true
+					}
+				}
+			},
 			
 			
 		}

subpkg/login/login.vue

@@ -11,7 +11,8 @@
 			</view>
 		
 			<view class="form-box">
-				<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="btn">微信一键登录</button>
+				<!-- <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="btn">微信一键登录</button> -->
+				<button @click="getUserInfo" class="btn">微信一键登录</button>
 				<view class="other">
 					<text class="other-text-left">账号密码登录</text>
 					<text class="other-text-right" style="color:#4169E1;">
@@ -27,8 +28,6 @@
 
 <script>
 	import {mapMutations,mapState} from 'vuex';
-	//引入解密工具
-	import WXBizDataCrypt from "@/utils/WXBizDataCrypt.js";
 	
 	export default {
 		data() {
@@ -46,7 +45,7 @@
 			this.getCode()
 		},
 		methods:{
-			...mapMutations('m_parent', ['updateParentInfo', 'updateToken', 'updateParentDetail']),
+			...mapMutations('m_parent', ['updateParentInfo', 'updateToken']),
 			
 			//换取code方法
 			async getCode(){
@@ -62,7 +61,6 @@
 			
 			//调用登录接口换取token
 			async getToken() {
-				
 				//传入后台换取token
 				const loginResult = await uni.$http.post('https://test.teammodel.cn/aclassone/get-miniapp-userinfo', this.query)
 				if (loginResult.statusCode !== 200) return uni.$showMsg('登录失败!')
@@ -72,24 +70,46 @@
 				this.updateToken(loginResult.data.miniappData)
 			},
 			
-			//获取用户手机号
-			async getPhoneNumber(e) {
-				if (e.detail.errMsg !== "getPhoneNumber:ok") {
-					//用户决绝授权  
-					return uni.$showMsg('拒绝手机授权，获取不到您的信息!')
-				} else {
-					await this.getToken()
-					if (this.token) {
-						let proof = await new WXBizDataCrypt('wx5705da8747c77cfe', this.token.session_key)
-						let numData = await proof.decryptData(e.detail.encryptedData, e.detail.iv)
-						console.log(numData.phoneNumber)
-						// const parentDetailData = await uni.$http.post('',numData.phoneNumber)
-						// this.updateParentDetail(parentDetailData)
-						await uni.redirectTo({
-							url: '/subpkg/guide/guide'
-						})
-					}
-				}
+			// //获取用户手机号
+			// async getPhoneNumber(e) {
+			// 	if (e.detail.errMsg !== "getPhoneNumber:ok") {
+			// 		//用户决绝授权  
+			// 		return uni.$showMsg('拒绝手机授权，获取不到您的信息!')
+			// 	} else {
+			// 		await this.getToken()
+			// 		if (this.token) {
+			// 			let proof = await new WXBizDataCrypt('wx5705da8747c77cfe', this.token.session_key)
+			// 			let numData = await proof.decryptData(e.detail.encryptedData, e.detail.iv)
+			// 			console.log(numData.phoneNumber)
+			// 			// const parentDetailData = await uni.$http.post('',numData.phoneNumber)
+			// 			// this.updateParentDetail(parentDetailData)
+			// 			await uni.redirectTo({
+			// 				url: '/subpkg/guide/guide'
+			// 			})
+			// 		}
+			// 	}
+			// },
+			//获取用户信息事件
+			async getUserInfo() {
+					await uni.getUserProfile({
+						desc: '获取您的基本信息',
+						success: infoRes => {
+							 if (infoRes.errMsg === 'getUserProfile:ok') {
+								this.getToken()
+								this.updateParentInfo(infoRes.userInfo)
+								uni.redirectTo({
+									url: '/subpkg/guide/guide'
+								})
+							  } else {
+								uni.$showMsg('获取不到您的信息!')
+							  }
+						 },
+						fail: err => {
+							uni.$showMsg('拒绝授权获取不到您的基本信息!')
+							console.log('getUserInfo-error', JSON.stringify(err))
+						}
+					});
+				 
 			},
 			
 		},