From e25dce6a72ee5659277591d2ccf4c0e106f2c4ab Mon Sep 17 00:00:00 2001
From: YangWork <yang@xixingwl.cn>
Date: Thu, 9 Feb 2023 18:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E8=8E=B7=E5=8F=96=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: YangWork <yang@xixingwl.cn>
---
 components/ywx-auth-model/ywx-auth-model.vue | 107 ++++++++++++++-----
 store/modules/user.js                        |   3 +
 2 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/components/ywx-auth-model/ywx-auth-model.vue b/components/ywx-auth-model/ywx-auth-model.vue
index 2c9caa2..07b0289 100644
--- a/components/ywx-auth-model/ywx-auth-model.vue
+++ b/components/ywx-auth-model/ywx-auth-model.vue
@@ -2,7 +2,7 @@
 	<view>
 		<button @click="open">关闭</button>
 		<uni-popup ref="popupLogin" :mask-click="false" type="bottom">
-			<view style="padding: 35rpx; background-color: aliceblue;">
+			<view class="content">
 				<uni-forms ref="form" :modelValue="formData" :rules="rules">
 					<uni-forms-item label="姓名" name="name">
 						<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
@@ -12,44 +12,51 @@
 					</uni-forms-item>
 				</uni-forms>
 				<button @click="submit">Submit</button>
-				<view style="display:flex;align-items:center;justify-content:space-evenly; padding: 30rpx;">
+				<view class="footer">
 					<uni-icons type="weixin" color="#00aa00" size="48"></uni-icons>
 					<uni-icons type="qq" color="#686868" size="48"></uni-icons>
 				</view>
 			</view>
 		</uni-popup>
-		<uni-popup ref="popupReg" :mask-click="false" type="bottom">
-			<view style="padding: 35rpx; background-color: aliceblue;">
-				<text>用户注册</text>
-				<uni-forms ref="form" :modelValue="formDataReg" :rules="rules">
-					<uni-forms-item label="姓名" name="avatarUrl">
-						<button class="avatar-wrapper" open-type="chooseAvatar"  @chooseavatar="onChooseAvatar">
-							<image class="avatar" :src="formDataReg.avatarUrl"
-								style="width: 320rpx; height: 320rpx; margin: auto;"></image>
-						</button>
-					</uni-forms-item>
-					<uni-forms-item label="姓名" name="nickname">
-						<uni-easyinput type="nickname" placeholder="请输入昵称" v-model="formDataReg.nickname">
-						</uni-easyinput>
-					</uni-forms-item>
-					<uni-forms-item label="姓名" name="mobile">
-						<uni-easyinput placeholder="请输入昵称" v-model="formDataReg.mobile"></uni-easyinput>
-
-						<button v-show="showPhone" type="primary" block open-type="getPhoneNumber"
-							@getphonenumber="getPhone">
-							授权电话
-						</button>
-					</uni-forms-item>
-				</uni-forms>
-				<button @click="submit">Submit</button>
-			</view>
-		</uni-popup>
+		<!-- <uni-popup ref="popupReg" :mask-click="false" type="bottom"> -->
+		<view class="content">
+			<text>用户注册</text>
+			<uni-forms ref="form" :modelValue="formDataReg" :rules="rules">
+				<uni-forms-item label="头像" name="avatarUrl" labelWidth="80">
+					<button type="primary" class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" plain>
+						<image class="avatar" :src="formDataReg.avatarUrl"></image>
+					</button>
+				</uni-forms-item>
+				<uni-forms-item label="昵称" name="nickname" labelWidth="80">
+					<uni-easyinput type="nickname" placeholder="请输入昵称" v-model="formDataReg.nickname"  suffixIcon="phone">
+					</uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item label="电话" name="mobile" labelWidth="80">
+					<uni-easyinput placeholder="请输入昵称" v-model="formDataReg.mobile" suffixIcon="phone"></uni-easyinput>
+					<button size="mini" type="primary" open-type="getPhoneNumber"
+						@getphonenumber="getPhoneNumber" plain>使用微信手机号</button>
+				</uni-forms-item>
+				<uni-forms-item label="密码" name="password" labelWidth="80">
+					<uni-easyinput type="password" placeholder="请输入密码" v-model="formDataReg.password"  suffixIcon="phone">
+					</uni-easyinput>
+				</uni-forms-item>
+			</uni-forms>
+			<button @click="submit">Submit</button>
+		</view>
+		<!-- </uni-popup> -->
 	</view>
 </template>
 
 <script>
+	import {mapGetters} from 'vuex'
 	export default {
 		name: "ywxAuthModel",
+		computed: {
+			...mapGetters({
+			  // 把 `this.doneCount` 映射为 `this.$store.getters.doneTodosCount`
+			  sessionKey: 'getSessionKey'
+			})
+		},
 		data() {
 			return {
 				// 表单数据
@@ -60,6 +67,8 @@
 				formDataReg: {
 					nickname: '',
 					avatarUrl: 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0',
+					mobile:'',
+					password:""
 				},
 				rules: {
 					// 对name字段进行必填验证
@@ -101,7 +110,7 @@
 				const {
 					avatarUrl
 				} = e.detail
-				
+
 				this.formDataReg.avatarUrl = avatarUrl
 			},
 			open() {
@@ -109,11 +118,51 @@
 			},
 			close() {
 				this.$refs.popup.close()
+			},
+			submit(){},
+			getPhoneNumber(e) {
+				console.log(e.detail)
+				console.log(e.detail.errMsg) // 判断用户是否允许获取手机号
+				console.log(e.detail.iv) // 参数 iv
+				console.log(e.detail.encryptedData) // 参数encryptedData
+				if (e.detail.errMsg == "getPhoneNumber:ok") { // 用户允许或去手机号
+					uni.$ajax("/WechatMini/decrypt",{
+						encryptedData: e.detail.encryptedData,
+						iv: e.detail.iv,
+						sessionKey: this.sessionKey,
+						openId: this.openId,
+					}).then(res=>{
+						this.formDataReg.mobile  = res.data.phoneNumber
+						console.log(res.data)
+					});
+				}
 			}
 		}
 	}
 </script>
 
 <style>
+	.content {
+		padding: 35rpx;
+		background-color: aliceblue;
+	}
 
+	.footer {
+		display: flex;
+		align-items: center;
+		justify-content: space-evenly;
+		padding: 30rpx;
+	}
+	.avatar-wrapper{
+		display: flex;
+		align-items: center;
+		width: 300rpx;
+		padding: 20rpx  5rpx;
+		
+	}
+	.avatar {
+		width: 260rpx;
+		height: 260rpx;
+		margin: auto;
+	}
 </style>
diff --git a/store/modules/user.js b/store/modules/user.js
index 3eb280d..966d687 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -23,6 +23,9 @@ export default {
 		},
 		userIsLogin(state){
 			return state.isLogin;
+		},
+		getSessionKey(state){
+			return state.sessionKey;
 		}
 	},
 	mutations: {