Merge branch 'test' into 'qa'

Test See merge request !906

Merge branch 'test' into 'qa'
Test See merge request !906
后端研发-苏明海
2 parents bf6d3dba b031af4b
Showing 5 changed files with 33 additions and 3 deletions
components/diy_goodsGroup/g_filter.wxs
components/goods_list/g_filter.wxs
components/goods_list/goods_list.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/g_filter.wxs
@@ -93,7 +93,11 @@ var g_filters = {
 			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 {
+			}
+			else if(item.prom_type==8){
+                   url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_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;
@@ -107,5 +111,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,
+   get_url_by_type: g_filters.get_url_by_type,
 }
@@ -62,8 +62,24 @@ var g_filters = {
 				 if(min_name.length>4 )	min_name=min_name.substring(0, 8);	 
 			     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 if(item.prom_type==8){
+                           url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_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;
+        		},
+
 }
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
 	  get_card_price:g_filters.get_card_price,   
+	  get_url_by_type:g_filters.get_url_by_type,
 }
 \ No newline at end of file
@@ -4,7 +4,9 @@
 <view class="collects">
   <view class="hang ">
     <!-- 商品详情 -->
-    <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)}}">
+
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{get_url_by_type(item)}}">
+    <!--<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">
         <!-- 商品图⽚ -->
@@ -2369,6 +2369,8 @@ Page({
     });
+
+
     that.check_is_youhui(gid, that.data.is_normal);
     this.get_sto(that.data.is_normal);
@@ -3125,6 +3127,7 @@ Page({
         this.get_sto();
         this.get_sku(o.stoid, this.data.data, gid);
         this.check_has_flash();
+        this.data.is_normal=1;
         this.check_is_youhui(gid,1);
         return false;
     }
@@ -79,9 +79,14 @@ var g_filters = {
 				 if(min_name.length>4)	min_name=min_name.substring(0, 8);
 			     return min_name;
 		},
+
 		//跳转的接口
         		get_goods_url:function(item){
         		   var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
+
+        		   if(item.prom_type == 9) {
+                   		url1 = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
+                   }
         		   if(item.prom_type==8){
         		       url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
         		    }