From 5e5c828ee2ae27bc8da965ce6a6adaab2c6d0fd1 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 2 Dec 2023 13:50:22 +0800
Subject: [PATCH] 1、小程序会员详情的优化，取消密码 2、等级卡项续费变动购买的bug优化，是因为链接地址直接弹出购买的优化

---
 pages/user/plus/plus.js         | 19 ++++++++++---------
 pages/user/userinfo/userinfo.js |  6 ++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index b9a202e..8dd2b15 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -242,18 +242,19 @@ Page({
 
     getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, {
       success: function (e) {
-        var userInfo = e.data.data;
-        if (userInfo['card_field'] && !getApp().globalData.is_card_back) {
-          var u_url = "/packageE/pages/user/cardinfo/cardinfo";
-          wx.reLaunch({
-            url: u_url
-          })
-
-        }
+          var userInfo = e.data.data;
+          if (userInfo && userInfo['card_field'] && !getApp().globalData.is_card_back) {
+              var u_url = "/packageE/pages/user/cardinfo/cardinfo";
+              wx.reLaunch({
+                url: u_url
+              })
+          }else{
+            th.getPlusCardType();
+          }
       },
     });
 
-    this.getPlusCardType();
+
   },
 
   /**
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index 93499df..44d8a2c 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -148,6 +148,12 @@ Page({
         isstcsp: 1
       })
     } else {
+
+      if(this.data.user.isVerification) {
+            getApp().my_warnning("已设置消费需启用密码，无法取消", 0, th);
+            return false;
+        }
+
       th.setData({
         isstcsp: 0
       })
--
libgit2 0.21.4