From 638abae69b3c8acd3025df9b21bcbedf19d034fd Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 12 Dec 2023 16:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=AE=BE=E7=BD=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                                   |  14 +
 pages.json                                    |  18 ++
 pages/user/user.vue                           |   6 +
 .../securitySettings/securitySettings.vue     | 275 ++++++++++++++++++
 .../pages/systemSettings/systemSettings.vue   | 134 ---------
 5 files changed, 313 insertions(+), 134 deletions(-)
 create mode 100644 pagesUser/pages/securitySettings/securitySettings.vue

diff --git a/api/user.js b/api/user.js
index e9addd9..513d9ad 100644
--- a/api/user.js
+++ b/api/user.js
@@ -13,6 +13,20 @@ export function oauthtoken(data) {
 		data
 	});
 }
+
+/**
+ * 修改密码
+ * @param {Object} data
+ */
+export function editPassword(data) {
+
+	return request({
+		url: `blade-system/user/update-password?oldPassword=${data.oldPassword}&newPassword=${data.newPassword}&newPassword1=${data.newPassword1}`,
+		method: "post",
+		data
+	});
+}
+
 /**
  * 整托备货
  * @param {Object} data
diff --git a/pages.json b/pages.json
index 243f3af..1696051 100644
--- a/pages.json
+++ b/pages.json
@@ -1243,6 +1243,24 @@
 							}
 						}
 					}
+				},
+				{
+					"path": "pages/securitySettings/securitySettings",
+					"style": {
+						"navigationBarTitleText": "安全设置",
+						"enablePullDownRefresh": true,
+						"onReachBottomDistance": 1,
+						"navigationStyle": "custom",
+						"app-plus": {
+							"animationDuration": 300,
+							"animationType": "zoom-fade-out",
+							"pullToRefresh": {
+								"support": true,
+								"color": "#d3832a", //小圈圈的颜色
+								"style": "circle" //小圈圈的样式
+							}
+						}
+					}
 				}
 			]
 		},
diff --git a/pages/user/user.vue b/pages/user/user.vue
index c30fbd1..863353d 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -165,6 +165,12 @@
 				url: '/pagesUser/pages/systemSettings/systemSettings'
 			})
 		}
+		// 安全设置
+		else if (item.type == 4) {
+			uni.navigateTo({
+				url: '/pagesUser/pages/securitySettings/securitySettings'
+			})
+		}
 		// 关于我们
 		else if (item.type == 5) {
 			uni.navigateTo({
diff --git a/pagesUser/pages/securitySettings/securitySettings.vue b/pagesUser/pages/securitySettings/securitySettings.vue
new file mode 100644
index 0000000..60f3ce6
--- /dev/null
+++ b/pagesUser/pages/securitySettings/securitySettings.vue
@@ -0,0 +1,275 @@
+<template>
+	<view class="container">
+		<u-navbar title="安全设置" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
+			:autoBack="true" leftIconSize='35'></u-navbar>
+		<view class="list">
+			<!-- 设置密码 -->
+			<view class="list_item" style="display: flex;" @click="showEditPwd">
+				<view class="uni-list-cell-left">
+					<u-icon class="margin-right-10" name="setting-fill" color="#47beff"></u-icon>
+					<view>
+						设置密码：
+					</view>
+				</view>
+				<u-icon name="arrow-right" color="#000"></u-icon>
+			</view>
+		</view>
+	</view>
+
+	<!-- 弹出层 -- 设置密码 -->
+	<PopUp ref="EditPwdPop">
+		<!-- 原密码 -->
+		<view class="flex-c-sb">
+			<view class="EditPwdPop-title">
+				原密码：
+			</view>
+			<u-input placeholder="原密码" border="none" :input="handleTrim('oldPwd')" v-model="editPwdForm.oldPwd"
+				:password="!ShowPwdObj.oldPwd" clearable>
+				<template #suffix>
+					<view @click="isShowPwd('oldPwd')">
+						<u-icon v-if="ShowPwdObj.oldPwd" name="eye-off" size="40"></u-icon>
+						<u-icon v-else name="eye-fill" size="40"></u-icon>
+					</view>
+				</template>
+			</u-input>
+		</view>
+
+		<!-- 新密码 -->
+		<view class="flex-c-sb">
+			<view class="EditPwdPop-title">
+				新密码：
+			</view>
+			<u-input placeholder="新密码" border="none" :input="handleTrim('newPwd1')"
+				onkeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" v-model="editPwdForm.newPwd1"
+				:password="!ShowPwdObj.newPwd1" clearable>
+				<template #suffix>
+					<view @click="isShowPwd('newPwd1')">
+						<u-icon v-if="ShowPwdObj.newPwd1" name="eye-off" size="40"></u-icon>
+						<u-icon v-else name="eye-fill" size="40"></u-icon>
+					</view>
+				</template>
+			</u-input>
+		</view>
+
+		<!-- 确认新密码 -->
+		<view class="flex-c-sb">
+			<view class="EditPwdPop-title">
+				确认新密码：
+			</view>
+			<u-input placeholder="确认新密码" border="none" :input="handleTrim('newPwd2')" v-model.trim="editPwdForm.newPwd2"
+				:password="!ShowPwdObj.newPwd2" clearable>
+				<template #suffix>
+					<view @click="isShowPwd('newPwd2')">
+						<u-icon v-if="ShowPwdObj.newPwd2" name="eye-off" size="40"></u-icon>
+						<u-icon v-else name="eye-fill" size="40"></u-icon>
+					</view>
+				</template>
+			</u-input>
+		</view>
+
+	</PopUp>
+</template>
+
+<script lang="ts" setup>
+	import {
+		onShow,
+		onLoad,
+		onHide,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+	import { reactive, ref, toRefs } from 'vue';
+	import { editPassword } from '@/api/user.js';
+	import {
+		hexMD5
+	} from '@/utils/md5.js'
+
+	onPullDownRefresh(() => {
+		const timer = setTimeout(() => {
+			// 关闭下拉刷新
+			uni.stopPullDownRefresh()
+			clearTimeout(timer)
+		}, 500)
+	})
+
+	const details = reactive({
+		// 
+		scanStateList: [],
+		// 选中的索引 -- 默认为关闭
+		scanStateChooseIndex: 0
+	})
+
+	// 组件实例
+	/** 修改密码 */
+	const EditPwdPop = ref()
+
+	const ShowPwdObj = reactive({
+		oldPwd: false,
+		newPwd1: false,
+		newPwd2: false,
+	})
+
+	const editPwdForm = reactive({
+		oldPwd: '',
+		newPwd1: '',
+		newPwd2: '',
+	})
+
+	/** 退出登录 */
+	function removeall() {
+		const res = uni.getStorageInfoSync();
+		res.keys.map(item => {
+			if (item == 'loginuser' || item == 'HistoryDate' || item == 'setip' || item == 'checkname' || item.indexOf('IMAGE_CACHE_INFO') != -1) {
+				return
+			}
+			uni.removeStorageSync(item)
+		})
+		uni.reLaunch({
+			url: '/pages/login/login'
+		})
+		console.log(res.currentSize);
+		console.log(String(res.limitSize));
+	}
+
+	/** 显示设置密码弹窗 */
+	const showEditPwd = () => {
+		EditPwdPop.value.setDetails({
+			title: '设置密码',
+			showPopUp: true,
+			async success() {
+				console.log('editPwdForm :>> ', editPwdForm);
+				let _isReturn = false
+				// 循环验证密码是否符合规则
+				for (let key in editPwdForm) {
+					if (editPwdForm[key].length < 6) {
+						_isReturn = true
+						uni.showToast({
+							title: '请输入6位以上密码',
+							icon: 'none'
+						})
+						// 退出循环
+						break
+					}
+				}
+
+				if (_isReturn) return
+
+				// 原密码
+				let { password } = <{ password : string; tenantId : string; username : string }>uni.getStorageSync('loginuser')
+				if (editPwdForm.oldPwd !== password) {
+					uni.showToast({
+						title: '密码与原密码不一致',
+						icon: 'none'
+					})
+					return
+				}
+
+				// 两次密码比对
+				if (editPwdForm.newPwd1 !== editPwdForm.newPwd2) {
+					uni.showToast({
+						title: '确认密码与新密码不一致',
+						icon: 'none'
+					})
+					return
+				}
+
+				/** 加密密码 */
+				const submitData = {
+					oldPassword: hexMD5(editPwdForm.oldPwd),
+					newPassword: hexMD5(editPwdForm.newPwd1),
+					newPassword1: hexMD5(editPwdForm.newPwd2),
+				}
+
+				const response = await editPassword(submitData)
+
+				console.log('response :>> ', response);
+				if (response.msg) uni.showToast({
+					title: response.msg,
+					icon: 'none'
+				})
+				if (response.code !== 200) return
+				removeall()
+			}
+		})
+	}
+
+	/** 处理文本输入 -- 去除收尾空格 */
+	const handleTrim = (item) => {
+		editPwdForm[item] = uni.$u.trim(editPwdForm[item].trim(), 'all')
+	}
+
+	/** 是否显示密码 */
+	const isShowPwd = (item) => {
+		ShowPwdObj[item] = !ShowPwdObj[item]
+	}
+
+	const { } = toRefs(details)
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		width: 100vw;
+		height: 100vh;
+		// background: #fff;
+	}
+
+	.list {}
+
+	.list_item {
+		display: flex;
+		justify-content: space-between;
+		padding: 20upx;
+		border-bottom: 2upx solid #eee;
+		background: #fff;
+		position: relative;
+
+		.uni-list-cell-db {
+			position: absolute;
+			top: 0;
+			left: 0;
+			padding: 20upx;
+			width: 100%;
+			height: 100%;
+			text-align: right;
+			box-sizing: border-box;
+		}
+
+		&:last-child {
+			border-bottom: 0px;
+		}
+
+		.uni-list-cell-left {
+			display: inline-flex;
+		}
+	}
+
+	.margin-right-10 {
+		margin-right: 10upx;
+	}
+
+	// 修改密码弹窗
+	.EditPwdPop-title {
+		position: relative;
+		width: 200upx;
+		flex: none;
+
+		&::after {
+			right: 20upx;
+			top: 50%;
+			transform: translateY(-50%);
+			position: absolute;
+			content: '';
+			display: block;
+			width: 2upx;
+			height: 40upx;
+			background: #000;
+		}
+	}
+
+	.flex-c-sb {
+		display: flex;
+		align-items: center;
+		margin: 20upx 0 10upx;
+		border-bottom: 1upx solid #aaa;
+		padding: 20upx 0 10upx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesUser/pages/systemSettings/systemSettings.vue b/pagesUser/pages/systemSettings/systemSettings.vue
index 0797535..83e4ec6 100644
--- a/pagesUser/pages/systemSettings/systemSettings.vue
+++ b/pagesUser/pages/systemSettings/systemSettings.vue
@@ -19,72 +19,9 @@
 					</picker>
 				</view>
 			</view>
-
-			<!-- 设置密码 -->
-			<view class="list_item" style="display: flex;" @click="showEditPwd">
-				<view class="uni-list-cell-left">
-					<u-icon class="margin-right-10" name="setting-fill" color="#47beff"></u-icon>
-					<view>
-						设置密码：
-					</view>
-				</view>
-				<u-icon name="arrow-right" color="#000"></u-icon>
-			</view>
 		</view>
 	</view>
-	<!-- 设置密码 -->
-	<PopUp ref="EditPwdPop">
 
-		<!-- 原密码 -->
-		<view class="flex-c-sb">
-			<view class="EditPwdPop-title">
-				原密码：
-			</view>
-			<u-input placeholder="原密码" border="none" :input="handleTrim('oldPwd')" v-model="editPwdForm.oldPwd"
-				:password="!ShowPwdObj.oldPwd" clearable>
-				<template #suffix>
-					<view @click="isShowPwd('oldPwd')">
-						<u-icon v-if="ShowPwdObj.oldPwd" name="eye-off" size="40"></u-icon>
-						<u-icon v-else name="eye-fill" size="40"></u-icon>
-					</view>
-				</template>
-			</u-input>
-		</view>
-
-		<!-- 新密码 -->
-		<view class="flex-c-sb">
-			<view class="EditPwdPop-title">
-				新密码：
-			</view>
-			<u-input placeholder="新密码" border="none" :input="handleTrim('newPwd1')"
-				onkeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" v-model="editPwdForm.newPwd1"
-				:password="!ShowPwdObj.newPwd1" clearable>
-				<template #suffix>
-					<view @click="isShowPwd('newPwd1')">
-						<u-icon v-if="ShowPwdObj.newPwd1" name="eye-off" size="40"></u-icon>
-						<u-icon v-else name="eye-fill" size="40"></u-icon>
-					</view>
-				</template>
-			</u-input>
-		</view>
-
-		<!-- 确认新密码 -->
-		<view class="flex-c-sb">
-			<view class="EditPwdPop-title">
-				确认新密码：
-			</view>
-			<u-input placeholder="确认新密码" border="none" :input="handleTrim('newPwd2')" v-model.trim="editPwdForm.newPwd2"
-				:password="!ShowPwdObj.newPwd2" clearable>
-				<template #suffix>
-					<view @click="isShowPwd('newPwd2')">
-						<u-icon v-if="ShowPwdObj.newPwd2" name="eye-off" size="40"></u-icon>
-						<u-icon v-else name="eye-fill" size="40"></u-icon>
-					</view>
-				</template>
-			</u-input>
-		</view>
-
-	</PopUp>
 </template>
 
 <script lang="ts" setup>
@@ -120,9 +57,6 @@
 	})
 
 	// 组件实例
-	/** 修改密码 */
-	const EditPwdPop = ref()
-
 
 	// 初始化后台监听扫描数组的值
 	details.scanStateList = scanStateList.value
@@ -140,74 +74,6 @@
 		HANDLE_SCANSTATE(details.scanStateChooseIndex)
 	}
 
-	const ShowPwdObj = reactive({
-		oldPwd: false,
-		newPwd1: false,
-		newPwd2: false,
-	})
-
-	const editPwdForm = reactive({
-		oldPwd: '',
-		newPwd1: '',
-		newPwd2: '',
-	})
-
-
-	/** 显示设置密码弹窗 */
-	const showEditPwd = () => {
-		EditPwdPop.value.setDetails({
-			title: '设置密码',
-			showPopUp: true,
-			success() {
-				console.log('editPwdForm :>> ', editPwdForm);
-				let _isReturn = false
-				// 循环验证密码是否符合规则
-				for (let key in editPwdForm) {
-					if (editPwdForm[key].length < 6) {
-						_isReturn = true
-						uni.showToast({
-							title: '请输入6位以上密码',
-							icon: 'none'
-						})
-						// 退出循环
-						break
-					}
-				}
-
-				if (_isReturn) return
-
-				// 原密码
-				let { password } = <{ password : string; tenantId : string; username : string }>uni.getStorageSync('loginuser')
-				if (editPwdForm.oldPwd !== password) {
-					uni.showToast({
-						title: '密码与原密码不一致',
-						icon: 'none'
-					})
-					// return 
-				}
-
-				// 两次密码比对
-				if (editPwdForm.newPwd1 !== editPwdForm.newPwd2) {
-					uni.showToast({
-						title: '确认密码与新密码不一致',
-						icon: 'none'
-					})
-					return
-				}
-			}
-		})
-	}
-
-	/** 处理文本输入 -- 去除收尾空格 */
-	const handleTrim = (item) => {
-		editPwdForm[item] = uni.$u.trim(editPwdForm[item].trim(), 'all')
-	}
-
-	/** 是否显示密码 */
-	const isShowPwd = (item) => {
-		ShowPwdObj[item] = !ShowPwdObj[item]
-	}
-
 	const { } = toRefs(details)
 </script>