From 0a1cf3fb1adc76ac1e914d5c254ffb317792b76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=AA=E6=A0=91=E6=B3=BD?= <2393354236@qq.com>
Date: Fri, 9 Sep 2022 15:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A7=BB=E5=8A=A8=E7=AB=AF=E3=80=91?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/pages/user_data/user_data.vue | 105 ++++++++++++--------------
 app/src/utils/util.ts                 |   9 ---
 2 files changed, 49 insertions(+), 65 deletions(-)

diff --git a/app/src/pages/user_data/user_data.vue b/app/src/pages/user_data/user_data.vue
index 006eded4..0273b602 100644
--- a/app/src/pages/user_data/user_data.vue
+++ b/app/src/pages/user_data/user_data.vue
@@ -133,11 +133,7 @@
 		onShow,
 		onUnload
 	} from '@dcloudio/uni-app'
-	import {
-		// apiUserInfoGet,
-		// apiUserInfoSet,
-		// apiWechatMobileGet,
-		// apiHasPassword,
+	import {
 		getUserInfo,
 		userEdit,
 		userBindMobile,
@@ -151,38 +147,42 @@
 	import {
 		uploadFile
 	} from '@/utils/util.ts'
-	import {
-		getWxCode
-	} from '@/utils/util'
 
-	let wxCode = ref < any | null > ('')
 	// 用户信息
 	let userInfo = ref < any | null > (null)
 	// 用户信息的枚举
-	const fieldType = ref(FieldType.NONE)
-	//显示昵称输入框
-	const showNickName = ref < boolean | null > (false)
-	//显示昵称输入框
-	const showUserName = ref < boolean | null > (false)
+	const fieldType = ref(FieldType.NONE)
+	//选择性别数据
+	const sexList = ref < Array < string > | null > (['男', '女'])
+	
+	//显示昵称弹窗
+	const showNickName = ref < boolean | null >(false)
+	//显示账户弹窗
+	const showUserName = ref < boolean | null >(false)
+	//显示性别选择弹窗
+	const showPicker = ref < boolean | null >(false)
+	// 显示手机号验证码调整弹窗 非小程序才需要
+	const showMobilePop = ref < boolean | null > (false)
+	
 	//新昵称
 	const newNickname = ref < string > ('')
 	//新账号
-	const newUsername = ref < string > ('')
-	//手机号码
-	const mobile = ref < string > ('')
-	//显示性别选择
-	const showPicker = ref < boolean | null > (false)
-	//选择性别数据
-	const sexList = ref < Array < string > | null > (['男', '女'])
-	
-	//显示昵称输入框
-	const showMobilePop = ref < boolean | null > (true)
+	const newUsername = ref < string > ('')
 	//新的手机号码
 	const newMobile = ref < string > ('')
+	
 	//修改手机验证码
 	const mobileCode = ref <string > ('')
 	const codeTips = ref('')
 	const uCodeRef = shallowRef()
+	
+	
+	// 获取用户信息
+	const getUser = async (): Promise < void > => {
+		userInfo.value = await getUserInfo()
+	}
+	
+	// 获取验证码显示字段
 	const codeChange = (text: string) => {
 	    codeTips.value = text
 	}
@@ -200,7 +200,7 @@
 	    }
 	}
 	
-	// 验证码修改手机号
+	// 验证码修改手机号-非微信小程序
 	const changeCodeMobile = async () => {
 		await userBindMobile({
 			type: userInfo.mobile ? 'change' : 'bind',
@@ -211,11 +211,6 @@
 	}
 	
 	
-	// 获取用户信息
-	const getUser = async (): Promise < void > => {
-		userInfo.value = await getUserInfo()
-	}
-	
 	// 修改用户信息
 	const setUserInfoFun = async (value: string): Promise < void > => {
 		await userEdit({
@@ -229,17 +224,20 @@
 	const uploaderAvatar = () => {
 		fieldType.value = FieldType.AVATAR
 		uni.navigateTo({
-			url: '/uni_modules/uview-ui/components/u-avatar-cropper/u-avatar-cropper?destWidth=300&rectWidth=200&fileType=jpg',
+			url: '/uni_modules/vk-uview-ui/components/u-avatar-cropper/u-avatar-cropper?destWidth=300&rectWidth=200&fileType=jpg',
 		})
 	}
-	
-	// 修改用户昵称
-	const changeNameConfirm = () => {
-		if (newNickname.value == '') return toast('昵称不能为空')
-		if (newNickname.value.length > 10) return toast('昵称长度不得超过十位数')
-		showNickName.value = false
-		fieldType.value = FieldType.NICKNAME
-		setUserInfoFun(newNickname.value)
+	
+	// 显示修改用户性别弹窗
+	const changeSex = () => {
+		showPicker.value = true
+		fieldType.value = FieldType.SEX
+	}
+	
+	// 修改用户性别
+	const changeSexConfirm = (value) => {
+		setUserInfoFun(value[0] + 1)
+		showPicker.value = false
 	}
 	
 	// 修改用户账号
@@ -252,29 +250,25 @@
 		showUserName.value = false
 	}
 	
-	// 显示修改用户性别弹窗
-	const changeSex = () => {
-		showPicker.value = true
-		fieldType.value = FieldType.SEX
+	// 修改用户昵称
+	const changeNameConfirm = () => {
+		if (newNickname.value == '') return toast('昵称不能为空')
+		if (newNickname.value.length > 10) return toast('昵称长度不得超过十位数')
+		showNickName.value = false
+		fieldType.value = FieldType.NICKNAME
+		setUserInfoFun(newNickname.value)
 	}
 	
-	// 修改用户性别
-	const changeSexConfirm = (value) => {
-		setUserInfoFun(value[0] + 1)
-		showPicker.value = false
-	}
-	
-	// 绑定｜｜修改用户手机号
+	// 微信小程序 绑定｜｜修改用户手机号
 	const getPhoneNumber = async (e): Promise < void > => {
-		// wxCode.value = await getWxCode()
-		console.log('wxCode.value', wxCode.value)
 		fieldType.value = FieldType.MOBILE
 		const {
 			encryptedData,
-			iv
+			iv,
+			code,
 		} = e.detail
-		let data = {
-			code: wxCode.value,
+		let data = {
+			code,
 			encrypted_data: encryptedData,
 			iv,
 		}
@@ -311,7 +305,6 @@
 
 	onShow(async () => {
 		getUser()
-		wxCode.value = await getWxCode()
 	})
 	
 	onUnload(() => {
diff --git a/app/src/utils/util.ts b/app/src/utils/util.ts
index d2e9e3ab..55d92038 100644
--- a/app/src/utils/util.ts
+++ b/app/src/utils/util.ts
@@ -136,12 +136,3 @@ export function uploadFile(path: any) {
         })
     })
 }
-
-export const getWxCode = (): Promise<void> => {
-    return new Promise((resolve, reject) => {
-        uni.login({
-            desc: '获取用户信息，完善用户资料',
-            success: (res: Event) => resolve(res.code)
-        })
-    })
-}