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

WXD-SEASON\season
2 parents d087ff41 eb90e544
Showing 4 changed files with 41 additions and 3 deletions
components/diy_heatImg/diy_heatImg.wxss
packageE/pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/order_list/order_list.js
 /* components/diy_heatImg/diy_heatImg.wxss */ 
 .imgbox{
+  display: flex;
+  align-items: flex-start;
   width: 100%;
   position: relative;
   overflow: hidden;
@@ -3422,7 +3422,7 @@ Page({
       if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) {
         //看是不是有调用过包邮券,同时有使用非实收的订单促销，就也不能显示包邮券
-        if (!th.data.isget_by_quan[pickid] && !this.data.can_use_ord_prom[pickid]) {
+        if (!th.data.isget_by_quan[pickid] && !this.data.can_use_ord_prom[pickid] && cart_item.check_quan_ware_list) {
           //--判断要不要显示包邮券,调用接口，因为有for循环---
           await getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", {
             data: {
@@ -1100,6 +1100,7 @@
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
     </view> -->
+    
     <view class="custom-service cart-ico new_split" bindtap="openCS">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
@@ -1430,6 +1431,39 @@
           </block>
         </view>
+        <!-- 选择门店模块 -->
+        <view class="flex-space-between address ai_end xc-width ">
+          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name bold  {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
+            <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
+              距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+            </view>
+          </view>
+          <!-- 没有门店的时候 -->
+          <view class="flex" bindtap="choice_store" wx:else>
+            <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+            <view class="fs30" style="color:black;">选择门店</view>
+          </view>
+          <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
+        </view>
+        <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+        <block wx:else>
+          <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+          <block wx:else>
+            <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+
+            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view>
+            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
+            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0 &&!sele_g.whsle_id }}">
+              (库存不足)
+            </view>
+          </block>
+        </block>
+        <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
+          地址:{{def_pick_store.fulladdress}}
+        </view>
+
       </view>
       <!-- 商品的属性项目 -->
@@ -1449,6 +1483,7 @@
           </block>
         </view>
       </view>
+
       <view class="b_num">
         <view>购买数量</view>
         <view class="count">
@@ -3065,7 +3065,7 @@ Page({
     if (e) {
       currentIndex = e.target.dataset.index;
     } else {
-      currentIndex = this.data.currentIndex
+      currentIndex = this.data.tabIndex
     };
     // let || this.data.tabIndex;
@@ -3076,7 +3076,7 @@ Page({
       user_id: oo.user_id,
     };
     this.setData({
-      tabIndex: this.data.tabIndex || 0,
+      tabIndex: currentIndex,
       is_no_data2: 0,
       is_no_more2: 0,
       cardList: [],
@@ -3157,6 +3157,7 @@ Page({
     var pt_act=null;  //-- 拼团活动的优化 --
     for (const it of list) {
+      
       //秒杀
       if ([1,2].includes(it.prom_type)) {
         let act_details = null;