From 8914a51c54ae2ba1ac94512e27036da36218874a Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 3 Dec 2024 09:34:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/httpRequest3.js             |   8 +-
 src/pages/login/index.vue           |  61 ++++-----
 src/pages/setter/index.vue          |   2 +-
 src/pages/setter/loginPwdUpdate.vue | 185 ++++++++++++++--------------
 4 files changed, 131 insertions(+), 125 deletions(-)

diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index cc300aff..0966338d 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -48,10 +48,10 @@ function service(options = {}) {
 							})
 						}
 						// if (res.data.code == 1002000008) {
-						// 	uni.setStorageSync('username',options.data.username)
-						// 	uni.reLaunch({
-						// 		url: '/pages/setter/loginPwdUpdate'
-						// 	})
+							// uni.setStorageSync('username',options.data.username)
+							// uni.reLaunch({
+							// 	url: '/pages/setter/loginPwdUpdate'
+							// })
 						// }
 						if (res.data.msg) {
 							if (res.data.msg.includes('get lock')) {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index f6c8f562..83b99f2a 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -71,7 +71,7 @@
 							v-model="code"
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
-						<view class="uni-input-wrapper" >
+						<view class="uni-input-wrapper">
 							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
@@ -119,8 +119,8 @@
 				imageSrc: "",
 				code: "",
 				uuid: "",
-				version: "",
-				needCode:false
+				version: "",
+				needCode: false
 			}
 		},
 		// computed: mapState(['forcedLogin', 'hasLogin']),
@@ -128,11 +128,11 @@
 			this.tenantValue = this.tenantArray[0].value
 			// uni.clearStorageSync()
 			// uni.clearStorage(); //清除缓存
-			
+
 			storage.clearStorage()
 			if (process.env.NODE_ENV === 'development') {
 				this.username = "admin"
-				this.password = "win123456";
+				this.password = "CD_win09";
 			}
 			uni.setNavigationBarColor({
 				frontColor: '#ffffff',
@@ -157,21 +157,21 @@
 			}
 
 		},
-		onLoad() {
-			if(this.needCode){
-				getCaptchaImage().then(res => {
-					if (res) {
-						var code = res.data.img;
-						let base64 = 'data:image/jpeg;base64,' + code
-						// console.log("图标", base64)
-						this.imageSrc = base64.replace(/[\r\n]/g, "")
-						this.uuid = res.data.uuid
-					}
-				}).catch(error => {
-					this.showErrorMessage(error);
-				})
+		onLoad() {
+			if (this.needCode) {
+				getCaptchaImage().then(res => {
+					if (res) {
+						var code = res.data.img;
+						let base64 = 'data:image/jpeg;base64,' + code
+						// console.log("图标", base64)
+						this.imageSrc = base64.replace(/[\r\n]/g, "")
+						this.uuid = res.data.uuid
+					}
+				}).catch(error => {
+					this.showErrorMessage(error);
+				})
 			}
-			
+
 			this.getAppVersion()
 		},
 		methods: {
@@ -189,15 +189,13 @@
 						icon: 'none',
 						mask: true
 					})
-				} 
-				else if (this.needCode&&this.code === '') {
+				} else if (this.needCode && this.code === '') {
 					uni.showToast({
 						title: '验证码不能为空',
 						icon: 'none',
 						mask: true
 					})
-				} 
-				else {
+				} else {
 					// console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg)
 					let logininfo = {
 						username: "",
@@ -232,7 +230,7 @@
 					title: "正在登录",
 					mask: true
 				})
-				try{
+				try {
 					var result = await this.$store.dispatch('Login', logininfo);
 					// await this.$store.dispatch('GetTenantIdInfo', this.tenantName)
 					console.log(result)
@@ -242,11 +240,11 @@
 						url: '/pages/index/index'
 					});
 					uni.setStorageSync('username', this.username);
-				}catch(e){
+				} catch (e) {
 					uni.hideLoading()
 					this.showErrorMessage(e)
 				}
-				
+
 			},
 
 
@@ -262,7 +260,12 @@
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						if (message.includes("密码策略")) {
+							uni.setStorageSync('username', this.username);
+							uni.reLaunch({
+								url: '/pages/setter/loginPwdUpdate'
+							})
+						}
 					}
 				});
 			},
@@ -275,8 +278,8 @@
 						this.uuid = res.data.uuid
 					}
 				}).catch(error => {
-				this.showErrorMessage(error);
-			})
+					this.showErrorMessage(error);
+				})
 			},
 			getAppVersion() {
 				const systemInfo = uni.getSystemInfoSync();
diff --git a/src/pages/setter/index.vue b/src/pages/setter/index.vue
index 3c666f75..19ae3524 100644
--- a/src/pages/setter/index.vue
+++ b/src/pages/setter/index.vue
@@ -143,7 +143,7 @@
 	}
 	function modifiedPassWord() {
 		uni.navigateTo({
-			url:"./passwordpage"
+			url:"./loginPwdUpdate"
 		})
 	}
 	
diff --git a/src/pages/setter/loginPwdUpdate.vue b/src/pages/setter/loginPwdUpdate.vue
index 1f9bec84..6281e4f3 100644
--- a/src/pages/setter/loginPwdUpdate.vue
+++ b/src/pages/setter/loginPwdUpdate.vue
@@ -1,71 +1,72 @@
 <template>
-    <view class="content passwordpage">
-        <uni-forms ref="form" :modelValue="formData" :rules="rules">
-            <uni-forms-item label="原密码" name="oldPassword" style="margin: 20rpx 0;">
-                <uni-easyinput type="password" v-model="formData.oldPassword" placeholder="请输入原来的密码" />
-            </uni-forms-item>
+	<view class="content passwordpage">
+		<uni-forms ref="form" :modelValue="formData" :rules="rules">
+			<uni-forms-item label="原密码" name="oldPassword" style="margin: 20rpx 0;">
+				<uni-easyinput type="password" v-model="formData.oldPassword" placeholder="请输入原来的密码" />
+			</uni-forms-item>
 			<uni-forms-item label="新密码" name="password" style="border-bottom: 1px solid #eee;">
-			    <uni-easyinput type="password" v-model="formData.password" placeholder="请输入新密码" />
+				<uni-easyinput type="password" v-model="formData.password" placeholder="请输入新密码" />
 			</uni-forms-item>
 			<uni-forms-item label="确认新密码" name="againPassword">
-			    <uni-easyinput type="password" v-model="formData.againPassword" placeholder="请再次输入密码" />
+				<uni-easyinput type="password" v-model="formData.againPassword" placeholder="请再次输入密码" />
 			</uni-forms-item>
-        </uni-forms>
+		</uni-forms>
 		<view class="new_btn_bot">
 			<button class="new_save_btn" @click="submit">确认修改</button>
 		</view>
 		<comMessage ref="comMessage"></comMessage>
-    </view>
+	</view>
 </template>
 
 <script>
-	import { loginUpdateUserPwd } from '@/api/request2.js';
+	import {
+		loginUpdateUserPwd
+	} from '@/api/request2.js';
 	import {
 		navigateBack,
 	} from '@/common/basic.js';
 	export default {
-	    data() {
-	        return {
-	            // 表单数据
-	            formData: {
-                  oldPassword: '',
-                  password: '',
-                  againPassword: ''
-	            },
-	            rules: {
-                oldPassword: {
-                    rules: [{
-                            required: true,
-                            errorMessage: '请输入密码',
-                        }
-                    ]
-                },
-                // 对name字段进行必填验证
-                password: {
-                    rules: [{
-                            required: true,
-                            errorMessage: '请输入密码',
-                        },
-                        {
-                            minLength: 6,
-                            maxLength: 20,
-                            errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
-                        }
-                    ]
-                },
-                // 对email字段进行必填验证
-                againPassword: {
-                    rules: [{
-                            required: true,
-                            errorMessage: '请输入密码',
-                        },
-                        {
-                            minLength: 6,
-                            maxLength: 20,
-                            errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
-                        },
+		data() {
+			return {
+				// 表单数据
+				formData: {
+					oldPassword: '',
+					password: '',
+					againPassword: ''
+				},
+				rules: {
+					oldPassword: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入原密码',
+						}]
+					},
+					// 对name字段进行必填验证
+					password: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入新密码',
+							}
+							// {
+							//     minLength: 6,
+							//     maxLength: 20,
+							//     errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
+							// }
+						]
+					},
+					// 对email字段进行必填验证
+					againPassword: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入新密码',
+							},
+							// {
+							//     minLength: 6,
+							//     maxLength: 20,
+							//     errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
+							// },
 							{
-								validateFunction:function(rule,value,data,callback){
+								validateFunction: function(rule, value, data, callback) {
 									console.log(value !== data.againPassword)
 									if (value !== data.againPassword) {
 										callback('两次输入不同')
@@ -73,54 +74,56 @@
 									return true
 								}
 							}
-	                    ]
-	                }
-	            }
-	        }
-	    },
-	    methods: {
-	        /**
-	         * 复写 binddata 方法，如果只是为了校验，无复杂自定义操作，可忽略此方法
-	         * @param {String} name 字段名称
-	         * @param {String} value 表单域的值
-	         */
-	        // binddata(name,value){
-	        // 通过 input 事件设置表单指定 name 的值
-	        //   this.$refs.form.setValue(name, value)
-	        // },
-	        // 触发提交表单
-	        submit() {
-	            this.$refs.form.validate().then(res=>{
-                loginUpdateUserPwd(uni.getStorageSync('username'),res.oldPassword,res.password,res.password).then((ress)=>{
-						console.log('返回结果：', ress);
-						if(ress.data){
-							this.showCommitSuccessMessage("修改成功")
-              setTimeout(function (){
-                uni.reLaunch({
-                  url: '../login/index'
-                })
-              },2000)
-						}	
-					}).catch(err =>{
-                  this.$refs.comMessage.showErrorMessage(err)
-                })
-	            }).catch(err =>{
-	                console.log('表单错误信息：', err);
-	            })
-	        },
+						]
+					}
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 复写 binddata 方法，如果只是为了校验，无复杂自定义操作，可忽略此方法
+			 * @param {String} name 字段名称
+			 * @param {String} value 表单域的值
+			 */
+			// binddata(name,value){
+			// 通过 input 事件设置表单指定 name 的值
+			//   this.$refs.form.setValue(name, value)
+			// },
+			// 触发提交表单
+			submit() {
+				this.$refs.form.validate().then(res => {
+					loginUpdateUserPwd(uni.getStorageSync('username'), res.oldPassword, res.password, res.password)
+						.then((ress) => {
+							console.log('返回结果：', ress);
+							if (ress.data) {
+								uni.showToast({
+									title: "修改成功"
+								})
+								setTimeout(function() {
+									uni.reLaunch({
+										url: '../login/index'
+									})
+								}, 500)
+							}
+						}).catch(err => {
+							this.$refs.comMessage.showErrorMessage(err)
+						})
+				}).catch(err => {
+					console.log('表单错误信息：', err);
+				})
+			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					navigateBack(1)
+
 				})
 			},
-	    }
+		}
 	}
 </script>
 
 <style>
-	.content{
+	.content {
 		/* padding: 20rpx; */
 		/* background-color: #fff; */
 	}
-	
-</style>
+</style>
\ No newline at end of file