From 7a4b8764b68e0dbaeb90e292a8a4bd47cb379e68 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 17:26:02 +0800
Subject: [PATCH] 小程序端和PC端bug修复

---
 small-program/shop/pages/change-password/change-password.vue |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/small-program/shop/pages/change-password/change-password.vue b/small-program/shop/pages/change-password/change-password.vue
index 3f24105..bd51ed6 100644
--- a/small-program/shop/pages/change-password/change-password.vue
+++ b/small-program/shop/pages/change-password/change-password.vue
@@ -2,12 +2,15 @@
 	<view class="change-password-page">
 		<view class="change-password-page__form">
 			<view class="change-password-page__item">
-				<text class="change-password-page__label">鏂板瘑鐮�</text>
+				<text class="change-password-page__label"><text style="color: red;">*</text>鍘熷瀵嗙爜</text>
+				<input v-model="form.oldPassword" class="change-password-page__input" password placeholder="璇疯緭鍏ュ師濮嬪瘑鐮�" placeholder-style="color: #c2c7d0;" />
+			</view>
+			<view class="change-password-page__item">
+				<text class="change-password-page__label"><text style="color: red;">*</text>鏂板瘑鐮�</text>
 				<input v-model="form.password" class="change-password-page__input" password placeholder="璇疯緭鍏ユ柊瀵嗙爜" placeholder-style="color: #c2c7d0;" />
 			</view>
-
 			<view class="change-password-page__item">
-				<text class="change-password-page__label">纭瀵嗙爜</text>
+				<text class="change-password-page__label"><text style="color: red;">*</text>纭瀵嗙爜</text>
 				<input v-model="form.confirmPassword" class="change-password-page__input" password placeholder="璇峰啀娆¤緭鍏ユ柊瀵嗙爜" placeholder-style="color: #c2c7d0;" />
 			</view>
 
@@ -17,12 +20,12 @@
 		<button class="change-password-page__submit" hover-class="change-password-page__submit--hover" @click="handleSubmit">纭淇敼</button>
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
 			return {
 				form: {
+					oldPassword:'',
 					password: '',
 					confirmPassword: ''
 				}
@@ -30,6 +33,10 @@
 		},
 		methods: {
 			handleSubmit() {
+				if (!this.form.oldPassword) {
+					uni.showToast({ title: '璇疯緭鍏ュ師濮嬪瘑鐮�', icon: 'none' })
+					return
+				}
 				if (!this.form.password) {
 					uni.showToast({ title: '璇疯緭鍏ユ柊瀵嗙爜', icon: 'none' })
 					return
@@ -48,16 +55,10 @@
 					return
 				}
 				uni.showLoading({ title: '淇敼涓�...' })
-				this.$u.api.changePassword({ newPassword: this.form.password }).then(res => {
+				this.$u.api.changePassword({ newPassword: this.form.password,oldPassword:this.form.oldPassword }).then(res => {
 					uni.hideLoading()
 					if (res.code === 200) {
-						uni.showToast({ title: '淇敼鎴愬姛', icon: 'success' })
-						setTimeout(() => {
-							this.$store.commit('clearAll')
-							uni.reLaunch({
-								url: '/pages/login/login'
-							})
-						}, 1500)
+						uni.showToast({ title: '淇敼鎴愬姛锛屼笅娆$櫥褰曡浣跨敤鏂板瘑鐮佺櫥褰�', icon: 'success' })
 					}
 				}).catch(err => {
 					uni.hideLoading()

--
Gitblit v1.9.3