wxd / MShopWeApp

Commit e7906918e28a51446ebeb89d1fc25c42b5a12662

Authored by 后端研发-苏明海
2 parents 97ea2de7 6b18c7bd

Merge branch 'dev' into 'test' 

Dev

See merge request !1033
Inline Side-by-side
Showing 11 changed files with 46 additions and 31 deletions
... ... @@ -530,21 +530,40 @@ App({
530 530 }
531 531 if (!th.globalData.pk_store) {
532 532 var pick_id = 0;
533   - //先找一个会员是否有设置默认的地址
534   - if (th.globalData.userInfo.def_pickup_id) {
535   - pick_id = th.globalData.userInfo.def_pickup_id
536   - }
537   - //查找会员的注册的地址
538   - else if (th.globalData.userInfo.pickup_id) {
  533 +
  534 + var is_pricing_open_store=0;
  535 + var is_regstores=0;
  536 + if (conf.switch_list) {
  537 + var t_swi = JSON.parse(conf.switch_list);
539 538 //--购买门店是否默认登记门店--
540   - if (conf.switch_list) {
541   - var t_swi = JSON.parse(conf.switch_list);
542   - if (t_swi.is_regstores) {
543   - pick_id = th.globalData.userInfo.pickup_id
544   - }
  539 + is_regstores=t_swi.is_regstores;
  540 + is_pricing_open_store=t_swi.is_pricing_open_store;
  541 + }
  542 +
  543 + //-- 如果是区域价格提现，现在注册门店是默认 --
  544 + if(is_pricing_open_store){
  545 +
  546 + //查找会员的注册的地址
  547 + if (th.globalData.userInfo.pickup_id) {
  548 + pick_id = th.globalData.userInfo.pickup_id
  549 + }
  550 + //先找一个会员是否有设置默认的地址
  551 + else if (th.globalData.userInfo.def_pickup_id) {
  552 + pick_id = th.globalData.userInfo.def_pickup_id
545 553 }
546 554  
  555 + }else{
  556 + //先找一个会员是否有设置默认的地址
  557 + if (th.globalData.userInfo.def_pickup_id) {
  558 + pick_id = th.globalData.userInfo.def_pickup_id
  559 + }
  560 + //查找会员的注册的地址
  561 + else if (th.globalData.userInfo.pickup_id && is_regstores) {
  562 + pick_id = th.globalData.userInfo.pickup_id
  563 + }
547 564 }
  565 +
  566 +
548 567 //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店--
549 568 if (pick_id == 0) return func(null);
550 569  
... ...
components/diy_advertising/diy_advertising.js
  View file @e790691
... ... @@ -50,7 +50,7 @@ Component({
50 50 //宽高比
51 51 var ratio = imgwidth / imgheight;
52 52 //计算的高度值
53   - var viewHeight = 715 / ratio;
  53 + var viewHeight = 750 / ratio;
54 54 var hei=this.data.max_sw_height;
55 55  
56 56 if (hei< viewHeight) {
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @e790691
... ... @@ -303,7 +303,8 @@
303 303 <block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
304 304 <view class="card fs28" wx:for="{{listServiceItem}}">
305 305 <view class="flex ai_c jc_sb" style="height: 88rpx;">
306   - <view class="ellipsis-2 f1">{{item.projectName}}（{{item.frequency}}次）</view>
  306 + <view class="ellipsis-2 f1" wx:if="{{item.displayqty==1}}" >{{item.projectName}}（无限次）</view>
  307 + <view class="ellipsis-2 f1" wx:else>{{item.projectName}}（{{item.frequency}}次）</view>
307 308 <view class="pdl30 t-r">
308 309 <view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
309 310 <view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
... ...
packageC/pages/presell/cart/cart2.js
  View file @e790691
... ... @@ -700,7 +700,8 @@ Page({
700 700  
701 701 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
702 702 if (item['exp_sum_type'] == 2) {
703   - cut_good_weight += item['weight'] * item['buynum'];
  703 + cut_good_weight += item['weight'] * item['buynum'];
  704 + goods_weight += item['weight'] * item['buynum'];
704 705 }
705 706 if (back_data.weight_free > 0) {
706 707 out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @e790691
... ... @@ -431,7 +431,8 @@ Page({
431 431  
432 432 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
433 433 if (item['exp_sum_type'] == 2) {
434   - cut_good_weight += item['weight'] * item['buynum'];
  434 + cut_good_weight += item['weight'] * item['buynum'];
  435 + goods_weight += item['weight'] * item['buynum'];
435 436 }
436 437 if (back_data.weight_free > 0) {
437 438 out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
... ...
pages/giftpack/public/buy_com.wxml
  View file @e790691
... ... @@ -186,7 +186,7 @@
186 186 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
187 187 <view class="fs30" style="color:black;">选择门店</view>
188 188 </view>
189   - <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
  189 + <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
190 190 </view>
191 191 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
192 192 <block wx:else>
... ...
pages/goods/goodsInfo/buy_integral_normal.wxml
  View file @e790691
... ... @@ -39,7 +39,7 @@
39 39 <!-- 没有门店的时候 -->
40 40 <view class="flex" bindtap="choice_store" wx:else>
41 41 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
42   - <view class="fs30" style="color:black;">选择门店</view>
  42 + <view class="fs30" style="color:black;">选择门店</view>
43 43 </view>
44 44  
45 45 <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
... ... @@ -49,7 +49,7 @@
49 49 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
50 50 <block wx:else>
51 51 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
52   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
  52 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2}}">(库存不足)</view>
53 53 </block>
54 54 </block>
55 55 <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
... ... @@ -118,7 +118,7 @@
118 118 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
119 119 </block>
120 120 <block wx:else>
121   - <block wx:if="{{data.store_count<=0}}">
  121 + <block wx:if="{{def_pick_store && !def_pick_store.CanOutQty}}">
122 122 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
123 123 </block>
124 124 <block wx:else>
... ...
pages/goods/goodsInfo/buy_pt.wxml
  View file @e790691
... ... @@ -66,7 +66,7 @@
66 66 <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
67 67 </view>
68 68 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
69   - <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
  69 + <view class="no_store" wx:elif="{{is_normal && def_pick_store && (!def_pick_store.CanOutQty || def_pick_store.CanOutQty<=0)}}">(库存不足)</view>
70 70 <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
71 71 </view>
72 72 <!----商品的属性项目---->
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @e790691
... ... @@ -3385,10 +3385,10 @@ Page({
3385 3385 //---把数组组装进去---
3386 3386 th.deal_pickup(em);
3387 3387 } else {
3388   - th.setData({def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null})
  3388 + th.setData({all_sto: null, only_pk: null, def_pickpu_list: null})
3389 3389 }
3390 3390 } else {
3391   - th.setData({def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null})
  3391 + th.setData({all_sto: null, only_pk: null, def_pickpu_list: null})
3392 3392 }
3393 3393 })
3394 3394 },
... ...
pages/team/team_ping/team_ping.wxml
  View file @e790691
... ... @@ -63,16 +63,9 @@
63 63 <view class="t-c flex {{item.pt_status==3?'jietitun':''}}">
64 64 <view>共{{item.order_goods[0].goods_num}}件,</view>
65 65 <block wx:if="{{item.is_zsorder==4}}">
66   - <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
  66 +
67 67 <view>金额：<text class="xc-wc">￥</text></view>
68 68 <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view>
69   - </block>
70   - <block wx:else>
71   - <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4">
72   - 定金：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
73   - <view class='foot-l-wz fs35' wx:else>金额：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
74   - <view class='foot-l-wz2 fs35' wx:if="{{item.pt_tail_money>0}}">尾款：￥{{item.pt_tail_money}}</view>
75   - </block>
76 69  
77 70 </block>
78 71 <block wx:else>
... ...
pages/team/team_success/team_success.js
  View file @e790691
... ... @@ -237,7 +237,7 @@ Page({
237 237  
238 238 //只装5个
239 239 var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
240   - if(max_num){
  240 + if(max_num && !team_g.is_xuni_ct){
241 241 ct_nun=parseInt(max_num);
242 242 if (ct_nun < ordertx.length) ct_nun = ordertx.length;
243 243 }
... ...