OA单的优化

yvan.ni
1 parent 6592089b
Showing 7 changed files with 68 additions and 38 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageD/pages/user/deposit/prepaid/msg/msg.js
packageD/pages/user/deposit/prepaid/msg/msg.json
packageD/pages/user/deposit/prepaid/msg/msg.wxml
packageD/pages/user/deposit/prepaid/prepaid.js
pages/user/userinfo/userinfo.js
pages/user/userinfo/userinfo.wxml
@@ -1356,6 +1356,12 @@ Page({
         url = `/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&orderSn=${ordersn}&lbId=${buyreceive_id}`;
         break;
       };
+      //-- 每月礼包的优化,去列表领取  --
+      case 7: {
+        url = `/packageE/pages/user/monthgiftbag/monthgiftbag`;
+        break;
+      };
+
     };
     app.goto(url);
   },
@@ -9,6 +9,7 @@ Page({
     // timer: '',//定时器名字
     // countDownNum: '3'//倒计时初始值
     iurl: o.imghost,
+    is_nd_pw:0
   },
@@ -16,7 +17,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-   
+
+    if(options.is_nd_pw){
+      this.data.is_nd_pw=options.is_nd_pw;
+    }
+
   },
   /**
@@ -30,37 +35,43 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-      getApp().check_can_share();
-    wx.setNavigationBarTitle({
-      title: "支付成功",
-    })
+     getApp().check_can_share();
+     wx.setNavigationBarTitle({
+        title: "支付成功",
+     })
+
+     let th=this;
+     //判断密码是不是有开始
+     if(this.data.is_nd_pw){
+         getApp().request.get("/api/weshop/users/getAndUpdateUser/" + os.stoid + "/" + getApp().globalData.user_id, {
+           success: function (src) {
+               var a = src.data.data;
+               if(!a.vipnopwd) {
+
+                   var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+                   my_confirm.open(
+                       "是否启用消费时密码验证？",
+                       "否",
+                       "是",
+                       function () {
+                           my_confirm.open_cancel(0);
+                       },
+                       function () {
+                           let url = '/pages/user/userinfo/userinfo?isstcsp=1';
+                           wx.redirectTo({url: url,})  //跳到非tabbar页
+                       }
+                   );
+               }
+
+           }
+         })
+     }
+
+
+
   },
-  // countDown: function () {
-  //   let that = this;
-  //   let countDownNum = that.data.countDownNum;//获取倒计时初始值
-  //   //如果将定时器设置在外面，那么用户就看不到countDownNum的数值动态变化，所以要把定时器存进data里面
-  //   that.setData({
-  //     timer: setInterval(function () {//这里把setInterval赋值给变量名为timer的变量
-  //       //每隔一秒countDownNum就减一，实现同步
-  //       countDownNum--;
-  //       //然后把countDownNum存进data，好让用户知道时间在倒计着
-  //       that.setData({
-  //         countDownNum: countDownNum
-  //       })
-  //       //在倒计时还未到0时，这中间可以做其他的事情，按项目需求来
-  //       if (countDownNum == 0) {
-  //         //这里特别要注意，计时器是始终一直在走的，如果你的时间为0，那么就要关掉定时器！不然相当耗性能
-  //         //因为timer是存在data里面的，所以在关掉时，也要在data里取出后再关闭
-  //         clearInterval(that.data.timer);
-  //         //关闭定时器之后，可作其他处理codes go here
-  //       //--跳到绑定页面-- 
-  //           wx.navigateTo({
-  //             url: '../../../integral/jf',
-  //              })
-  //       }
-  //     }, 500)
-  //   })
-   
+
+
   click:function(){
     wx.redirectTo({
       //url: '../../../integral/jf',
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "usingComponents": {
+    "my_confirm": "/components/my_confirm/my_confirm"
+  }
 }
 \ No newline at end of file
@@ -10,3 +10,4 @@
 <view class="hom-page"bindtap='homepage'>返回首页</view>
 </view>
 </view>
+<my_confirm id="my_confirm"></my_confirm>
 \ No newline at end of file
@@ -183,8 +183,8 @@ Page({
         var buynum = 1;
         console.log(money, "有进来吗预存劵", advancek, user_id, store_id );
-        var e = this,
-        perpaid = "";
+        var e = this, perpaid = "";
+        let th=this;
         await getApp().request.promiseGet("/api/weshop/users/getPay", {
           data: {
             account: money,
@@ -220,7 +220,7 @@ Page({
                 e.jumpPaymentPage();
             }, function (e) {
-                this.data.paying=0;
+                th.data.paying=0;
                 wx.showToast({
                     title: e,
                     icon: 'none',
@@ -248,10 +248,11 @@ Page({
           // })
         })    
       },
+
   //------支付成功页面--------
   jumpPaymentPage: function () {
     wx.redirectTo({
-      url:"msg/msg",
+      url:"msg/msg?is_nd_pw=1",
     });
   },
@@ -75,7 +75,8 @@ Page({
     canIUseGetUserProfile: false,
     getusercode_vailtime:10,//会员二维码时效
-    sele_ing:0
+    sele_ing:0,
+    set_isstcsp:0
   },
   //通过路径跳转到其他页面
@@ -654,6 +655,10 @@ Page({
         canIUseGetUserProfile: true
       })
     }
+    //如果有指定要启用密码的时候
+    if(t.isstcsp){
+        this.setData({set_isstcsp:1,ispwhid:0});
+    }
   },
@@ -797,6 +802,9 @@ Page({
           a.staffTel=choice_guide.Tel;
         }
+        if(e.data.set_isstcsp){
+            a.vipnopwd=1;
+        }
         e.setData({
           phone: a.mobile,
@@ -78,7 +78,7 @@
             <input bindblur="lose_focus" class="fs28 hion user-txt-right" value="{{consumption}}" password="true" type="number"/>
           </block>
           <block wx:else>
-            <input bindblur="lose_focus" class="fs28 hion user-txt-right" value="{{consumption}}"  type="number"/>
+            <input bindblur="lose_focus" focus="{{set_isstcsp?true:false}}"  class="fs28 hion user-txt-right" value="{{consumption}}"  type="number"/>
           </block>
           <block wx:if="{{ispwhid}}">