OA单提交

WXD-SEASON\season
1 parent a27273ed
Showing 3 changed files with 21 additions and 10 deletions
packageD/pages/user/coupons/filter.wxs
pages/user/index/index.js
pages/user/userinfo/userinfo.js
@@ -39,11 +39,11 @@ var numFr = {
 				break;
 			};
 			case 1: {
-				return '已过从我的专享礼包，期';
+				return '从我的专享礼包获取';
 				break;
       };
       case 2: {
-				return '从我的幸运大转盘，';
+				return '从我的幸运大转盘获取，';
 				break;
 			};
 			default: {
@@ -43,8 +43,8 @@ Page({
 		actImg: "",
 		is_assistance: 0, //助力活动
 		ad_img: "",
-		add_card_data: '',  //等级卡的内容
-
+    add_card_data: '',  //等级卡的内容
+    getusercode_vailtime:10,//会员二维码时效
 		hiddenCS: true,
 	},
 	goto_nav: function (e) {
@@ -395,8 +395,13 @@ Page({
 					th.setData({ sys_switch: t_swi });
 					var user_tool = [];
 					if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool);
-					th.setData({ c_list: user_tool })
-				}
+          th.setData({ c_list: user_tool });
+          if (t_swi.usercode_vailtime!=null && parseInt(t_swi.usercode_vailtime)>0)                              
+          {
+            th.setData({ getusercode_vailtime: t_swi.usercode_vailtime });
+          }
+        }
+        
 				if (parseInt(t_swi.rank_switch) == 2) {
 					var userInfo = th.data.userInfo;
 					if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") {
@@ -483,9 +488,10 @@ Page({
 	//------卡片的显示和关闭--------
 	show_tc: function () {
-		if (!this.data.userInfo) return false;
+    if (!this.data.userInfo) return false;
+
 		//base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-		var val = this.data.userInfo.mobile + "|" + ut.formatTime();
+		var val = this.data.userInfo.mobile + "|" + ut.formatTime()+"|"+this.data.getusercode_vailtime;
 		val = "^" + ut.base64_encode(val);
 		qrcode('qrcode', val, 480, 480, this);
@@ -73,6 +73,7 @@ Page({
     userInfo: {},
     hasUserInfo: false,
     canIUseGetUserProfile: false,
+    getusercode_vailtime:10,//会员二维码时效
   },
   //通过路径跳转到其他页面
@@ -91,8 +92,12 @@ Page({
         rank_switch:sms_conf.rank_switch,
         is_lable_set: sms_conf.user_label_set,  //是不是会员标签设置
         guide_title:sms_conf.guide_consultant,  //系统参数  导购标题
-        guide_change_time:sms_conf.guide_change_time     //每月能修改几次
+        guide_change_time:sms_conf.guide_change_time,     //每月能修改几次        
       })
+      if (sms_conf.usercode_vailtime!=null && parseInt(sms_conf.usercode_vailtime)>0)                              
+      {
+        th.setData({ getusercode_vailtime: sms_conf.usercode_vailtime });
+      }
       if (sms_conf.user_label_set) {
         th.query_checklabels();
       }
@@ -858,7 +863,7 @@ Page({
   show_tc: function() {
     if (!getApp().globalData.userInfo) return false;
     //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-    var val=getApp().globalData.userInfo.mobile+"|"+ut.formatTime();
+    var val=getApp().globalData.userInfo.mobile+"|"+ut.formatTime()+"|"+this.data.getusercode_vailtime;
     val="^"+ut.base64_encode(val);
     qrcode('qrcode', val, 480, 480, this);