wxd / MShopWeApp

Commit 7d555a8348a98ceff5f6c79fb2f74413637c67b7

Authored by WXD-SEASON\season
2 parents 83ba8ef6 85af1aa1

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
packageE/pages/cart/cart2/cart2.js
  View file @7d555a8
... ... @@ -847,7 +847,7 @@ Page({
847 847 }
848 848 })
849 849 if (!isok) {
850   - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  850 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
851 851 getApp().request.delete(url, {});
852 852 th.data.ladder_map[item1.prom_id] = -1;
853 853 continue;
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @7d555a8
... ... @@ -7775,6 +7775,11 @@ Page({
7775 7775 //找不到活动要剔除
7776 7776 if (!item.act_name) continue;
7777 7777 if ([1,2,4,6].indexOf(item.prom_type)==-1) continue;
  7778 +
  7779 + var s_time=item.warm_uptime;
  7780 + if(!s_time) item.s_time;
  7781 + if(s_time>ut.gettimestamp()) continue;
  7782 +
7778 7783 new_arr.push(item);
7779 7784 }
7780 7785  
... ...