From 16859e855b0e4b1e3a08c8acd5ae42a1793eb6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 11 Nov 2022 17:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Modifyinformation/Modifyinformation.vue | 119 +++++++++++-------
 pages/forgotPassword/forgotPassword.vue       |   6 +-
 pages/personal/personal.vue                   |   8 +-
 3 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/pages/Modifyinformation/Modifyinformation.vue b/pages/Modifyinformation/Modifyinformation.vue
index 3c22435..4796a36 100644
--- a/pages/Modifyinformation/Modifyinformation.vue
+++ b/pages/Modifyinformation/Modifyinformation.vue
@@ -3,7 +3,7 @@
 		<view class="centercontent">
 			<view class="Commodity" @tap="uploadImag()">
 				头像
-				<image class="picture" :src="appPersonallist.avatar" mode=""></image>
+				<image class="picture" :src="img" mode=""></image>
 				<image class="pictureA" src="../../static/jiantou.png" mode=""></image>
 			</view>
 			<view class="content">
@@ -11,15 +11,15 @@
 					<span class="">
 						昵称：
 					</span>
-					<input type="text" placeholder="请填写" v-model="appPersonallist.userName" />
+					<input type="text" maxlength="10" placeholder="请填写" v-model="appPersonallist.userName" />
 				</view>
 				<view class="name">
 					<span>姓名:</span>
-					<input type="text" placeholder="请输入" v-model="appPersonallist.nickName" />
+					<input type="text" maxlength="10" placeholder="请输入" v-model="appPersonallist.nickName" />
 				</view>
 				<view class="name">
 					<span>电话：</span>
-					<input type="text" placeholder="请输入" v-model="appPersonallist.phonenumber" />
+					<input type="text" maxlength="11" placeholder="请输入" v-model="appPersonallist.phonenumber" />
 				</view>
 				<!-- <view class="nursetype name" style="border: none;" @tap='show=true'>
 					护理站:{{getNurseStationName(appPersonallist)}}
@@ -47,6 +47,8 @@
 			return {
 				show: false,
 				baseurl: '', //url
+				img: null,
+				image: null,
 				NurseStationList: [], //护理站list
 				appPersonallist: {
 					userId: '',
@@ -56,6 +58,7 @@
 					avatar: '',
 					File: '',
 				},
+				timer: null,
 			}
 		},
 		computed: {
@@ -64,11 +67,11 @@
 			},
 		},
 		onShow() {
+			this.info();
+			this.baseurl = baseurl;
+		},
+		onLoad(options) {
 			let that = this
-			// try {
-			// 	const value = uni.getStorageSync('nursePersonId');
-			// 	if (value) {} else {}
-			// } catch (e) {}
 			try {
 				const value = uni.getStorageSync('phonenumber');
 				if (value) {
@@ -82,10 +85,7 @@
 				}
 			} catch (e) {}
 			this.myInfo()
-			this.info();
-			this.baseurl = baseurl;
 		},
-		onLoad(options) {},
 		methods: {
 			//上传头像
 			uploadImag() {
@@ -96,48 +96,79 @@
 					sourceType: ['album'],
 					success(res) {
 						that.appPersonallist.avatar = res.tempFilePaths[0]
+						that.img = res.tempFilePaths[0]
+						that.image = res.tempFilePaths[0]
 					}
 				})
 			},
 			myInfo() {
 				nursePerson(this.phonenumber, this.password).then(res => {
-					res.data.avatar = baseurl + res.data.avatar
+					this.img = baseurl + res.data.avatar
 					this.appPersonallist = res.data
 				})
 			},
 			gofinish() {
 				var that = this
-				uni.uploadFile({
-					url: baseurl + '/nurseApp/personLogin/updateHeadAvatarHead',
-					filePath: that.appPersonallist.avatar, //file: 二进制(filePath)
-					name: 'file',
-					formData: { //多余值
-						'userId': that.appPersonallist.userId,
-					},
-					timeout: 5000,
-					success(res) {
-						that.appPersonallist.avatar = JSON.parse(res.data).imgUrl
-						userPassWord(that.appPersonallist).then(res => {
-							if (res.code == 200) {
-								that.$refs.uToast.show({
-									title: '修改成功',
-									type: 'success',
-									duration: '1500',
-								})
-								setTimeout(e => {
-									uni.navigateBack({
-										delta: 1
+				if (this.image) {
+					uni.uploadFile({
+						url: baseurl + '/nurseApp/personLogin/updateHeadAvatarHead',
+						filePath: that.image, //file: 二进制(filePath)
+						name: 'file',
+						formData: { //多余值
+							'userId': that.appPersonallist.userId,
+						},
+						timeout: 5000,
+						success(res) {
+							that.appPersonallist.avatar = JSON.parse(res.data).imgUrl
+							userPassWord(that.appPersonallist).then(res => {
+								if (res.code == 200) {
+									that.$refs.uToast.show({
+										title: '修改成功',
+										type: 'success',
+										duration: '1500',
 									})
-								}, 1500)
-							} else {
-								that.$refs.uToast.show({
-									title: res.msg,
-									type: 'error'
-								})
+									if (that.timer) {
+										clearTimeout(that.timer)
+									}
+									that.timer = setTimeout(e => {
+										uni.navigateBack({
+											delta: 1
+										})
+									}, 1500)
+								} else {
+									that.$refs.uToast.show({
+										title: res.msg,
+										type: 'error'
+									})
+								}
+							})
+						}
+					})
+				} else {
+					userPassWord(that.appPersonallist).then(res => {
+						console.log(res)
+						if (res.code == 200) {
+							that.$refs.uToast.show({
+								title: '修改成功',
+								type: 'success',
+								duration: '1500',
+							})
+							if (that.timer) {
+								clearTimeout(that.timer)
 							}
-						})
-					}
-				})
+							that.timer = setTimeout(e => {
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 1500)
+						} else {
+							that.$refs.uToast.show({
+								title: res.msg,
+								type: 'error'
+							})
+						}
+					})
+				}
 			},
 			confirm(e) {
 				this.appPersonallist.nurseStationSysUserVOList[0].nurseStationId = e[0].value
@@ -197,13 +228,15 @@
 					line-height: 100rpx;
 					border-bottom: 1rpx solid #D8D4D4;
 					position: relative;
-					span{
+
+					span {
 						display: inline-block;
 						width: 20%;
 					}
+
 					input {
 						position: absolute;
-						top:50%;
+						top: 50%;
 						transform: translateY(-50%);
 						line-height: 100rpx;
 						display: inline-block;
diff --git a/pages/forgotPassword/forgotPassword.vue b/pages/forgotPassword/forgotPassword.vue
index 5fab510..17b6602 100644
--- a/pages/forgotPassword/forgotPassword.vue
+++ b/pages/forgotPassword/forgotPassword.vue
@@ -30,7 +30,7 @@
 			</view>
 		</view> -->
 		<view class="loginbtn" @tap='pwdlogin'>
-			登录
+			确定
 		</view>
 		<u-toast ref="uToast" />
 	</view>
@@ -42,8 +42,8 @@
 	export default {
 		data() {
 			return {
-				phonenumber: '18963146613',
-				password: '23456',
+				phonenumber: '',
+				password: '',
 				newpassword: '',
 				getCodeText: '获取验证码', //获取验证码的文字
 				getCodeBtnColor: "#4C7BC9", //获取验证码的color
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index 1aae2bf..6cad0b6 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -24,20 +24,17 @@
 			</view>
 			<view class="item">
 				电话：{{appPersonallist.phonenumber }}
-			</view>
-			<view class="item" style="height:100%">
-
 			</view>
 			<view class="item" style="border:none;" v-if="appPersonallist.nurseStationSysUserVOList">
 				护理站: {{appPersonallist.nurseStationSysUserVOList[0].nurseStationName}}
 			</view>
 		</view>
-		<view class="External" style="margin: 100rpx auto 0;">
+		<!-- <view class="External" style="margin: 100rpx auto 0;">
 			<view class="lefttext">
 				我的设备
 			</view>
 			<image src="../../static/jiantou.png" mode=""></image>
-		</view>
+		</view> -->
 		<!-- <view class="External">
 			<view class="lefttext">
 				修改密码
@@ -87,6 +84,7 @@
 			myInfo() {
 				nursePerson(this.phonenumber, this.password).then(res => {
 					this.appPersonallist = res.data
+					console.log(this.appPersonallist)
 				})
 			},
 			updatainfo() {