wxd / MShopWeApp

Commit 92ad1478ab352d3a2742d4d0d20177144614304f

Authored by yvan.ni
1 parent 5cf136a3

1. 搭配购买的物流配送方式的bug修复 

2. 积分购，参团的门店匹配问题的修复
Inline Side-by-side
Showing 4 changed files with 16 additions and 12 deletions
pages/cart/cart2/cart2.js
  View file @92ad147
... ... @@ -710,17 +710,20 @@ Page({
710 710  
711 711 narr.push(t.data.data);
712 712  
  713 + //-- 搭配促销的门店配送方式的修复 --
  714 + et=1;distr_t=0;
713 715 for(var hi in narr){
714 716 var dis_t=narr[hi].distr_type;
715 717 if(dis_t==2){
716   - th.setData({ is_all_zt:0});
717   - break;
  718 + th.setData({ is_all_zt:0});et=0;
  719 + }
  720 + if(dis_t>0){
  721 + distr_t=dis_t;
718 722 }
719 723 }
720   -
721   -
  724 +
722 725 var ie = {
723   - pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,
  726 + pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,bn_t_exp_t: distr_t,
724 727 goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0};
725 728 cart_arr.push(ie);
726 729 th.data.old_cartlist=cart_arr;
... ...
pages/goods/goodsInfo/buy_integral.wxml
  View file @92ad147
... ... @@ -81,7 +81,7 @@
81 81 <view class="spec-cart-btns">
82 82 <!-- 根本就找不到门店 -->
83 83 <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
84   - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配{{def_pick_store.is_no_dis}}</view>
  84 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>
85 85 </block>
86 86  
87 87 <block wx:else>
... ...
pages/goods/goodsInfo/buy_pt.wxml
  View file @92ad147
... ... @@ -69,6 +69,7 @@
69 69 </view>
70 70 </view>
71 71 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
  72 + <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
72 73 <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
73 74 </view>
74 75 <!----商品的属性项目---->
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @92ad147
... ... @@ -2492,10 +2492,10 @@ Page({
2492 2492 //---把数组组装进去---
2493 2493 th.deal_pickup(em);
2494 2494 }else{
2495   - th.setData({def_pick_store:null,all_sto:null,only_pk:null})
  2495 + th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
2496 2496 }
2497 2497 }else{
2498   - th.setData({def_pick_store:null,all_sto:null,only_pk:null})
  2498 + th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
2499 2499 }
2500 2500 })
2501 2501 },
... ... @@ -4424,12 +4424,12 @@ Page({
4424 4424 is_gps: 1
4425 4425 });
4426 4426 //th.onShow();
4427   - th.get_sto();
  4427 + th.get_sto(th.data.is_normal);
4428 4428 },
4429 4429 fail: function(res) {
4430 4430 //th.onShow();
4431 4431 th.data.is_get_local_ok = 1;
4432   - th.get_sto();
  4432 + th.get_sto(th.data.is_normal);
4433 4433 if (res.errCode == 2) {
4434 4434 th.setData({
4435 4435 is_gps: 0
... ... @@ -4447,7 +4447,7 @@ Page({
4447 4447 })
4448 4448 }else{
4449 4449 th.data.is_get_local_ok = 1;
4450   - th.get_sto();
  4450 + th.get_sto(th.data.is_normal);
4451 4451 }
4452 4452  
4453 4453 if(ind!=undefined && ind!=null ){
... ... @@ -5076,6 +5076,7 @@ Page({
5076 5076  
5077 5077 //-- 积分购 --
5078 5078 go_pay_integral:function(){
  5079 + this.get_sto(0)
5079 5080 this.setData({openSpecModal_inte:1});
5080 5081 },
5081 5082 //-- 积分购普通购买 --
... ... @@ -5088,7 +5089,6 @@ Page({
5088 5089 this.setData({openSpecModal_inte:0});
5089 5090 } ,
5090 5091 closeSpecModal_inte_normal:function(){
5091   - this.get_sto()
5092 5092 this.setData({openSpecModal_inte_normal:0});
5093 5093 },
5094 5094  
... ...