Commit a31f29411fa4a8611e240708ab51db17c1fe143d

Authored by 后端研发-倪永富
1 parent b79b3968

等级卡显示的优化,在会员解绑的情况下,同时修改绑定时的bug

components/goods_list/goods_list.js
@@ -32,29 +32,31 @@ Component({ @@ -32,29 +32,31 @@ Component({
32 var sw_arr = JSON.parse(swithc_list); 32 var sw_arr = JSON.parse(swithc_list);
33 //---如果后台又开等级卡的开关--- 33 //---如果后台又开等级卡的开关---
34 if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { 34 if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
35 - th.setData({ rank_switch: true });  
36 - var user = getApp().globalData.userInfo;  
37 - var ti = setInterval(function () {  
38 - if (!user) return false;  
39 - clearInterval(ti); 35 + th.setData({ rank_switch: true });
40 //---回调卡的列表--- 36 //---回调卡的列表---
41 th.getPlusCardType(function (ob) { 37 th.getPlusCardType(function (ob) {
42 - th.setData({ card_list: ob.card_list });  
43 - if (user.card_field) {  
44 - var str = user['card_expiredate'].replace(/-/g, '/');  
45 - var end = new Date(str);  
46 - end = Date.parse(end) / 1000;  
47 - var now = ut.gettimestamp(); 38 + th.setData({ card_list: ob.card_list });
  39 + var ti = setInterval(function () {
  40 + var user = getApp().globalData.userInfo;
  41 + if (!user) return false;
  42 + clearInterval(ti);
48 43
49 - //--- 判断是等级会员,且在有效期范围内 ---  
50 - if (user.card_field && now < end) {  
51 - var card_name = ob.name_map.get(user.card_field);  
52 - if (card_name.length > 4) card_name = card_name.substring(0, 4);  
53 - th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });  
54 - }  
55 - } 44 + if (user.card_field) {
  45 + var str = user['card_expiredate'].replace(/-/g, '/');
  46 + var end = new Date(str);
  47 + end = Date.parse(end) / 1000;
  48 + var now = ut.gettimestamp();
  49 +
  50 + //--- 判断是等级会员,且在有效期范围内 ---
  51 + if (user.card_field && now < end) {
  52 + var card_name = ob.name_map.get(user.card_field);
  53 + if (card_name.length > 4) card_name = card_name.substring(0, 4);
  54 + th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });
  55 + }
  56 + }
  57 + }, 500)
56 }) 58 })
57 - }, 500) 59 +
58 } 60 }
59 }) 61 })
60 } 62 }
pages/getphone/getphone.js
@@ -15,9 +15,13 @@ Page({ @@ -15,9 +15,13 @@ Page({
15 var th=this,app = getApp(); 15 var th=this,app = getApp();
16 var sessionKey = getApp().globalData.sessionKey; 16 var sessionKey = getApp().globalData.sessionKey;
17 var openid = getApp().globalData.openid; 17 var openid = getApp().globalData.openid;
  18 +
  19 + if (openid == "" || openid == null) {
  20 + openid = getApp().globalData.userInfo.weapp_openid;
  21 + }
18 22
19 if(openid=="" || openid==null ){ 23 if(openid=="" || openid==null ){
20 - getApp().globalData.user_id=null; 24 + getApp().globalData.user_id=null;
21 getApp().globalData.userInfo=null; 25 getApp().globalData.userInfo=null;
22 console.log("openid"); 26 console.log("openid");
23 wx.navigateTo({ url: '/pages/togoin/togoin', }) 27 wx.navigateTo({ url: '/pages/togoin/togoin', })
pages/goods/goodsInfo/goodsInfo.js
@@ -235,6 +235,9 @@ Page({ @@ -235,6 +235,9 @@ Page({
235 235
236 //------初始化加载---------- 236 //------初始化加载----------
237 onLoad: function(t) { 237 onLoad: function(t) {
  238 +
  239 +
  240 +
238 wx.setNavigationBarTitle({ 241 wx.setNavigationBarTitle({
239 title: "商品详情", 242 title: "商品详情",
240 }) 243 })
@@ -293,30 +296,34 @@ Page({ @@ -293,30 +296,34 @@ Page({
293 //---如果后台又开等级卡的开关--- 296 //---如果后台又开等级卡的开关---
294 if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){ 297 if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){
295 th.setData({rank_switch:true}); 298 th.setData({rank_switch:true});
296 - var user=getApp().globalData.userInfo;  
297 - var ti=setInterval(function(){  
298 - if(!user) return false;  
299 - clearInterval(ti); 299 +
300 //---回调卡的列表--- 300 //---回调卡的列表---
301 th.getPlusCardType(function(ob){ 301 th.getPlusCardType(function(ob){
302 - th.setData({card_list:ob.card_list});  
303 - if(user.card_field ){  
304 - var str = user['card_expiredate'].replace(/-/g, '/');  
305 - var end = new Date(str);  
306 - end = Date.parse(end) / 1000;  
307 - var now = ut.gettimestamp();  
308 - //--- 判断是等级会员,且在有效期范围内 ---  
309 - if(user.card_field && now<end){  
310 - var card_name=ob.name_map.get(user.card_field);  
311 - if(card_name.length>5) card_name=card_name.substring(0,5);  
312 -  
313 - var is_near_date=0;  
314 - if(end-now<60*60*30*24) is_near_date=1; //如果小于30天  
315 - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});  
316 - }  
317 - } 302 + th.setData({card_list:ob.card_list});
  303 + var ti = setInterval(function () {
  304 + var user = getApp().globalData.userInfo;
  305 + if (!user) return false;
  306 + clearInterval(ti);
  307 +
  308 +
  309 + if(user.card_field ){
  310 + var str = user['card_expiredate'].replace(/-/g, '/');
  311 + var end = new Date(str);
  312 + end = Date.parse(end) / 1000;
  313 + var now = ut.gettimestamp();
  314 + //--- 判断是等级会员,且在有效期范围内 ---
  315 + if(user.card_field && now<end){
  316 + var card_name=ob.name_map.get(user.card_field);
  317 + if(card_name.length>5) card_name=card_name.substring(0,5);
  318 +
  319 + var is_near_date=0;
  320 + if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
  321 + th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});
  322 + }
  323 + }
  324 + }, 500)
318 }) 325 })
319 - },500) 326 +
320 } 327 }
321 328
322 }); 329 });