Commit 0c0278aee2fe66d4616119ffb1e629d4ee14ad1c
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
3 changed files
with
55 additions
and
53 deletions
packageC/pages/group_list/group_list.js
@@ -64,47 +64,44 @@ Page({ | @@ -64,47 +64,44 @@ Page({ | ||
64 | * 生命周期函数--监听页面显示 | 64 | * 生命周期函数--监听页面显示 |
65 | */ | 65 | */ |
66 | onShow: function () { | 66 | onShow: function () { |
67 | - getApp().check_can_share(); | ||
68 | - if(app.globalData.userInfo) { | ||
69 | - if(!this.data.isLogin) { | ||
70 | - this.setData({ | ||
71 | - userInfo: app.globalData.userInfo, | ||
72 | - imghost: app.globalData.setting.imghost, | ||
73 | - isLogin: true, | ||
74 | - }); | ||
75 | - | ||
76 | - let typeVal = this.data.type; | ||
77 | - let url = '/api/weshop/goods/groupBuy/page'; | ||
78 | - let data = { | ||
79 | - store_id: app.globalData.setting.stoid, | ||
80 | - is_show: 1, | ||
81 | - is_end: 0, | ||
82 | - timetype: typeVal | ||
83 | - }; | ||
84 | - | ||
85 | - this.setData({ | ||
86 | - list: [], | ||
87 | - pageNum: 1, | ||
88 | - noMore: false, | ||
89 | - }); | ||
90 | - | ||
91 | - this.getData(true, url, data).then(function() { | ||
92 | - self.setData({ | ||
93 | - currentData: data, | ||
94 | - }); | ||
95 | - }); | ||
96 | - | ||
97 | - this.data.is_timer = 1; | 67 | + getApp().check_can_share(this); |
68 | + | ||
69 | + var user=app.globalData.userInfo; | ||
70 | + this.setData({ | ||
71 | + userInfo: user, | ||
72 | + imghost: app.globalData.setting.imghost, | ||
73 | + isLogin: true, | ||
74 | + }); | ||
98 | 75 | ||
76 | + let typeVal = this.data.type; | ||
77 | + let url = '/api/weshop/goods/groupBuy/page'; | ||
78 | + let data = { | ||
79 | + store_id: app.globalData.setting.stoid, | ||
80 | + is_show: 1, | ||
81 | + is_end: 0, | ||
82 | + timetype: typeVal | ||
99 | }; | 83 | }; |
100 | - | 84 | + |
85 | + this.setData({ | ||
86 | + list: [], | ||
87 | + pageNum: 1, | ||
88 | + noMore: false, | ||
89 | + }); | ||
90 | + | ||
91 | + this.getData(true, url, data).then(function() { | ||
92 | + self.setData({ | ||
93 | + currentData: data, | ||
94 | + }); | ||
95 | + }); | ||
96 | + this.data.is_timer = 1; | ||
97 | + | ||
101 | //设置全局定时器 | 98 | //设置全局定时器 |
102 | clearInterval(this.data.timer); | 99 | clearInterval(this.data.timer); |
103 | this.data.timer = setInterval(function () { | 100 | this.data.timer = setInterval(function () { |
104 | self.countDown(); | 101 | self.countDown(); |
105 | }, 1000); | 102 | }, 1000); |
106 | 103 | ||
107 | - }; | 104 | + |
108 | 105 | ||
109 | }, | 106 | }, |
110 | 107 |
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
@@ -31,19 +31,21 @@ Page({ | @@ -31,19 +31,21 @@ Page({ | ||
31 | }) | 31 | }) |
32 | }; | 32 | }; |
33 | 33 | ||
34 | - app.isLogin().then(function(data) { | ||
35 | - self.setData({ | ||
36 | - userInfo: data, | ||
37 | - }); | ||
38 | - }); | 34 | + // app.isLogin().then(function(data) { |
35 | + // self.setData({ | ||
36 | + // userInfo: data, | ||
37 | + // }); | ||
38 | + // }); | ||
39 | }, | 39 | }, |
40 | 40 | ||
41 | onShow: function() { | 41 | onShow: function() { |
42 | getApp().check_can_share(); | 42 | getApp().check_can_share(); |
43 | - if(app.globalData.userInfo) { | ||
44 | - if(!this.data.isLogin) { | 43 | + // if(app.globalData.userInfo) { |
44 | + // if(!this.data.isLogin) { | ||
45 | + | ||
46 | + var user=app.globalData.userInfo; | ||
45 | this.setData({ | 47 | this.setData({ |
46 | - userInfo: app.globalData.userInfo, | 48 | + userInfo:user , |
47 | imghost: app.globalData.setting.imghost, | 49 | imghost: app.globalData.setting.imghost, |
48 | isLogin: true, | 50 | isLogin: true, |
49 | }); | 51 | }); |
@@ -71,8 +73,8 @@ Page({ | @@ -71,8 +73,8 @@ Page({ | ||
71 | }); | 73 | }); |
72 | 74 | ||
73 | 75 | ||
74 | - }; | ||
75 | - }; | 76 | + // }; |
77 | + // }; | ||
76 | }, | 78 | }, |
77 | 79 | ||
78 | 80 |
packageC/pages/presell/list/list.js
@@ -82,16 +82,19 @@ Page({ | @@ -82,16 +82,19 @@ Page({ | ||
82 | 82 | ||
83 | }, | 83 | }, |
84 | onShow: function (t) { | 84 | onShow: function (t) { |
85 | - var userInfo=getApp().globalData.userInfo; | ||
86 | - if(userInfo && this.data.goodlist.length==0){ | ||
87 | - //调用列表 | ||
88 | - this.get_list(); | ||
89 | - }else{ | ||
90 | - if(getApp().globalData.pre_back==1){ | ||
91 | - getApp().globalData.pre_back=0; | ||
92 | - getApp().goto("/pages/index/index/index"); | ||
93 | - } | ||
94 | - } | 85 | + // var userInfo=getApp().globalData.userInfo; |
86 | + // if(userInfo && this.data.goodlist.length==0){ | ||
87 | + // //调用列表 | ||
88 | + // this.get_list(); | ||
89 | + // }else{ | ||
90 | + // if(getApp().globalData.pre_back==1){ | ||
91 | + // getApp().globalData.pre_back=0; | ||
92 | + // getApp().goto("/pages/index/index/index"); | ||
93 | + // } | ||
94 | + // } | ||
95 | + | ||
96 | + this.get_list(); | ||
97 | + | ||
95 | }, | 98 | }, |
96 | //---小于10的格式化函数---- | 99 | //---小于10的格式化函数---- |
97 | timeFormat(param) { | 100 | timeFormat(param) { |