From 4b3204fda69b1002d72c208b56651283adfdc8da Mon Sep 17 00:00:00 2001
From: lijun <457220798@qq.com>
Date: Tue, 6 Sep 2022 09:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniProject/pages/editPwd/editPwd.js    | 19 ++++++++++++++-----
 miniProject/pages/editPwd/editPwd.wxml  |  9 ++++++---
 miniProject/pages/index/mall/index.wxml |  2 +-
 miniProject/pages/me/index.js           |  8 ++++----
 miniProject/pages/me/index.wxml         |  6 +++---
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/miniProject/pages/editPwd/editPwd.js b/miniProject/pages/editPwd/editPwd.js
index 24aeab4..0cdfe8b 100644
--- a/miniProject/pages/editPwd/editPwd.js
+++ b/miniProject/pages/editPwd/editPwd.js
@@ -13,7 +13,16 @@ Page({
         navTop: App.globalData.navTop,
         newPwd:'',
         newPwd1:"",
-        oldPwd:''
+        oldPwd:'',
+        password:[{
+            required:true,
+            message: '请输入',
+            trigger:'onBlur',
+            validator: value => {
+                return /^(?=.*[0-9])((?=.*[A-Z])|(?=.*[a-z]))(?=.*[^a-zA-Z0-9]).{8,30}$/
+                .test(value)
+              },
+          }]
     },
 
     /**
@@ -23,18 +32,18 @@ Page({
 
     },
     onGoBack: function() {
-        wx.switchTab({
+        wx.navigateTo({
             url: '/pages/me/index'
         })
     },
     inputBlur1(e){
-        this.data.oldPwd = e.detail.value
+        this.data.oldPwd = e.detail
     },
     inputBlur2(e){
-        this.data.newPwd = e.detail.value
+        this.data.newPwd = e.detail
     },
     inputBlur3(e){
-        this.data.newPwd1 = e.detail.value
+        this.data.newPwd1 = e.detail
     },
     onSubmit(){
         if(this.data.newPwd&&this.data.newPwd1&&this.data.oldPwd){
diff --git a/miniProject/pages/editPwd/editPwd.wxml b/miniProject/pages/editPwd/editPwd.wxml
index 9d92fc1..7e05ae8 100644
--- a/miniProject/pages/editPwd/editPwd.wxml
+++ b/miniProject/pages/editPwd/editPwd.wxml
@@ -15,24 +15,27 @@
             type='password'
             name="原密码"
             label="原密码"
+            required
             placeholder="原密码"
-            bind:blur='inputBlur1'
+            bind:change='inputBlur1'
             />
             <van-field
             type='password'
             value="{{newPwd}}"
             name="新密码"
+            required
             label="新密码"
             placeholder="新密码"
-            bind:blur='inputBlur2'
+            bind:change='inputBlur2'
             />
             <van-field
             type='password'
             value="{{newPwd1}}"
             name="确认密码"
+            required
             label="确认密码"
             placeholder="确认密码"
-            bind:blur='inputBlur3'
+            bind:change='inputBlur3'
             />
     </van-cell-group>
     <view style="margin-top: 20rpx;">
diff --git a/miniProject/pages/index/mall/index.wxml b/miniProject/pages/index/mall/index.wxml
index 0e34449..95d7857 100644
--- a/miniProject/pages/index/mall/index.wxml
+++ b/miniProject/pages/index/mall/index.wxml
@@ -24,7 +24,7 @@
   
    <view class="mcards ~acea-row" wx:if="{{cardData.length>2}}">
         <view class="card" wx:for="{{cardData}}" wx:for-index="index" wx:for-item="item" wx:if="{{index>1}}" wx:key='index'>
-            <view class="mnum">{{index}}{{ item.value||'--' }}</view>
+            <view class="mnum">{{ item.value||'--' }}</view>
             <view class="mname">{{ item.name||'--' }}{{item.unit?'('+item.unit+')':''}}</view>
         </view>
         <!-- <view class="card"  wx:if="{{cardData.length>3}}">
diff --git a/miniProject/pages/me/index.js b/miniProject/pages/me/index.js
index 176bb28..3e0701c 100644
--- a/miniProject/pages/me/index.js
+++ b/miniProject/pages/me/index.js
@@ -30,13 +30,13 @@ Page({
     console.log(e)
   },
   inputBlur(e){
-    this.data.userForm.realName = e.detail.value
+    this.data.userForm.realName = e.detail
   },
   inputBlur2(e){
-    this.data.userForm.tel = e.detail.value
+    this.data.userForm.tel = e.detail
   },
   inputBlur3(e){
-    this.data.userForm.email = e.detail.value
+    this.data.userForm.email = e.detail
   },
   getUserInfo(){
     basicApi.singleUser(wx.getStorageSync('uid')).then(res => {
@@ -71,7 +71,7 @@ Page({
     })
   },
   undatePwd(){
-    wx.reLaunch({ url: '/pages/editPwd/editPwd' })
+    wx.navigateTo({ url: '/pages/editPwd/editPwd' })
   },
   logout: () => {
     wx.getStorageInfo({
diff --git a/miniProject/pages/me/index.wxml b/miniProject/pages/me/index.wxml
index 490f9bc..8a6a949 100644
--- a/miniProject/pages/me/index.wxml
+++ b/miniProject/pages/me/index.wxml
@@ -27,21 +27,21 @@
                 name="姓名"
                 label="姓名"
                 placeholder="姓名"
-                bind:blur='inputBlur'
+                bind:change='inputBlur'
                 />
                 <van-field
                 value="{{userForm.tel}}"
                 name="电话号码"
                 label="电话号码"
                 placeholder="电话号码"
-                bind:blur='inputBlur2'
+                bind:change='inputBlur2'
                 />
                 <van-field
                 value="{{userForm.email}}"
                 name="邮箱"
                 label="邮箱"
                 placeholder="邮箱"
-                bind:blur='inputBlur3'
+                bind:change='inputBlur3'
                 />
                 <van-field
                 value="{{userForm.roles}}"