wxd / MShopWeApp

Commit 96fd916f2d463204f7d503b7b8f477e1daf6be56

Authored by yvan.ni
1 parent 039e8111

1. 如果读秒发现时间已经结束，要提示活动已经结束 

2. 组件选择了手动选择时，前端控制只显示手动选择的商品
3. 霸屏功能的优化
Inline Side-by-side
Showing 7 changed files with 88 additions and 77 deletions
components/diy_pingd_buy/diy_pingd_buy.js
  View file @96fd916
... ... @@ -84,12 +84,9 @@ Component({
84 84 //--调用接口,读取拼单--
85 85 app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id="
86 86 +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
87   -
88 87 //如果拼单的数组为空的时候
89 88 var goodslist=res.data.data;
90   - if(!goodslist || goodslist.length==0){
91   - th.no_gid_set();
92   - }else{
  89 + if(goodslist && goodslist.length>0){
93 90 th.set_goods_list(g_id,goodslist);
94 91 }
95 92  
... ... @@ -98,14 +95,15 @@ Component({
98 95 },
99 96  
100 97 no_gid_set(){
  98 + var th=this;
101 99 var url= "/api/weshop/teamlist/pageteam/2?page=1&pageSize=9";
102 100 getApp().request.promiseGet(url, {
103 101 data: {
104 102 store_id: os.stoid,is_end: 0,is_show: 1,
105 103 }
106 104 }).then(res => {
107   - if(res.data.code==0 && res.data.data.pageData && e.data.data.pageData.length>0){
108   - goodsidlist=res.data.data.pageData;
  105 + if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
  106 + var goodslist=res.data.data.pageData;
109 107 th.set_goods_list(null,goodslist);
110 108 }
111 109 })
... ... @@ -157,6 +155,8 @@ Component({
157 155 var ee = ob;
158 156 // 获取当前时间，同时得到活动结束时间数组
159 157 var newTime = ut.gettimestamp();
  158 + this.setData({newTime:newTime});
  159 +
160 160 var List = ee.data.goods_array;
161 161 if (List.length == 0) return false;
162 162 for (var j = 0; j < List.length; j++) {
... ...
components/diy_pingd_buy/diy_pingd_buy.wxml
  View file @96fd916
... ... @@ -21,11 +21,10 @@
21 21  
22 22 <block wx:if="{{aitem.start_time>newTime}}">
23 23 <span class='s_top_p' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
24   - </block>
25   - <block wx:if="{{aitem.start_time<newTime}}">
  24 + </block>
  25 + <block wx:if="{{aitem.start_time<newTime && aitem.end_time>newTime}}">
26 26 <span class='s_top_p'>火热进行</span>
27 27 </block>
28   -
29 28 <!-- <span class='s_top_p'>火热进行</span> -->
30 29  
31 30 <view class='s_img_p'>
... ... @@ -50,12 +49,17 @@
50 49 <!--<view class='sp_jgx_p'>￥{{aitem.market_price}}</view>-->
51 50  
52 51 <view class="tuan_set_num">
53   - <view class="co-red2">{{aitem.ct_num}}人团</view>
54   -
55   - <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去参团</view>
56   - <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
57   - <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
58   - <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="cantuan huise">已抢光</view>
  52 + <view class="co-red2">{{aitem.ct_num}}人团</view>
  53 + <!-- 判断有没有过期 -->
  54 + <block wx:if="{{aitem.end_time<=newTime}}">
  55 + <view class="cantuan huise">已结束</view>
  56 + </block>
  57 + <block wx:else>
  58 + <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去参团</view>
  59 + <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
  60 + <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="cantuan">去开团</view>
  61 + <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="cantuan huise">已抢光</view>
  62 + </block>
59 63 </view>
60 64 </view>
61 65 </view>
... ... @@ -89,16 +93,21 @@
89 93 <view class='sp_jg_p'>￥{{aitem.price}}</view>
90 94 <view class='sp_jgx_p'>￥{{aitem.market_price}}</view>
91 95 </view>
92   - <view class="o1_sj_p">
  96 + <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
93 97 <image class="time_img" src="/public/static/images/model/time.png"></image>
94   - <block wx:if="aitem.djs.day>0">{{aitem.djs.day}}天</block>{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
  98 + <block wx:if="{{aitem.djs.day>0 }}">{{aitem.djs.day}}天</block>{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
95 99 </view>
96   -
97   - <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
98   - <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去开团</view>
99   - <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
100   - <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="wo_p huise">已抢光</view>
101   -
  100 +
  101 + <!-- 判断有没有过期 -->
  102 + <block wx:if="{{aitem.end_time<=newTime}}">
  103 + <view class="wo_p huise">已结束</view>
  104 + </block>
  105 + <block wx:else>
  106 + <view wx:if="{{aitem.kttype==1 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
  107 + <view wx:if="{{aitem.kttype==2 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去开团</view>
  108 + <view wx:if="{{aitem.kttype==3 && aitem.goods_num>aitem.buy_num }}" class="wo_p">去参团</view>
  109 + <view wx:if="{{aitem.goods_num<=aitem.buy_num }}" class="wo_p huise">已抢光</view>
  110 + </block>
102 111 </view>
103 112 </view>
104 113 </navigator>
... ...
components/diy_pingd_buy/diy_pingd_buy.wxss
  View file @96fd916
... ... @@ -362,4 +362,5 @@ swiper {
362 362 display: flex;
363 363 align-items: center;
364 364 margin:5rpx 0rpx;
365   -}
366 365 \ No newline at end of file
  366 +}
  367 +.o1_right_p .wo_p.huise{ background-color: #eee;}
367 368 \ No newline at end of file
... ...
components/diy_seckill/diy_seckill.js
  View file @96fd916
... ... @@ -78,9 +78,7 @@ Component({
78 78 //如果秒杀的数组为空的时候
79 79 var goodslist=res.data.data;
80 80 //就算是添加的活动已经过期，就要用最新的进行中活动
81   - if(!goodslist || goodslist.length==0) {
82   - th.no_gid_set();
83   - }else{
  81 + if(goodslist && goodslist.length>0) {
84 82 th.set_goods_list(g_id,goodslist);
85 83 }
86 84 });
... ... @@ -151,6 +149,8 @@ Component({
151 149 var ee = ob;
152 150 // 获取当前时间，同时得到活动结束时间数组
153 151 var newTime = ut.gettimestamp();
  152 + this.setData({newTime:newTime});
  153 +
154 154 var List = ee.data.goods_array;
155 155 if (List.length == 0) return false;
156 156 for (var j = 0; j < List.length; j++) {
... ...
components/diy_seckill/diy_seckill.wxml
  View file @96fd916
... ... @@ -24,16 +24,26 @@
24 24 <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
25 25 </view>
26 26 </block>
27   - <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
28   - <view class="rob">
29   - <span class='s_top_kill'>火热进行</span>
30   - </view>
31   - </block>
32   - <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
33   - <view class="rob">
34   - <span class='s_top_kill gray'>已抢光</span>
35   - </view>
36   - </block>
  27 +
  28 + <block wx:if="{{aitem.end_time<=newTime}}">
  29 + <view class="rob">
  30 + <span class='s_top_kill gray'>活动已结束</span>
  31 + </view>
  32 + </block>
  33 + <block wx:else>
  34 + <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
  35 + <view class="rob">
  36 + <span class='s_top_kill'>火热进行</span>
  37 + </view>
  38 + </block>
  39 + <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
  40 + <view class="rob">
  41 + <span class='s_top_kill gray'>已抢光</span>
  42 + </view>
  43 + </block>
  44 + </block>
  45 +
  46 +
37 47  
38 48 <view class='clear'></view>
39 49  
... ... @@ -92,17 +102,25 @@
92 102 <view class="wo" style="background-color: #adadad">正在预热</view>
93 103 </view>
94 104 </block>
95   - <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
96   - <view class="rob">
97   - <view class="wo">我要抢</view>
98   - </view>
99   - </block>
100   -
101   - <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
102   - <view class="rob">
103   - <view class="wo" style="background-color: #adadad">已抢光</view>
104   - </view>
105   - </block>
  105 +
  106 + <block wx:if="{{aitem.end_time<newTime}}">
  107 + <view class="rob">
  108 + <view class="wo" style="background-color: #adadad">已结束</view>
  109 + </view>
  110 + </block>
  111 + <block wx:else>
  112 + <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
  113 + <view class="rob">
  114 + <view class="wo">我要抢</view>
  115 + </view>
  116 + </block>
  117 +
  118 + <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
  119 + <view class="rob">
  120 + <view class="wo" style="background-color: #adadad">已抢光</view>
  121 + </view>
  122 + </block>
  123 + </block>
106 124  
107 125  
108 126 </view>
... ...
components/full_screen/full_screen.js
  View file @96fd916
... ... @@ -15,36 +15,13 @@ Component({
15 15 },
16 16  
17 17 pageLifetimes:{
18   - //要处理一下，游客登录后的界面的变化,主要还该是改变会员
19   - show: function () {
20   - var th=this;
21   - th.setData({sec_show:3});
22   - //--如果有全屏广告的时候--
23   - if(this.data.is_full_screen_show){
24   - //--定时关闭--
25   - th.data.full_screen=setInterval(function(){
26   - if(!th.data.sec_show) {
27   - clearInterval(th.data.full_screen);
28   - th.close_full_screen();
29   - return false;
30   - }
31   - th.data.sec_show--;
32   - th.setData({sec_show:th.data.sec_show});
33   - },1000)
34   - }
35   - },
36 18 hide: function() {
37 19 // 页面被隐藏
38 20 clearInterval(this.data.full_screen);
39 21 },
40 22 },
41 23  
42   - properties: {
43   -
44   - },
45   - ready: function () {
46   - this.get_the_full_screen();
47   - },
  24 + properties: {},
48 25 methods: {
49 26 close_full_screen(){
50 27 this.setData({is_full_screen_show:0,sec_show:0,is_full_screen_men:0});
... ... @@ -57,6 +34,7 @@ Component({
57 34 this.setData({is_full_screen_show:0,is_full_screen_men:0});
58 35 },
59 36 get_the_full_screen(){
  37 + if(this.data.full_ad) return false;
60 38 var th=this;
61 39 //获取全屏的广告
62 40 getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
... ...
pages/index/index/index.js
  View file @96fd916
... ... @@ -206,10 +206,7 @@ Page({
206 206 }
207 207 })
208 208  
209   -
210   -
211   -
212   -
  209 +
213 210 },
214 211 //关闭新用户领取广告
215 212 close_disgraceful: function() {
... ... @@ -229,7 +226,15 @@ Page({
229 226 getApp().requestCardNum(this);
230 227 }
231 228  
232   - var th = this
  229 + var th = this
  230 + var show=getApp().globalData.isLoad_ad;
  231 + if(show){
  232 + var full_screen = this.selectComponent("#full_screen"); //组件的id
  233 + full_screen.get_the_full_screen();
  234 + }else{
  235 + getApp().globalData.isLoad_ad=1;
  236 + }
  237 +
233 238 },
234 239 //当隐藏的时候就关闭计时器
235 240 onHide: function() {
... ...