Commit a0079280a58be6d682ee12bb094789fac5ee4ae5
1 parent
21a2175d
天天拼团、和购物车优化
Showing
2 changed files
with
10 additions
and
10 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -1591,7 +1591,7 @@ Page({ | @@ -1591,7 +1591,7 @@ Page({ | ||
| 1591 | if (getApp().globalData.userInfo.is_distribut | 1591 | if (getApp().globalData.userInfo.is_distribut |
| 1592 | && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { | 1592 | && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { |
| 1593 | 1593 | ||
| 1594 | - var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num); | 1594 | + var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num,th); |
| 1595 | 1595 | ||
| 1596 | gd.use_commission = c_num; | 1596 | gd.use_commission = c_num; |
| 1597 | t.data.data.use_commission = c_num; | 1597 | t.data.data.use_commission = c_num; |
pages/activity/pind_list/pind_list.wxml
| @@ -29,13 +29,13 @@ | @@ -29,13 +29,13 @@ | ||
| 29 | 29 | ||
| 30 | <view class="kill-list"> | 30 | <view class="kill-list"> |
| 31 | <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide==1}}"> | 31 | <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide==1}}"> |
| 32 | - <navigator class="kill-pic " url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}"> | 32 | + <navigator class="kill-pic " url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}"> |
| 33 | <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}" | 33 | <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}" |
| 34 | data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image> | 34 | data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image> |
| 35 | 35 | ||
| 36 | </navigator> | 36 | </navigator> |
| 37 | <view class="kill-cont"> | 37 | <view class="kill-cont"> |
| 38 | - <navigator class="goods-name ellipsis-2" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}">{{item.title}}</navigator> | 38 | + <navigator class="goods-name ellipsis-2" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}">{{item.title}}</navigator> |
| 39 | <view class="flex"> | 39 | <view class="flex"> |
| 40 | <view class="tneirong red-b flex-vertical rel" wx:if="{{type==1}}"> | 40 | <view class="tneirong red-b flex-vertical rel" wx:if="{{type==1}}"> |
| 41 | <image class="xc-team-img abs" src="{{url}}/miniapp/images/fril.png"></image> | 41 | <image class="xc-team-img abs" src="{{url}}/miniapp/images/fril.png"></image> |
| @@ -74,15 +74,15 @@ | @@ -74,15 +74,15 @@ | ||
| 74 | 74 | ||
| 75 | </view> | 75 | </view> |
| 76 | <view class="kill-btn"> | 76 | <view class="kill-btn"> |
| 77 | - <navigator class="huise" style="background-color: #059de5;" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==1 }}">即将开始</navigator> | ||
| 78 | - <navigator class="huise" style="background-color: #059de5;" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==2 }}" >即将开始</navigator> | ||
| 79 | - <navigator class="huise" style="background-color: #059de5;" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==3 }}" >即将开始</navigator> | 77 | + <navigator class="huise" style="background-color: #059de5;" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==1 }}">即将开始</navigator> |
| 78 | + <navigator class="huise" style="background-color: #059de5;" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==2 }}" >即将开始</navigator> | ||
| 79 | + <navigator class="huise" style="background-color: #059de5;" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==3 }}" >即将开始</navigator> | ||
| 80 | 80 | ||
| 81 | - <navigator class="blue_b" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==1}}">去参团</navigator> | ||
| 82 | - <navigator url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==2}}">去开团</navigator> | ||
| 83 | - <navigator url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==3}}">去开团</navigator> | 81 | + <navigator class="blue_b" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==1}}">去参团</navigator> |
| 82 | + <navigator url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==2}}">去开团</navigator> | ||
| 83 | + <navigator url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==3}}">去开团</navigator> | ||
| 84 | 84 | ||
| 85 | - <navigator class="huise" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator> | 85 | + <navigator class="huise" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id+ '&prom_id=' + item.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator> |
| 86 | </view> | 86 | </view> |
| 87 | </view> | 87 | </view> |
| 88 | </view> | 88 | </view> |