From b840a0adf13c04773c3548722b279e2832481b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 6 Jul 2022 18:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E8=A7=81=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   4 +-
 pages/mine/set/feedBack.vue                   |   4 +-
 .../mine/set/securityCenter/editPassword.vue  | 535 +++++++++---------
 3 files changed, 281 insertions(+), 262 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4cc39c1..9267136 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__EC9FD60",
     "description" : "",
-    "versionName" : "4.2.5",
-    "versionCode" : 4000250,
+    "versionName" : "4.2.6",
+    "versionCode" : 4000260,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages/mine/set/feedBack.vue b/pages/mine/set/feedBack.vue
index a12ad6d..3490a9a 100644
--- a/pages/mine/set/feedBack.vue
+++ b/pages/mine/set/feedBack.vue
@@ -16,9 +16,9 @@
     <!-- 上传凭证 -->
     <div class="feedBack-box">
       <view class="opt-view">
-        <view class="img-title">上传凭证（最多5张）</view>
+        <view class="img-title">上传凭证（最多2张）</view>
         <view class="images-view">
-          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150" @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
+          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150" @on-uploaded="onUploaded" :max-count="2" :show-progress="false"></u-upload>
         </view>
       </view>
     </div>
diff --git a/pages/mine/set/securityCenter/editPassword.vue b/pages/mine/set/securityCenter/editPassword.vue
index 7da13e0..dcd9d2f 100644
--- a/pages/mine/set/securityCenter/editPassword.vue
+++ b/pages/mine/set/securityCenter/editPassword.vue
@@ -1,258 +1,277 @@
-<template>
-  <view class="box">
-    <view class="box-tips">
-      <h2 class='h2'>
-        {{verificationTitle[validateFlage==false ? 0 : 1].title}}
-      </h2>
-      <view class="verification">{{verificationTitle[step].desc}}</view>
-    </view>
-		<view class="form">
-			<u-form :model="codeForm"  ref="validateCodeForm">
-      <view v-if="!validateFlage">
-        <u-form-item label-width="120" label="手机号" prop="mobile">
-          <u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
-        </u-form-item>
-
-        <u-form-item class="sendCode" label-width="120" prop="code" label="验证码">
-          <u-input  v-model="codeForm.code" placeholder="请输入验证码" />
-          <u-verification-code unique-key="page-edit" :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
-          <view @tap="getCode" class="text-tips">{{ tips }}</view>
-        </u-form-item>
-
-        <view class="submit" @click="validatePhone">验证</view>
-        <myVerification keep-running @send="verification" class="verification" ref="verification" business="FIND_USER" />
-      </view>
-      <view v-if="validateFlage">
-        <u-form-item label-width="120" label="旧密码">
-          <u-input type="password" v-model="password" placeholder="请输入您的旧密码" />
-        </u-form-item>
-
-        <u-form-item label-width="120" label="新密码">
-
-          <u-input type="password" v-model="newPassword" placeholder="请输入您的新密码" />
-
-        </u-form-item>
-
-        <view class="submit" @click="updatePassword">修改密码</view>
-      </view>
-    </u-form>
-		</view>
-	</view>
-</template>
-
-<script>
-import { sendMobile, resetByMobile, modifyPass } from "@/api/login";
-
-import { md5 } from "@/utils/md5.js"; // md5
-import myVerification from "@/components/verification/verification.vue"; //验证
-import uuid from "@/utils/uuid.modified.js";
-export default {
-  components: {
-    myVerification,
-  },
-  data() {
-    return {
-      uuid,
-      validateFlage: false, //是否进行了手机号验证
-      verificationTitle: [
-        {
-          title: "安全验证",
-          desc: "请输入当前手机号进行安全验证",
-        },
-        {
-          title: "修改密码",
-          desc: "请输入新密码",
-        },
-      ],
-      step: 0, //当前验证步骤
-      flage: false, //是否验证码验证
-
-      codeForm: {
-        mobile: "", //手机号
-        code: "", //验证码
-      },
-      newPassword: "", //新密码
-      password: "", //密码
-      tips: "", //提示
-      seconds: 60, // 60s等待时间
-
-      // 验证码登录校验
-      codeRules: {
-        mobile: [
-          {
-            validator: (rule, value, callback) => {
-              return this.$u.test.mobile(value);
-            },
-            message: "手机号码不正确",
-            trigger: ["blur"],
-          },
-        ],
-        code: [
-          {
-            min: 4,
-            max: 6,
-            required: true,
-            message: "请输入验证码",
-            trigger: ["blur"],
-          },
-        ],
-      },
-    };
-  },
-  onReady() {
-    // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
-    this.$refs.validateCodeForm.setRules(this.codeRules);
-  },
-  watch: {
-    flage(val) {
-      if (val) {
-        if (this.$refs.uCode.canGetCode) {
-          uni.showLoading({
-            title: "正在获取验证码",
-          });
-          sendMobile(this.codeForm.mobile, "FIND_USER").then((res) => {
-            uni.hideLoading();
-            // 这里此提示会被this.start()方法中的提示覆盖
-            if (res.data.code == 200) {
-              this.$refs.uCode.start();
-            } else {
-              uni.showToast({
-                title: res.data.message,
-                duration: 2000,
-                icon: "none",
-              });
-            }
-          });
-        } else {
-          this.$u.toast("请倒计时结束后再发送");
-        }
-      }
-    },
-  },
-
-  methods: {
-    // 修改密码
-    updatePassword() {
-      modifyPass({
-        newPassword: md5(this.newPassword),
-        password: md5(this.password),
-      }).then((res) => {
-        if (res.data.success) {
-          uni.showToast({
-            title: "修改成功!",
-            duration: 2000,
-            icon: "none",
-          });
-          setTimeout(() => {
-            uni.navigateBack({
-              delta: 1,
-            });
-          }, 1000);
-        }
-      });
-    },
-
-    // 验证码验证
-    verification(val) {
-      this.flage = val == this.$store.state.verificationKey ? true : false;
-    },
-
-    // 验证手机号
-    validatePhone() {
-      this.$refs.validateCodeForm.validate((valid) => {
-        if (valid) {
-          resetByMobile(this.codeForm).then((res) => {
-            if (res.data.success) {
-              this.validateFlage = !this.validateFlage;
-              // 登录成功
-              uni.showToast({
-                title: "验证成功!",
-                icon: "none",
-              });
-            }
-          });
-        }
-      });
-    },
-
-    codeChange(text) {
-      this.tips = text;
-    },
-    end() {},
-
-    /**判断是否是当前用户的手机号 */
-    isUserPhone() {
-      let flage = false;
-      let user = this.$options.filters.isLogin();
-      if (user.mobile != this.codeForm.mobile) {
-        uni.showToast({
-          title: "请输入当前绑定手机号",
-          icon: "none",
-        });
-        flage = false;
-      } else {
-        flage = true;
-      }
-
-      return flage;
-    },
-    /**获取验证码 */
-    getCode() {
-      if (this.isUserPhone()) {
-        if (this.tips == "重新获取") {
-          this.flage = true;
-        }
-        if (!this.$u.test.mobile(this.codeForm.mobile)) {
-          uni.showToast({
-            title: "请输入正确手机号",
-            icon: "none",
-          });
-          return false;
-        }
-        if (!this.flage) {
-          this.$refs.verification.hide();
-          return false;
-        }
-      }
-    },
-    start() {
-      this.$u.toast("验证码已发送");
-      this.flage = false;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import url("@/pages/passport/login.scss");
-/deep/ .u-form-item {
-  margin: 40rpx 0;
-}
-.sendCode {
-  /deep/ .u-form-item--right__content__slot {
-    display: flex;
-  }
-}
-.h2{
-	font-size: 40rpx;
-	font-weight: bold;
-}
-page {
-  background: #fff;
-}
-.box {
-  padding: 80rpx 0;
-  border-radius: 20rpx;
-}
-.submit {
-  background: $light-color;
-}
-.box-tips {
-  margin: 0 72rpx;
-}
-.verification {
-  font-size: 24rpx;
-  color: #999;
-  margin-top: 10rpx;
-}
-
-</style>
\ No newline at end of file
+<template>
+	<view class="box">
+		<view class="box-tips">
+			<h2 class='h2'>
+				{{verificationTitle[validateFlage==false ? 0 : 1].title}}
+			</h2>
+			<view class="verification">{{verificationTitle[step].desc}}</view>
+		</view>
+		<view class="form">
+			<u-form :model="codeForm" ref="validateCodeForm">
+				<view v-if="!validateFlage">
+					<u-form-item label-width="120" label="手机号" prop="mobile">
+						<u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
+					</u-form-item>
+
+					<u-form-item class="sendCode" label-width="120" prop="code" label="验证码">
+						<u-input v-model="codeForm.code" placeholder="请输入验证码" />
+						<u-verification-code unique-key="page-edit" :seconds="seconds" @end="end" @start="start"
+							ref="uCode" @change="codeChange"></u-verification-code>
+						<view @tap="getCode" class="text-tips">{{ tips }}</view>
+					</u-form-item>
+
+					<view class="submit" @click="validatePhone">验证</view>
+					<myVerification keep-running @send="verification" class="verification" ref="verification"
+						business="FIND_USER" />
+				</view>
+				<view v-if="validateFlage">
+					<u-form-item label-width="120" label="旧密码">
+						<u-input type="password" v-model="password" placeholder="请输入您的旧密码" />
+					</u-form-item>
+
+					<u-form-item label-width="120" label="新密码">
+
+						<u-input type="password" v-model="newPassword" placeholder="请输入您的新密码" />
+
+					</u-form-item>
+
+					<view class="submit" @click="updatePassword">修改密码</view>
+				</view>
+			</u-form>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		sendMobile,
+		resetByMobile,
+		modifyPass
+	} from "@/api/login";
+
+	import {
+		md5
+	} from "@/utils/md5.js"; // md5
+	import myVerification from "@/components/verification/verification.vue"; //验证
+	import uuid from "@/utils/uuid.modified.js";
+	export default {
+		components: {
+			myVerification,
+		},
+		data() {
+			return {
+				uuid,
+				validateFlage: false, //是否进行了手机号验证
+				verificationTitle: [{
+						title: "安全验证",
+						desc: "请输入当前手机号进行安全验证",
+					},
+					{
+						title: "修改密码",
+						desc: "请输入新密码",
+					},
+				],
+				step: 0, //当前验证步骤
+				flage: false, //是否验证码验证
+
+				codeForm: {
+					mobile: "", //手机号
+					code: "", //验证码
+				},
+				newPassword: "", //新密码
+				password: "", //密码
+				tips: "", //提示
+				seconds: 69, // 60s等待时间
+
+				// 验证码登录校验
+				codeRules: {
+					mobile: [{
+						validator: (rule, value, callback) => {
+							return this.$u.test.mobile(value);
+						},
+						message: "手机号码不正确",
+						trigger: ["blur"],
+					}, ],
+					code: [{
+						min: 4,
+						max: 6,
+						required: true,
+						message: "请输入验证码",
+						trigger: ["blur"],
+					}, ],
+				},
+			};
+		},
+		onReady() {
+			// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
+			this.$refs.validateCodeForm.setRules(this.codeRules);
+		},
+		watch: {
+			flage(val) {
+				if (val) {
+
+					if (this.$refs.uCode.canGetCode) {
+						uni.showLoading({
+							title: "正在获取验证码",
+						});
+						sendMobile(this.codeForm.mobile, "FIND_USER").then((res) => {
+							uni.hideLoading();
+							// 这里此提示会被this.start()方法中的提示覆盖
+							if (res.data.success) {
+								this.$refs.uCode.start();
+							} else {
+								uni.showToast({
+									title: res.data.message,
+									duration: 2000,
+									icon: "none",
+								});
+								this.flage = false;
+								this.$refs.verification.getCode();
+							}
+						})
+					} else {
+						this.$u.toast("请倒计时结束后再发送");
+					}
+				}
+			},
+		},
+
+		methods: {
+			// 修改密码
+			updatePassword() {
+				modifyPass({
+					newPassword: md5(this.newPassword),
+					password: md5(this.password),
+				}).then((res) => {
+					if (res.data.success) {
+						uni.showToast({
+							title: "修改成功!",
+							duration: 2000,
+							icon: "none",
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1,
+							});
+						}, 1000);
+					}
+				});
+			},
+
+			// 验证码验证
+			verification(val) {
+				this.flage = val == this.$store.state.verificationKey ? true : false;
+			},
+
+			// 验证手机号
+			validatePhone() {
+				this.$refs.validateCodeForm.validate((valid) => {
+					if (valid) {
+						resetByMobile(this.codeForm).then((res) => {
+							if (res.data.success) {
+								this.validateFlage = !this.validateFlage;
+								// 登录成功
+								uni.showToast({
+									title: "验证成功!",
+									icon: "none",
+								});
+							}
+						});
+					}
+				});
+			},
+
+			codeChange(text) {
+				this.tips = text;
+			},
+			end() {
+				
+				this.flage = false;
+					this.$refs.verification.getCode()
+			},
+
+			/**判断是否是当前用户的手机号 */
+			isUserPhone() {
+				let flage = false;
+				let user = this.$options.filters.isLogin();
+				if (user.mobile != this.codeForm.mobile) {
+					uni.showToast({
+						title: "请输入当前绑定手机号",
+						icon: "none",
+					});
+					flage = false;
+				} else {
+					flage = true;
+				}
+
+				return flage;
+			},
+			/**获取验证码 */
+			getCode() {
+				if (this.isUserPhone()) {
+					if (this.tips == "重新获取") {
+						this.$refs.verification.error(); //发送
+					}
+					if (!this.$u.test.mobile(this.codeForm.mobile)) {
+						uni.showToast({
+							title: "请输入正确手机号",
+							icon: "none",
+						});
+						return false;
+					}
+					if (!this.flage) {
+						this.$refs.verification.error(); //发送
+						return false;
+					}
+				}
+			},
+			start() {
+				this.$u.toast("验证码已发送");
+				this.flage = true;
+
+				this.$refs.verification.hide();
+			},
+		},
+	};
+</script>
+<style lang="scss" scoped>
+	@import url("@/pages/passport/login.scss");
+
+	/deep/ .u-form-item {
+		margin: 40rpx 0;
+	}
+
+	.sendCode {
+		/deep/ .u-form-item--right__content__slot {
+			display: flex;
+		}
+	}
+
+	.h2 {
+		font-size: 40rpx;
+		font-weight: bold;
+	}
+
+	page {
+		background: #fff;
+	}
+
+	.box {
+		padding: 80rpx 0;
+		border-radius: 20rpx;
+	}
+
+	.submit {
+		background: $light-color;
+	}
+
+	.box-tips {
+		margin: 0 72rpx;
+	}
+
+	.verification {
+		font-size: 24rpx;
+		color: #999;
+		margin-top: 10rpx;
+	}
+</style>