秒杀预热没有开始要参加优惠促销

yvan.ni
1 parent 13998654
Showing 4 changed files with 25 additions and 5 deletions
packageA/pages/distribution/goods/g_filter.wxs
packageA/pages/distribution/goods/goods.js
packageA/pages/distribution/goods/goods.wxml
pages/goods/goodsInfo/goodsInfo.js
@@ -62,8 +62,21 @@ 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==8){
+                		       url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
+                		    }
+                		    if(item.prom_type==1 && item.prom_id>0 ){
+                                url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
+                            }
+                		   return url1;
+                		}
 }
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
-	  get_card_price:g_filters.get_card_price,   
+	  get_card_price:g_filters.get_card_price,
+	   get_goods_url:g_filters.get_goods_url
 }
 \ No newline at end of file
@@ -510,6 +510,11 @@ Page({
 	 * promiseGet请求数据
 	 */
 	getData: function(isInit, url, data, isShowLoading) {
+
+		var user_id=getApp().globalData.user_id;
+		if(!user_id) user_id=0;
+		data.user_id=user_id;
+
 		return new Promise(function(resolve, reject) {
 			app.request.promiseGet(url, {
@@ -75,7 +75,7 @@
 				</label> -->
 				<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
-				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
+				<view class="flex pdl10" bindtap="goto" data-url="{{g_filter.get_goods_url(item)}}">
 					<view class="pdr20"><image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load/></view>
 					<view class="flex fdc jc_sb">
 						<view class="ellipsis-2">{{item.goods_name}}</view>
@@ -214,7 +214,7 @@
 		</checkbox-group>
 		<checkbox-group class="fs26 flex pd16 wrap"  catchchange="checkboxChange" wx:else>
-			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
+			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="{{g_filter.get_goods_url(item)}}">
 				<image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load/>
 				<view class="pd20 fs26 flex jc_sb fdc f1">
 					<view class="ellipsis-2">{{item.goods_name}}</view>
@@ -805,8 +805,9 @@ Page({
               ee.data.prom_id=t.data.data.prom_id;
           }
-         if(ee.data.prom_type!=1 && ee.data.prom_type!=4  && ee.data.prom_type!=6 && ee.data.prom_type!=2)
-              ee.check_is_youhui(ee.data.gid);
+         if(ee.data.prom_type!=1 && ee.data.prom_type!=4  && ee.data.prom_type!=6 && ee.data.prom_type!=2){
+             ee.check_is_youhui(ee.data.gid);
+         }
           t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
@@ -3124,6 +3125,7 @@ Page({
         this.get_sto();
         this.get_sku(o.stoid, this.data.data, gid);
         this.check_has_flash();
+        this.check_is_youhui(gid,1);
         return false;
     }