Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 287ec49a dc197526
Showing 7 changed files with 20 additions and 18 deletions
components/diy_seckill/diy_seckill.js
components/userqy_pop_up/userqy_pop_up.js
packageB/pages/zuhegou/index/index.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsList/g_filter.wxs
pages/goods/search/g_filter.wxs
pages/index/index/index.wxml
@@ -132,7 +132,7 @@ Component({
       }
       for(let i in all_array){
-      	let item=data[i];
+      	let item=all_array[i];
       	if(item.user_price) item.price=item.user_price;
       }
@@ -28,9 +28,4 @@ Component({
     },
   },
-  
-
- 
-  
-  
 })
 \ No newline at end of file
@@ -2004,7 +2004,7 @@ Page({
                     await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
                         data: {
                             store_id: os.stoid,
-                            user_id: user_id,
+                            user_id: oo.user_id,
                             goods_id: item_j.goods_id,
                             prom_type: 7,
                             prom_id: th.data.act.id
@@ -392,7 +392,9 @@
               <view class="goods-num" wx:if="{{prom_type==1}}">
                 <block wx:if="prom_st>0">
                   <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
-                  <view class="stock">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:else>限购:不限</view>
+
                   <block wx:if="{{prom_st==0}}">
                     <view class="sales">已购:0件</view>
                   </block>
@@ -402,7 +404,8 @@
                 </block>
                 <block wx:else>
                   <view class="stock">总数量：{{prom_act.goods_num}}件</view>
-                  <view class="stock">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:else>限购:不限</view>
                   <view class="sales">已购:{{prom_act.buy_num}}件</view>
                 </block>
               </view>
@@ -81,12 +81,13 @@ var g_filters = {
 		},
 		//跳转的接口
         		get_goods_url:function(item){
-
-        		   console.log(item,111)
         		   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
-        		   }
+        		       url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
+        		    }
+        		    if(item.prom_type==1){
+                        url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
+                    }
         		   return url1;
         		}
 }
@@ -83,11 +83,14 @@ var g_filters = {
         		get_goods_url:function(item){
-        		   console.log(item,111)
+
         		   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){
+                       url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
+                   }
         		   return url1;
         		}
 }
@@ -153,9 +153,9 @@
 			</view>
 		</navigator>
 		<view class="seckill-list">
-			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="105rpx">
-				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="750rpx !important;">
-					<navigator class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}&prom_type=1&prom_id={{aitem.id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
+			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange">
+				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="740rpx !important;padding: 0; margin-left: 10rpx">
+					<navigator style="flex-shrink: 0;width: 247rpx" class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}&prom_type=1&prom_id={{aitem.id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
 						<view class="imgview ">
 							<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
@@ -163,7 +163,7 @@
 							<image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
 							<image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
 						</view>
-						<view class="ellipsis-2 mar-top10" style="height: 70rpx;">{{aitem.goods_name}}</view>
+						<view class="ellipsis-2 mar-top10" style="height: 76rpx;">{{aitem.goods_name}}</view>
 						<!-- <view class="red-co mar-top10 is_seckill_height"> -->
 						<view class="co-red mar-top10">
 							<text class="fs20">￥</text>{{aitem.price}}