From 09b0b0a25ee9a2b438d7d37f0c58b35487950bac Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Feb 2025 17:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js                    | 11 +++++++++++
 pages/order/pay/index.wxml                  |  2 +-
 subPackages/password/overview/overview.js   | 11 ++++++++++-
 subPackages/password/overview/overview.wxml |  4 ++--
 subPackages/password/setting/setting.js     |  2 +-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index dd30a7e..a9e23e0 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -533,6 +533,17 @@ Page({
         _this.setData({inputAreaHeight: 0})
       },300)
   },
+  goReset: function () {
+    commonApi.user_post("pay_password/checkLocked",{}).then(res=>{
+        if (res.code!=1) {
+            return
+        } else {
+            wx.navigateTo({
+                url: '/subPackages/password/setting/setting?type='+type,
+            })
+        }
+      })
+  },
 
   /**
    * 生命周期函数--监听页面隐藏
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 8dbfc57..e798803 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -137,7 +137,7 @@
         </view>
         
         <view class="resetPassword">
-            <navigator url="/subPackages/password/setting/setting?type=reset">忘记密码</navigator>
+            <view bind:tap="goReset" url="/subPackages/password/setting/setting?type=reset">忘记密码</view>
         </view>
     </view>
 
diff --git a/subPackages/password/overview/overview.js b/subPackages/password/overview/overview.js
index 5a7da4a..7b4667e 100644
--- a/subPackages/password/overview/overview.js
+++ b/subPackages/password/overview/overview.js
@@ -11,7 +11,7 @@ Page({
   data: {
   
     havePassword:false,
-   
+    isLock: false
   },
 
   /**
@@ -69,6 +69,15 @@ Page({
       this.setData({
         havePassword:res.data,
       })
+
+      if (res.data) {
+        commonApi.user_post("pay_password/checkLocked",{}).then(res=>{
+            this.setData({
+                isLock: !res.data
+            })
+          })
+      }
+
     })
   },
 
diff --git a/subPackages/password/overview/overview.wxml b/subPackages/password/overview/overview.wxml
index 08d0cfc..6f8d57c 100644
--- a/subPackages/password/overview/overview.wxml
+++ b/subPackages/password/overview/overview.wxml
@@ -8,12 +8,12 @@
   
   <view class="iconfont icon-you" wx:else></view>
 </view>
-<view bindtap="goSetting" data-type="edit" class="profile-item"  wx:if="{{havePassword}}">
+<view bindtap="goSetting" data-type="edit" class="profile-item"  wx:if="{{havePassword&&!isLock}}">
   <text>修改密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
 </view>
-<view bindtap="goSetting" data-type="reset" class="profile-item" wx:if="{{havePassword}}">
+<view bindtap="goSetting" data-type="reset" class="profile-item" wx:if="{{havePassword&&!isLock}}">
   <text>忘记密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
diff --git a/subPackages/password/setting/setting.js b/subPackages/password/setting/setting.js
index 64f8229..f1a03b2 100644
--- a/subPackages/password/setting/setting.js
+++ b/subPackages/password/setting/setting.js
@@ -229,7 +229,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post("user/getMyInfo",{}).then(res=>{
+    commonApi.user_post("uservice/user/getMyInfo",{}).then(res=>{
         let userinfo = res.data
         if (userinfo && userinfo.mobile) {
             this.data.inputData.phone = userinfo.mobile