wxd / MShopWeApp

Commit 5b4a39f270f7e26e14ebfe1f228a05c38e2ce6c1

Authored by yvan.ni
1 parent 325ef137

1、优化起订量，倍数 

2、优化虚拟商品
Inline Side-by-side
Showing 16 changed files with 157 additions and 203 deletions
packageA/pages/goodsInfo/buy_flash_normal.wxml
  View file @5b4a39f
... ... @@ -51,7 +51,7 @@
51 51 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
52 52 <block wx:else>
53 53 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
54   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
  54 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules==2 && prom_type==0}}">(库存不足)</view>
55 55 </block>
56 56 </block>
57 57 <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @5b4a39f
... ... @@ -510,16 +510,7 @@ Page({
510 510 });
511 511 };
512 512 // <---- 秒杀
513   -
514   -
515   -
516   -
517   -
518   -
519   -
520 513  
521   -
522   -
523 514 //------是否收藏----------
524 515 await getApp().request.promiseGet("/api/weshop/goodscollect/page", {
525 516 data: {
... ... @@ -1027,21 +1018,15 @@ Page({
1027 1018 });
1028 1019 is_ok=0;
1029 1020 return false;
1030   - };
1031   - };
1032   -
1033   -
1034   - });
1035   -
1036   -
1037   -
1038   - };
1039   - });
  1021 + }
  1022 + }
  1023 + })
  1024 +
  1025 + }
  1026 + })
1040 1027  
1041   - };
1042   -
1043   -
1044   - };
  1028 + }
  1029 + }
1045 1030  
1046 1031  
1047 1032 if(!is_ok) return false;
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @5b4a39f
... ... @@ -638,6 +638,7 @@
638 638  
639 639 <!-- 弹起来,选择规格数量,普通商品购买和秒杀 -->
640 640 <view hidden="{{!openSpecModal}}">
  641 +
641 642 <view bindtap="closeSpecModal" class="cover-layer"></view>
642 643 <view class="spec-model">
643 644 <view class="pding">
... ... @@ -685,7 +686,7 @@
685 686 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
686 687 <block wx:else>
687 688 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
688   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
  689 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules==2 && prom_type==0}}">(库存不足)</view>
689 690 </block>
690 691 </block>
691 692  
... ... @@ -716,7 +717,6 @@
716 717 </block>
717 718 <block wx:else>
718 719  
719   -
720 720 <block wx:if="{{only_pk.length && !only_pk.length}}">
721 721 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
722 722 </block>
... ... @@ -724,29 +724,33 @@
724 724 <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
725 725 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
726 726 </block>
  727 +
727 728 <block wx:else>
728 729 <block wx:if="{{!def_pick_store}}">
  730 +
729 731 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
730 732 </block>
731 733 <block wx:else>
732   - <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
733   - <block wx:if="{{sales_rules==2 && prom_type==0}}">
734   - <block wx:if="{{!def_pick_store.CanOutQty}}">
735   - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
736   - </block>
737   - <block wx:else>
738   - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
739   - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">
740   - {{sele_g.offline_price?"券后购买":"立即购买"}}
741   - </view>
742   - </block>
743   - </block>
744   - <!-- 线上销售 -->
745   - <block wx:else>
746   - <block wx:if="{{sele_g.store_count<=0}}">
747   - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
748   - </block>
749   - <block wx:else>
  734 +
  735 + <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 ，因为服务卡项没有线下库存，所以取消-->
  736 +<!-- <block wx:if="{{sales_rules>=2 && prom_type==0}}">-->
  737 +<!-- <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num}}">-->
  738 +<!-- <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>-->
  739 +<!-- </block>-->
  740 +<!-- <block wx:else>-->
  741 +<!-- <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>-->
  742 +<!-- <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">-->
  743 +<!-- {{sele_g.offline_price?"券后购买":"立即购买"}}-->
  744 +<!-- </view>-->
  745 +<!-- </block>-->
  746 +<!-- </block>-->
  747 +
  748 + <!-- 线上销售，也没有线上库存 -->
  749 +<!-- <block wx:else>-->
  750 +<!-- <block wx:if="{{sele_g.store_count<=0}}">-->
  751 +<!-- <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>-->
  752 +<!-- </block>-->
  753 +<!-- <block wx:else>-->
750 754 <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}"
751 755 data-action="add">加入购物车</view>
752 756 <!-- 秒杀 -->
... ... @@ -765,8 +769,8 @@
765 769 </view>
766 770 </block>
767 771  
768   - </block>
769   - </block>
  772 +<!-- </block>-->
  773 +<!-- </block>-->
770 774 </block>
771 775 </block>
772 776 </block>
... ...
packageA/pages/prom_list/prom_list.wxml
  View file @5b4a39f
... ... @@ -113,7 +113,7 @@
113 113 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
114 114 <block wx:else>
115 115 <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
116   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0}}">(库存不足)</view>
  116 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">(库存不足)</view>
117 117 </block>
118 118 </block>
119 119  
... ... @@ -160,9 +160,8 @@
160 160 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
161 161 </block>
162 162 <block wx:else>
163   - <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
  163 + <!-- 如果是线下库存购买的时候, 此时不要计算起订量-->
164 164 <block wx:if="{{sales_rules>=2}}">
165   -
166 165 <block wx:if="{{!def_pick_store.CanOutQty}}">
167 166 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
168 167 </block>
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
  View file @5b4a39f
... ... @@ -25,11 +25,14 @@
25 25 <block wx:if="{{is_normal==1}}">
26 26 <view class="flex">
27 27 <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
28   - <block wx:if="{{sales_rules>=2}}">
29   - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
30   - <view class="spec-goods-stock" wx:else>可售:0</view>
31   - </block>
32   - <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>
  28 +
  29 + <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}">
  30 + <block wx:if="{{sales_rules>=2}}">
  31 + <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
  32 + <view class="spec-goods-stock" wx:else>可售:0</view>
  33 + </block>
  34 + <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>
  35 + </block>
33 36 </view>
34 37 </block>
35 38 <!-- <block wx:if="{{is_normal==0}}">
... ... @@ -70,8 +73,8 @@
70 73 </view>
71 74 </view>
72 75 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
73   - <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
74   - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
  76 + <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0 && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</view>
  77 + <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
75 78 </view>
76 79 <!----商品的属性项目---->
77 80 <view>
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @5b4a39f
... ... @@ -3371,6 +3371,7 @@ Page({
3371 3371 all_sto: newarr
3372 3372 });
3373 3373  
  3374 +
3374 3375 } else {
3375 3376 th.setData({
3376 3377 is_show_sto_cat: -1,
... ... @@ -3434,8 +3435,6 @@ Page({
3434 3435 var g_distr_type = th.data.sele_g.distr_type;
3435 3436 var lock = [];
3436 3437  
3437   -
3438   -
3439 3438 var lock_rq = {
3440 3439 store_id: os.stoid,
3441 3440 wareId: th.data.sele_g.goods_id,
... ... @@ -4318,7 +4317,7 @@ Page({
4318 4317 // ind == 1 为普通购买
4319 4318 openSpecModel_pt: function (e) {
4320 4319  
4321   - this.setData({ open_ind_store: 9, goodsInputNum: mo_num });
  4320 + this.setData({ open_ind_store: 9 });
4322 4321 // 判断是否有待支付订单
4323 4322 var aid = this.data.group_id;
4324 4323 var switOn = true;
... ... @@ -4678,69 +4677,68 @@ Page({
4678 4677 }
4679 4678 },
4680 4679  
4681   - //统一一下获取线下库存的函数
4682   - async check_CanOutQty(goodsinfo, item, func) {
4683   -
4684   - var sales_rules = this.data.sales_rules;
  4680 + //统一一下获取线下库存的函数
  4681 + async check_CanOutQty(goodsinfo, item, func) {
4685 4682  
4686   - //如果默认是商品
4687   - if(getApp().is_virtual(goodsinfo)){
4688   - return func(100000);
4689   - }
4690   -
4691   - var lock_rq = {
4692   - store_id: os.stoid,
4693   - wareId: goodsinfo.goods_id,
4694   - pageSize: 1000
4695   - };
  4683 + var sales_rules = this.data.sales_rules;
  4684 + //如果默认是商品
  4685 + if(getApp().is_virtual(goodsinfo)){
  4686 + return func(100000);
  4687 + }
4696 4688  
4697   - if (sales_rules == 2) {
4698   - lock_rq.storageId = item.pickup_id
4699   - } else {
4700   - lock_rq.appoint_pick_keyid = encodeURIComponent(this.data.appoint_pick_keyid)
4701   - }
  4689 + var lock_rq = {
  4690 + store_id: os.stoid,
  4691 + wareId: goodsinfo.goods_id,
  4692 + pageSize: 1000
  4693 + };
4702 4694  
4703   - var lock = 0;
4704   - var CanOutQty = 0;
4705   - var plist = null;
4706   - //先读取门店的lock
4707   - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
4708   - data: lock_rq
4709   - }).then(res => {
4710   - if (res.data.code == 0 && res.data.data.total > 0) {
4711   - for (var i in res.data.data.pageData)
4712   - lock += res.data.data.pageData[i].outQty;
4713   - }
4714   - })
  4695 + if (sales_rules == 2) {
  4696 + lock_rq.storageId = item.pickup_id
  4697 + } else {
  4698 + lock_rq.appoint_pick_keyid = encodeURIComponent(this.data.appoint_pick_keyid)
  4699 + }
4715 4700  
4716   - var sto_req = {
4717   - wareIds: encodeURIComponent(goodsinfo.erpwareid),
4718   - storeId: os.stoid
4719   - }
4720   - if (sales_rules == 2) {
4721   - sto_req.storageNos = item.pickup_no
4722   - } else {
4723   - sto_req.storageIds = encodeURIComponent(this.data.appoint_pick_keyid)
  4701 + var lock = 0;
  4702 + var CanOutQty = 0;
  4703 + var plist = null;
  4704 + //先读取门店的lock
  4705 + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
  4706 + data: lock_rq
  4707 + }).then(res => {
  4708 + if (res.data.code == 0 && res.data.data.total > 0) {
  4709 + for (var i in res.data.data.pageData)
  4710 + lock += res.data.data.pageData[i].outQty;
4724 4711 }
  4712 + })
4725 4713  
  4714 + var sto_req = {
  4715 + wareIds: encodeURIComponent(goodsinfo.erpwareid),
  4716 + storeId: os.stoid
  4717 + }
  4718 + if (sales_rules == 2) {
  4719 + sto_req.storageNos = item.pickup_no
  4720 + } else {
  4721 + sto_req.storageIds = encodeURIComponent(this.data.appoint_pick_keyid)
  4722 + }
4726 4723  
4727 4724  
4728   - //读取线下的门店库存
4729   - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
4730   - data: sto_req
4731   - }).then(res => {
4732   - if (res.data.code == 0 && res.data.data.total > 0) {
4733   - plist = res.data.data.pageData[0];
4734   - }
4735   - })
4736 4725  
4737   - if (plist && plist.CanOutQty - lock > 0) {
4738   - CanOutQty = plist.CanOutQty - lock;
  4726 + //读取线下的门店库存
  4727 + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
  4728 + data: sto_req
  4729 + }).then(res => {
  4730 + if (res.data.code == 0 && res.data.data.total > 0) {
  4731 + plist = res.data.data.pageData[0];
4739 4732 }
  4733 + })
4740 4734  
4741   - if (func) func(CanOutQty);
  4735 + if (plist && plist.CanOutQty - lock > 0) {
  4736 + CanOutQty = plist.CanOutQty - lock;
  4737 + }
4742 4738  
4743   - },
  4739 + if (func) func(CanOutQty);
  4740 +
  4741 + },
4744 4742  
4745 4743  
4746 4744 //----------立即购买_pt-----------
... ... @@ -6415,7 +6413,7 @@ Page({
6415 6413 }
6416 6414 })
6417 6415  
6418   - if (r_data.ladderLists) {
  6416 + if (r_data && r_data.ladderLists) {
6419 6417 var act_id = r_data.ladderLists[0].form_id;
6420 6418 //-- 判断会员能不能参与阶梯促销 --
6421 6419 await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
... ... @@ -6454,7 +6452,6 @@ Page({
6454 6452 if(this.data.zh_act || this.data.prom_goods || this.data.jieti_prom || this.data.collocationGoods ){
6455 6453 this.data.is_act=1;
6456 6454 }
6457   -
6458 6455 //-- 更新默认购买的数量 ---
6459 6456 var mo_num=getApp().get_limit_qty(th.data.sele_g,this.data.is_act);
6460 6457 this.setData({goodsInputNum:mo_num})
... ... @@ -7090,65 +7087,6 @@ Page({
7090 7087 });
7091 7088 },
7092 7089  
7093   - //统一一下获取线下库存的函数
7094   - async check_CanOutQty(goodsinfo, item, func) {
7095   -
7096   - var sales_rules = this.data.sales_rules;
7097   -
7098   - var lock_rq = {
7099   - store_id: os.stoid,
7100   - wareId: goodsinfo.goods_id,
7101   - pageSize: 1000
7102   - };
7103   -
7104   - if (sales_rules == 2) {
7105   - lock_rq.storageId = item.pickup_id
7106   - } else {
7107   - lock_rq.appoint_pick_keyid = encodeURIComponent(this.data.appoint_pick_keyid)
7108   - }
7109   -
7110   - var lock = 0;
7111   - var CanOutQty = 0;
7112   - var plist = null;
7113   - //先读取门店的lock
7114   - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
7115   - data: lock_rq
7116   - }).then(res => {
7117   - if (res.data.code == 0 && res.data.data.total > 0) {
7118   - for (var i in res.data.data.pageData)
7119   - lock += res.data.data.pageData[i].outQty;
7120   - }
7121   - })
7122   -
7123   - var sto_req = {
7124   - wareIds: encodeURIComponent(goodsinfo.erpwareid),
7125   - storeId: os.stoid
7126   - }
7127   - if (sales_rules == 2) {
7128   - sto_req.storageNos = item.pickup_no
7129   - } else {
7130   - sto_req.storageIds = encodeURIComponent(this.data.appoint_pick_keyid)
7131   - }
7132   -
7133   -
7134   -
7135   - //读取线下的门店库存
7136   - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
7137   - data: sto_req
7138   - }).then(res => {
7139   - if (res.data.code == 0 && res.data.data.total > 0) {
7140   - plist = res.data.data.pageData[0];
7141   - }
7142   - })
7143   -
7144   - if (plist && plist.CanOutQty - lock > 0) {
7145   - CanOutQty = plist.CanOutQty - lock;
7146   - }
7147   -
7148   - if (func) func(CanOutQty);
7149   -
7150   - },
7151   -
7152 7090  
7153 7091 async getUserBuyPromNum(prom_id){
7154 7092 var userInfo = getApp().globalData.userInfo;
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @5b4a39f
... ... @@ -1151,6 +1151,7 @@
1151 1151 <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
1152 1152 </view>
1153 1153 </view>
  1154 +
1154 1155 <view class="spec-cart-btns">
1155 1156 <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
1156 1157 配送不匹配
... ... @@ -1182,8 +1183,8 @@
1182 1183 </block>
1183 1184 <block wx:else>
1184 1185 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
1185   - <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">
1186   - <block wx:if="{{!def_pick_store.CanOutQty}}">
  1186 + <block wx:if="{{sales_rules>=2 && prom_type==0}}">
  1187 + <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num}}">
1187 1188 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
1188 1189 库存不足
1189 1190 </view>
... ... @@ -1199,7 +1200,7 @@
1199 1200 </block>
1200 1201 <!-- 线上销售 -->
1201 1202 <block wx:else>
1202   - <block wx:if="{{sele_g.store_count<=0}}">
  1203 + <block wx:if="{{sele_g.store_count<(mo_num?mo_num:1)}}">
1203 1204 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
1204 1205 库存不足
1205 1206 </view>
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @5b4a39f
... ... @@ -194,7 +194,7 @@
194 194 <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
195 195 (配送不匹配2)
196 196 </view>
197   - <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">
  197 + <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0}}">
198 198 (库存不足)
199 199 </view>
200 200 </block>
... ... @@ -630,7 +630,7 @@
630 630 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
631 631 <block wx:else>
632 632 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配1)</view>
633   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">
  633 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">
634 634 (库存不足)
635 635 </view>
636 636 </block>
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
  View file @5b4a39f
... ... @@ -603,7 +603,7 @@
603 603 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
604 604 <block wx:else>
605 605 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配1)</view>
606   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
  606 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules==2 && prom_type==0}}">
607 607 (库存不足)
608 608 </view>
609 609 </block>
... ...
pages/cart/cart/cart.js
  View file @5b4a39f
... ... @@ -1614,7 +1614,7 @@ Page({
1614 1614 var add_num=1;
1615 1615 //调用接口判断是不是促销活动的商品
1616 1616 if([0,3,5,7,10].indexOf(a.prom_type) > -1){
1617   - var cx_arr=await getApp().jc(a.goods_id,user_id);
  1617 + var cx_arr=await getApp().get_has_cx_act(a.goods_id);
1618 1618 var steep=getApp().get_limit_qty(a,cx_arr.length,1);
1619 1619 if(steep>1){
1620 1620 add_num=steep;
... ... @@ -2102,7 +2102,7 @@ Page({
2102 2102 th.click_set_limit(gd_info,pitems,i,act)
2103 2103 }
2104 2104  
2105   - if (!getApp().is_virtual(gd_info) && th.data.sales_rules >= 2 && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !gd_info.selected) {
  2105 + if (!gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !gd_info.selected) {
2106 2106 var ob = {};
2107 2107 await th.check_down_line_next(gd_info, pitems, i, gd_info.erpwareid, function (res) {
2108 2108 ob = res;
... ... @@ -2293,8 +2293,7 @@ Page({
2293 2293 var act=await getApp().get_has_cx_act(gd_info.goods_id);
2294 2294 //-- 专门来设置商品订购数量 --
2295 2295 th.click_set_limit(gd_info,pitems,item,act)
2296   - if (!getApp().is_virtual(gd_info) && th.data.sales_rules >= 2
2297   - && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 ) {
  2296 + if (th.data.sales_rules >= 2 && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 ) {
2298 2297  
2299 2298 var ob = {};
2300 2299 await th.check_down_line_next(gd_info, pitems, item, erpwareid, function (res) {
... ... @@ -2634,7 +2633,7 @@ Page({
2634 2633  
2635 2634  
2636 2635 //--- 看一下是不是线下库存 ---
2637   - if (!getApp().is_virtual(goodsinfo) && th.data.sales_rules >= 2 && !goodsinfo.whsle_id) {
  2636 + if (th.data.sales_rules >= 2 && !goodsinfo.whsle_id) {
2638 2637 th.check_down_line(t, pitem, item, wareIds);
2639 2638 } else {
2640 2639 if (t.goods_num > store_count) {
... ... @@ -3273,6 +3272,15 @@ Page({
3273 3272 async check_down_line_next(t, pitem, item, erpwareid, func) {
3274 3273  
3275 3274 var goodsinfo = this.data.requestData[pitem].goods[item];
  3275 + if(getApp().is_virtual(goodsinfo)){
  3276 + var ob = {};
  3277 + ob.code = 1;
  3278 + ob.CanOutQty = 100000;
  3279 + func(ob);
  3280 + return false;
  3281 + }
  3282 +
  3283 +
3276 3284 var lock = 0,
3277 3285 pick_no, plist;
3278 3286  
... ... @@ -3529,7 +3537,7 @@ Page({
3529 3537  
3530 3538 //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存---
3531 3539 if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5 || i_arr[j].prom_type == 7 || i_arr[j].prom_type == 10 ||
3532   - i_arr[j].need_downlow_num) && !getApp().is_virtual(i_arr[j]) && th.data.sales_rules >= 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) {
  3540 + i_arr[j].need_downlow_num) && th.data.sales_rules >= 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) {
3533 3541 //--获取商品的线下商品ID--
3534 3542  
3535 3543 var gd = null;
... ...
pages/goods/goodsInfo/buy_com_pop.wxml
  View file @5b4a39f
... ... @@ -57,7 +57,7 @@
57 57 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
58 58 <block wx:else>
59 59 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
60   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && !filters.is_virtual_gd(sele_g.is_virtual) }}">
  60 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2}}">
61 61 (库存不足)
62 62 </view>
63 63 </block>
... ... @@ -140,8 +140,8 @@
140 140 </view>
141 141 </block>
142 142 <block wx:else>
143   - <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
144   - <view wx:if="{{!def_pick_store.CanOutQty}}" class="spec-cart-btn fs32" data-action="add"
  143 + <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id }}">
  144 + <view wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num }}" class="spec-cart-btn fs32" data-action="add"
145 145 style="background-color: #dcdcdc;color: #999">库存不足
146 146 </view>
147 147 <block wx:else>
... ... @@ -156,8 +156,6 @@
156 156 </block>
157 157 </block>
158 158  
159   -
160   -
161 159 <block wx:elif="{{data.store_count<(mo_num?mo_num:1)}}">
162 160 <view class="spec-cart-btn fs32" data-action="add"
163 161 style="background-color: #dcdcdc;color: #999">库存不足
... ...
pages/goods/goodsInfo/buy_integral.wxml
  View file @5b4a39f
... ... @@ -47,7 +47,9 @@
47 47 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
48 48 <block wx:else>
49 49 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
50   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">(库存不足)</view>
  50 + <view wx:elif="{{def_pick_store && sales_rules>=2 && prom_type==0}}">
  51 + <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num}}">(库存不足)</block>
  52 + </view>
51 53 </block>
52 54 </block>
53 55  
... ...
pages/goods/goodsInfo/buy_pt.wxml
  View file @5b4a39f
... ... @@ -73,7 +73,7 @@
73 73 <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
74 74 <block wx:else>
75 75 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
76   - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view>
  76 + <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view>
77 77 </block>
78 78 </block>
79 79  
... ... @@ -182,8 +182,8 @@
182 182  
183 183 <block wx:else>
184 184 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
185   - <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
186   - <block wx:if="{{!def_pick_store.CanOutQty}}">
  185 + <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id}}">
  186 + <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num}}">
187 187 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
188 188 库存不足
189 189 </view>
... ... @@ -194,7 +194,7 @@
194 194 </block>
195 195 <!-- 线上销售 -->
196 196 <block wx:else>
197   - <block wx:if="{{sele_g.store_count<=0 && is_no_new}}">
  197 + <block wx:if="{{sele_g.store_count<(mo_num?mo_num:1) && is_no_new}}">
198 198 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
199 199 库存不足
200 200 </view>
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @5b4a39f
... ... @@ -685,7 +685,7 @@
685 685 <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
686 686 (配送不匹配)
687 687 </view>
688   - <view class="no_store" 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}}">
  688 + <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
689 689 (库存不足)
690 690 </view>
691 691 </block>
... ... @@ -1372,6 +1372,8 @@
1372 1372 <text wx:if="{{hui_condition.monthgiftbag_id>0}}">，送每月礼包</text>
1373 1373 </view>
1374 1374 </view>
  1375 +
  1376 + <!-- 底部处理按钮 -->
1375 1377 <view class="spec-cart-btns">
1376 1378 <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
1377 1379 配送不匹配
... ... @@ -1402,8 +1404,12 @@
1402 1404 </view>
1403 1405 </block>
1404 1406 <block wx:else>
  1407 +
  1408 +
  1409 +
1405 1410 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
1406   - <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
  1411 + <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
  1412 +
1407 1413 <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num }}">
1408 1414 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
1409 1415 库存不足
... ... @@ -1420,7 +1426,7 @@
1420 1426 </block>
1421 1427 <!-- 线上销售 -->
1422 1428 <block wx:else>
1423   - <block wx:if="{{(sele_g.store_count<=0 || sele_g.store_count<mo_num ) && is_no_new}}">
  1429 + <block wx:if="{{ sele_g.store_count<(mo_num?mo_num:1) && is_no_new}}">
1424 1430 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
1425 1431 库存不足
1426 1432 </view>
... ... @@ -1619,7 +1625,7 @@
1619 1625 <view class="flex-vertical-between butttem5">
1620 1626 <view class="flex xc-ash">
1621 1627 <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
1622   - <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual)}}">(库存不足)</text>
  1628 + <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
1623 1629 </view>
1624 1630 </view>
1625 1631 <view>
... ... @@ -1647,7 +1653,7 @@
1647 1653 <view class="flex-vertical-between ">
1648 1654 <view class="flex xc-ash">
1649 1655 <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
1650   - <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</text>
  1656 + <text class="c-red22" wx:if="{{item.is_no_qyt }}">(库存不足)</text>
1651 1657 </view>
1652 1658 </view>
1653 1659 <view>
... ... @@ -1677,7 +1683,7 @@
1677 1683 <view class="flex-vertical-between ">
1678 1684 <view class="flex xc-ash">
1679 1685 <view class="fs28 xc-black3 address_name">{{item.pickup_name}}
1680   - <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual)}}">(库存不足)</text>
  1686 + <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
1681 1687 </view>
1682 1688 </view>
1683 1689 <view>
... ...
pages/user/order_detail/order_detail.js
  View file @5b4a39f
... ... @@ -659,7 +659,7 @@ Page({
659 659 }
660 660  
661 661 //--如果是线下库存的时候--
662   - if(th.data.conf.sales_rules==2 && !gg.whsle_id){
  662 + if(th.data.conf.sales_rules>=2 && !gg.whsle_id){
663 663 var ob={};
664 664 await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){
665 665 ob=obj;
... ... @@ -961,8 +961,13 @@ Page({
961 961  
962 962 //---检验线下库存的数量的子函数---
963 963 async check_down_line_next(gg,num,pick_id,func){
964   -
965   - var lock=0,pick_no,plist;
  964 + //如果默认是商品
  965 + if(getApp().is_virtual(gg)){
  966 + return func(100000);
  967 + }
  968 +
  969 +
  970 + var lock=0,pick_no,plist;
966 971 var lock_rq={store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id};
967 972 if(this.data.sales_rules==3){
968 973 log_rq.appoint_pick_keyid=this.data.appoint_pick_keyid;
... ...
pages/user/order_list/order_list.js
  View file @5b4a39f
... ... @@ -1041,7 +1041,7 @@ Page({
1041 1041 }
1042 1042  
1043 1043 //--如果是线下库存的时候--
1044   - if (!getApp().is_virtual(gg) && th.data.conf.sales_rules >= 2 && !gg.whsle_id) {
  1044 + if (th.data.conf.sales_rules >= 2 && !gg.whsle_id) {
1045 1045 var ob = {};
1046 1046 await th.check_down_line_next(gg, good.goods_num, order.pickup_id, function (obj) {
1047 1047 ob = obj;
... ... @@ -1249,6 +1249,11 @@ Page({
1249 1249 //---检验线下库存的数量的子函数---
1250 1250 async check_down_line_next(gg, num, pick_id, func) {
1251 1251  
  1252 + //如果默认是商品
  1253 + if(getApp().is_virtual(gg)){
  1254 + return func(100000);
  1255 + }
  1256 +
1252 1257 var lock = 0, pick_no, plist;
1253 1258 var log_rq = { store_id: os.stoid, wareId: gg.goods_id, storageId: pick_id };
1254 1259 if (this.data.sales_rules == 3) {
... ...