好物推荐商品列表、商品分组商品列表幸运购商品判断

taiyuan
1 parent 303f2df7
Showing 3 changed files with 20 additions and 7 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/g_filter.wxs
components/goods_list/goods_list.wxml
@@ -15,7 +15,8 @@
 <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
        <block wx:for="{{goods_array}}" >
             <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
-                <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">
+							<navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
+                <!-- <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"> -->
                     <view class='zs_top rel'>
                         <block wx:if="{{object.big_order_type==3}}">
@@ -169,7 +170,7 @@
 <!--2个一列-->
 <block  wx:if="{{object.column==2}}">
   <block wx:for="{{goods_array}}" >
-    <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">
+    <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
         <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
@@ -328,7 +329,7 @@
 <block wx:if='{{object.column==3}}'>
    <view class="zwp_3">
     <block wx:for="{{goods_array}}" >
-        <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">
+        <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
             <view class="zs_goods_wai_san" >
                 <view class="zs_goods_san">
                     <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'>
@@ -485,7 +486,7 @@
 <!-- 列表显示 -->
 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
     <block wx:for="{{goods_array}}" >
-        <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">
+        <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
             <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
                 <view class='zs_top_x'>
                     <block wx:if="{{object.big_order_type==3}}">
@@ -668,7 +669,7 @@
     <view class="sp">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_id={{aitem.prom_id}}&&prom_type={{aitem.prom_type}}" style="width: 32%" >
+          <navigator url="{{g_filter.get_url_by_type(item)}}" style="width: 32%" >
             <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx">
               <view class='sp_top'>
                 <view class='s_img' style="position: relative; width: 100%">
@@ -88,6 +88,16 @@ var g_filters = {
 			     return min_name;
 		},
+	
+		get_url_by_type: function(item) {
+			var url = '';
+			if(item.prom_type == 9) {
+				url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
+			} else {
+				url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type;
+			};
+			return url;
+		},
 }
@@ -97,4 +107,5 @@ module.exports = {
    is_has_rank:g_filters.is_has_rank,
    get_card_price:g_filters.get_card_price,
    get_border_type:g_filters.get_border_type,
+	 get_url_by_type: g_filters.get_url_by_type,
 }
@@ -4,8 +4,9 @@
 <view class="collects">
   <view class="hang ">
     <!-- 商品详情 -->
-    <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}}">
-      <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">
+    <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)}}">
+      <!-- <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"> -->
+			<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">
         <!-- 商品图⽚ -->
         <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>
         <view class="bottom">