Commit 7b62f09ce44e9661beeb0559f923f118a20ab2ac
1 parent
303f2df7
好物推荐商品列表、商品分组商品列表幸运购商品判断
Showing
3 changed files
with
20 additions
and
7 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
... | ... | @@ -15,7 +15,8 @@ |
15 | 15 | <view class="zs_goods_wai" wx:if='{{object.column==1}}'> |
16 | 16 | <block wx:for="{{goods_array}}" > |
17 | 17 | <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'> |
18 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> | |
18 | + <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | |
19 | + <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> --> | |
19 | 20 | <view class='zs_top rel'> |
20 | 21 | |
21 | 22 | <block wx:if="{{object.big_order_type==3}}"> |
... | ... | @@ -169,7 +170,7 @@ |
169 | 170 | <!--2个一列--> |
170 | 171 | <block wx:if="{{object.column==2}}"> |
171 | 172 | <block wx:for="{{goods_array}}" > |
172 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> | |
173 | + <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | |
173 | 174 | <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}"> |
174 | 175 | <view class="zs_goods_ban"> |
175 | 176 | <view class='zs_goods_2l'> |
... | ... | @@ -328,7 +329,7 @@ |
328 | 329 | <block wx:if='{{object.column==3}}'> |
329 | 330 | <view class="zwp_3"> |
330 | 331 | <block wx:for="{{goods_array}}" > |
331 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> | |
332 | + <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | |
332 | 333 | <view class="zs_goods_wai_san" > |
333 | 334 | <view class="zs_goods_san"> |
334 | 335 | <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'> |
... | ... | @@ -485,7 +486,7 @@ |
485 | 486 | <!-- 列表显示 --> |
486 | 487 | <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'> |
487 | 488 | <block wx:for="{{goods_array}}" > |
488 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> | |
489 | + <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | |
489 | 490 | <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > |
490 | 491 | <view class='zs_top_x'> |
491 | 492 | <block wx:if="{{object.big_order_type==3}}"> |
... | ... | @@ -668,7 +669,7 @@ |
668 | 669 | <view class="sp"> |
669 | 670 | <swiper-item class="s_it" wx:for="{{goods_array}}"> |
670 | 671 | <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> |
671 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_id={{aitem.prom_id}}&&prom_type={{aitem.prom_type}}" style="width: 32%" > | |
672 | + <navigator url="{{g_filter.get_url_by_type(item)}}" style="width: 32%" > | |
672 | 673 | <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx"> |
673 | 674 | <view class='sp_top'> |
674 | 675 | <view class='s_img' style="position: relative; width: 100%"> | ... | ... |
components/diy_goodsGroup/g_filter.wxs
... | ... | @@ -88,6 +88,16 @@ var g_filters = { |
88 | 88 | return min_name; |
89 | 89 | }, |
90 | 90 | |
91 | + | |
92 | + get_url_by_type: function(item) { | |
93 | + var url = ''; | |
94 | + if(item.prom_type == 9) { | |
95 | + url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; | |
96 | + } else { | |
97 | + url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type; | |
98 | + }; | |
99 | + return url; | |
100 | + }, | |
91 | 101 | |
92 | 102 | } |
93 | 103 | |
... | ... | @@ -97,4 +107,5 @@ module.exports = { |
97 | 107 | is_has_rank:g_filters.is_has_rank, |
98 | 108 | get_card_price:g_filters.get_card_price, |
99 | 109 | get_border_type:g_filters.get_border_type, |
110 | + get_url_by_type: g_filters.get_url_by_type, | |
100 | 111 | } | ... | ... |
components/goods_list/goods_list.wxml
... | ... | @@ -4,8 +4,9 @@ |
4 | 4 | <view class="collects"> |
5 | 5 | <view class="hang "> |
6 | 6 | <!-- 商品详情 --> |
7 | - <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}"> | |
8 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> | |
7 | + <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}"> | |
8 | + <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> --> | |
9 | + <navigator url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}" hover-class="none"> | |
9 | 10 | <!-- 商品图⽚ --> |
10 | 11 | <image class="sp" src="{{url+item.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image> |
11 | 12 | <view class="bottom"> | ... | ... |