wxd / MShopWeApp

Commit 82f469d65b869f91eb2aafc112c4fb425f824eac

Authored by 后端研发-苏明海
2 parents a0e76433 56d89e43

Merge branch 'dev' into 'test' 

秒杀测试返回的bug优化

See merge request !851
Inline Side-by-side
Showing 4 changed files with 20 additions and 7 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @82f469d
... ... @@ -443,7 +443,9 @@ Component({
443 443 item.cardprice1 = val.cardprice1;
444 444 item.cardprice2 = val.cardprice2;
445 445 item.cardprice3 = val.cardprice3;
446   -
  446 + item.prom_type = val.prom_type;
  447 + item.prom_id = val.prom_id;
  448 +
447 449 if(val.prom_price) item.prom_price = val.prom_price;
448 450 if(val.prom_integral) item.prom_integral = val.prom_integral;
449 451  
... ...
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @82f469d
... ... @@ -15,7 +15,7 @@
15 15 <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
16 16 <block wx:for="{{goods_array}}" >
17 17 <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
18   - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
  18 + <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">
19 19 <view class='zs_top rel'>
20 20  
21 21 <block wx:if="{{object.big_order_type==3}}">
... ... @@ -169,7 +169,7 @@
169 169 <!--2个一列-->
170 170 <block wx:if="{{object.column==2}}">
171 171 <block wx:for="{{goods_array}}" >
172   - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
  172 + <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">
173 173 <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
174 174 <view class="zs_goods_ban">
175 175 <view class='zs_goods_2l'>
... ... @@ -328,7 +328,7 @@
328 328 <block wx:if='{{object.column==3}}'>
329 329 <view class="zwp_3">
330 330 <block wx:for="{{goods_array}}" >
331   - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
  331 + <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">
332 332 <view class="zs_goods_wai_san" >
333 333 <view class="zs_goods_san">
334 334 <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'>
... ... @@ -485,7 +485,7 @@
485 485 <!-- 列表显示 -->
486 486 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
487 487 <block wx:for="{{goods_array}}" >
488   - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
  488 + <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">
489 489 <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
490 490 <view class='zs_top_x'>
491 491 <block wx:if="{{object.big_order_type==3}}">
... ... @@ -662,7 +662,7 @@
662 662 <view class="sp">
663 663 <swiper-item class="s_it" wx:for="{{goods_array}}">
664 664 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
665   - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" style="width: 32%" >
  665 + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_id={{aitem.prom_id}}&&prom_type={{aitem.prom_type}}" style="width: 32%" >
666 666 <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx">
667 667 <view class='sp_top'>
668 668 <view class='s_img' style="position: relative; width: 100%">
... ...
components/goods_list/goods_list.js
  View file @82f469d
... ... @@ -98,6 +98,9 @@ Component({
98 98 get_list: function () {
99 99 var that = this;
100 100 if (that.data.is_no_more == 0) return false;
  101 + var user_id=getApp().globalData.user_id;
  102 + if(!user_id) user_id=0;
  103 +
101 104 var curPage = that.data.curPage;
102 105 getApp().request.get('/api/weshop/goods/page?page', {
103 106 isShowLoading: false,
... ... @@ -111,6 +114,7 @@ Component({
111 114 pageSize: 6,
112 115 orderField: "sort",
113 116 orderType: 'asc',
  117 + user_id: user_id,
114 118 },
115 119 success: function (res) {
116 120 var data = res.data;
... ... @@ -124,6 +128,13 @@ Component({
124 128 }
125 129 //加载完成
126 130 if (data.data.pageData) {
  131 +
  132 + for(let i in data.data.pageData){
  133 + let item=data.data.pageData[i];
  134 + if(item.user_price)
  135 + item.prom_price=item.user_price;
  136 + }
  137 +
127 138 that.setData({
128 139 load_complete: 1
129 140 });
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @82f469d
... ... @@ -4441,7 +4441,7 @@ Page({
4441 4441  
4442 4442 var pri0 = th.data.data.shop_price;
4443 4443 if (th.data.prom_act)
4444   - pri0 = th.data.prom_act.price;
  4444 + pri0 = th.data.prom_price;
4445 4445 pri0 = parseFloat(pri0).toFixed(2);
4446 4446 var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25;
4447 4447 context.fillText("￥", wd1 - 15, 185 * unit);
... ...