wxd / MShopWeApp

Commit 23a7a024a2baf5b4d0a570d02dd0d229bbcd43a9

Authored by season
2 parents 548799a1 f32bb0aa

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

Inline Side-by-side
Showing 4 changed files with 41 additions and 3 deletions
components/diy_heatImg/diy_heatImg.wxss
  View file @23a7a02
1 1 /* components/diy_heatImg/diy_heatImg.wxss */
2 2 .imgbox{
  3 + display: flex;
  4 + align-items: flex-start;
3 5 width: 100%;
4 6 position: relative;
5 7 overflow: hidden;
... ...
packageE/pages/cart/cart2/cart2.js
  View file @23a7a02
... ... @@ -3422,7 +3422,7 @@ Page({
3422 3422 if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) {
3423 3423  
3424 3424 //看是不是有调用过包邮券,同时有使用非实收的订单促销，就也不能显示包邮券
3425   - if (!th.data.isget_by_quan[pickid] && !this.data.can_use_ord_prom[pickid]) {
  3425 + if (!th.data.isget_by_quan[pickid] && !this.data.can_use_ord_prom[pickid] && cart_item.check_quan_ware_list) {
3426 3426 //--判断要不要显示包邮券,调用接口，因为有for循环---
3427 3427 await getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", {
3428 3428 data: {
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @23a7a02
... ... @@ -1100,6 +1100,7 @@
1100 1100 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
1101 1101 <view>客服</view>
1102 1102 </view> -->
  1103 +
1103 1104  
1104 1105 <view class="custom-service cart-ico new_split" bindtap="openCS">
1105 1106 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
... ... @@ -1430,6 +1431,39 @@
1430 1431 </block>
1431 1432 </view>
1432 1433  
  1434 + <!-- 选择门店模块 -->
  1435 + <view class="flex-space-between address ai_end xc-width ">
  1436 + <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
  1437 + <text class="fs30 xc-black3 shop_name bold {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
  1438 + <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
  1439 + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  1440 + </view>
  1441 + </view>
  1442 + <!-- 没有门店的时候 -->
  1443 + <view class="flex" bindtap="choice_store" wx:else>
  1444 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  1445 + <view class="fs30" style="color:black;">选择门店</view>
  1446 + </view>
  1447 + <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
  1448 + </view>
  1449 + <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
  1450 + <block wx:else>
  1451 + <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
  1452 + <block wx:else>
  1453 + <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
  1454 +
  1455 + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view>
  1456 + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
  1457 + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
  1458 + <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 }}">
  1459 + (库存不足)
  1460 + </view>
  1461 + </block>
  1462 + </block>
  1463 + <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
  1464 + 地址:{{def_pick_store.fulladdress}}
  1465 + </view>
  1466 +
1433 1467 </view>
1434 1468  
1435 1469 <!-- 商品的属性项目 -->
... ... @@ -1449,6 +1483,7 @@
1449 1483 </block>
1450 1484 </view>
1451 1485 </view>
  1486 +
1452 1487 <view class="b_num">
1453 1488 <view>购买数量</view>
1454 1489 <view class="count">
... ...
pages/user/order_list/order_list.js
  View file @23a7a02
... ... @@ -3065,7 +3065,7 @@ Page({
3065 3065 if (e) {
3066 3066 currentIndex = e.target.dataset.index;
3067 3067 } else {
3068   - currentIndex = this.data.currentIndex
  3068 + currentIndex = this.data.tabIndex
3069 3069 };
3070 3070  
3071 3071 // let || this.data.tabIndex;
... ... @@ -3076,7 +3076,7 @@ Page({
3076 3076 user_id: oo.user_id,
3077 3077 };
3078 3078 this.setData({
3079   - tabIndex: this.data.tabIndex || 0,
  3079 + tabIndex: currentIndex,
3080 3080 is_no_data2: 0,
3081 3081 is_no_more2: 0,
3082 3082 cardList: [],
... ... @@ -3157,6 +3157,7 @@ Page({
3157 3157 var pt_act=null; //-- 拼团活动的优化 --
3158 3158  
3159 3159 for (const it of list) {
  3160 +
3160 3161 //秒杀
3161 3162 if ([1,2].includes(it.prom_type)) {
3162 3163 let act_details = null;
... ...