Commit a26f707539e6937e1a1002fad6838b55651d48ab
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
11 additions
and
26 deletions
packageB/pages/zuhegou/preindex/index.js
| ... | ... | @@ -179,6 +179,7 @@ Page({ |
| 179 | 179 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + th.data.id + "/" + userInfo.user_id; |
| 180 | 180 | getApp().request.get(url, { |
| 181 | 181 | success: function (e) { |
| 182 | + | |
| 182 | 183 | th.data.is_get_act = 1; |
| 183 | 184 | if (e.data.code == 0 && e.data.data) { |
| 184 | 185 | self.setData({ |
| ... | ... | @@ -190,12 +191,12 @@ Page({ |
| 190 | 191 | }); |
| 191 | 192 | return false; |
| 192 | 193 | } |
| 193 | - if (ut.gettimestamp() < e.data.data.start_time) { | |
| 194 | - th.setData({ | |
| 195 | - error: '活动还未开始' | |
| 196 | - }); | |
| 197 | - return false; | |
| 198 | - } | |
| 194 | + // if (ut.gettimestamp() < e.data.data.start_time) { | |
| 195 | + // th.setData({ | |
| 196 | + // error: '活动还未开始' | |
| 197 | + // }); | |
| 198 | + // return false; | |
| 199 | + // } | |
| 199 | 200 | if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) { |
| 200 | 201 | //-- 获取商品列表 -- |
| 201 | 202 | self.get_list(); |
| ... | ... | @@ -823,7 +824,7 @@ Page({ |
| 823 | 824 | if (!this.data.is_timer) return false; |
| 824 | 825 | var th = this; |
| 825 | 826 | // 获取当前时间，同时得到活动结束时间数组 |
| 826 | - var endTime = this.data.act.end_time; | |
| 827 | + var endTime = this.data.act.start_time; | |
| 827 | 828 | var newTime = ut.gettimestamp(); |
| 828 | 829 | // 对结束时间进行处理渲染到页面 |
| 829 | 830 | var obj = null; | ... | ... |
packageB/pages/zuhegou/preindex/index.wxml
| ... | ... | @@ -16,14 +16,7 @@ |
| 16 | 16 | </view> |
| 17 | 17 | |
| 18 | 18 | |
| 19 | - <view class="c_w mt20 fs32">门店: | |
| 20 | - <block wx:if="{{def_pick_store}}"> | |
| 21 | - <text wx:if="{{all_price>0}}">{{def_pick_store.pickup_name}}</text> | |
| 22 | - <text wx:else bindtap="choose_store">{{def_pick_store.pickup_name}}</text> | |
| 23 | - </block> | |
| 24 | - | |
| 25 | - <text wx:else bindtap="choose_store" >请选择门店</text> | |
| 26 | - </view> | |
| 19 | + | |
| 27 | 20 | |
| 28 | 21 | <!-- 商品列表 --> |
| 29 | 22 | <view class="list-container"> |
| ... | ... | @@ -58,10 +51,7 @@ |
| 58 | 51 | </block> |
| 59 | 52 | <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text> |
| 60 | 53 | </view> |
| 61 | - <view class="c-red pdr10 {{item.haveAdded ? 'active':''}}" catchtap="addToCart" | |
| 62 | - data-index="{{index}}"> | |
| 63 | - <text class="iconfont icon-gouwuche fs60"></text> | |
| 64 | - </view> | |
| 54 | + | |
| 65 | 55 | </view> |
| 66 | 56 | </view> |
| 67 | 57 | </view> |
| ... | ... | @@ -89,13 +79,7 @@ |
| 89 | 79 | 买{{act.zhbuyqty}}件，下单立享【{{act.zhprice}}元任选{{act.zhbuyqty}}件】 |
| 90 | 80 | </view> |
| 91 | 81 | </block> |
| 92 | - <view class="flex jc_sb ai_c pd20"> | |
| 93 | - <view class="fs30">合计： | |
| 94 | - <text class="rmb c-red fs40">{{filters.toFix(all_price,2)}}</text> | |
| 95 | - <text class="iconfont icon-info cb fs24 mgl10" bindtap="showInfo"></text> | |
| 96 | - </view> | |
| 97 | - <view bindtap="go_cart" class="btn-container">去购物车</view> | |
| 98 | - </view> | |
| 82 | + | |
| 99 | 83 | </view> |
| 100 | 84 | <!-- 分享 --> |
| 101 | 85 | <view wx:if="{{imgDraw}}" class="share-container" bindtap="share"> | ... | ... |