Merge branch 'dev' into 'test'

秒杀测试返回的bug优化 See merge request !851

Merge branch 'dev' into 'test'
秒杀测试返回的bug优化 See merge request !851
后端研发-苏明海
2 parents a0e76433 56d89e43
Showing 4 changed files with 20 additions and 7 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxml
components/goods_list/goods_list.js
pages/goods/goodsInfo/goodsInfo.js
@@ -443,7 +443,9 @@ Component({
 			item.cardprice1 = val.cardprice1;
 			item.cardprice2 = val.cardprice2;
 			item.cardprice3 = val.cardprice3;
-			
+			item.prom_type = val.prom_type;
+			item.prom_id = val.prom_id;
+
 			if(val.prom_price)    item.prom_price = val.prom_price;
 			if(val.prom_integral) item.prom_integral = val.prom_integral;
@@ -15,7 +15,7 @@
 <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}}" 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 +169,7 @@
 <!--2个一列-->
 <block  wx:if="{{object.column==2}}">
   <block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" 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_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
@@ -328,7 +328,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}}" 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_goods_wai_san" >
                 <view class="zs_goods_san">
                     <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'>
@@ -485,7 +485,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}}" 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="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
                 <view class='zs_top_x'>
                     <block wx:if="{{object.big_order_type==3}}">
@@ -662,7 +662,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}}" style="width: 32%" >
+          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_id={{aitem.prom_id}}&&prom_type={{aitem.prom_type}}" 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%">
@@ -98,6 +98,9 @@ Component({
     get_list: function () {
       var that = this;
       if (that.data.is_no_more == 0) return false;
+      var user_id=getApp().globalData.user_id;
+      if(!user_id) user_id=0;
+
       var curPage = that.data.curPage;
       getApp().request.get('/api/weshop/goods/page?page', {
         isShowLoading: false,
@@ -111,6 +114,7 @@ Component({
           pageSize: 6,
           orderField: "sort",
           orderType: 'asc',
+          user_id: user_id,
         },
         success: function (res) {
           var data = res.data;
@@ -124,6 +128,13 @@ Component({
           }
           //加载完成
           if (data.data.pageData) {
+
+            for(let i in data.data.pageData){
+            	let item=data.data.pageData[i];
+            	if(item.user_price)
+            	   item.prom_price=item.user_price;
+            }
+
             that.setData({
               load_complete: 1
             });
@@ -4441,7 +4441,7 @@ Page({
             var pri0 = th.data.data.shop_price;
             if (th.data.prom_act)
-              pri0 = th.data.prom_act.price;
+                pri0 = th.data.prom_price;
             pri0 = parseFloat(pri0).toFixed(2);
             var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25;
             context.fillText("￥", wd1 - 15, 185 * unit);