diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index c795e8c..ce8dc8b 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -3218,7 +3218,7 @@ Page({
//--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候,或者同时不能是活动,秒杀,拼团,积分购--
if (!getApp().is_virtual(th.data.sele_g) && !th.data.sele_g.whsle_id &&
- th.data.sales_rules >= 2 && !th.data.is_newsales_rules && ([1,2,4,6,8,9].indexOf(th.data.prom_type)== -1 || is_normal == 1) {
+ th.data.sales_rules >= 2 && !th.data.is_newsales_rules && ([1,2,4,6,8,9].indexOf(th.data.prom_type)== -1 || is_normal == 1)) {
setTimeout(function () {
th.deal_pickup_dline(e);
}, 800)
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 5ec27fe..4f4031b 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -436,7 +436,8 @@
(配送不匹配)
-
+
(库存不足)
@@ -1064,12 +1065,17 @@
已售:{{sele_g.sales_sum}}
+
-
- 可售:{{def_pick_store.CanOutQty}}
-
- 可售:0
+
+
+
+ 可售:{{def_pick_store.CanOutQty}}
+
+ 可售:0
+
+
可售:{{sele_g.store_count}}
@@ -1105,7 +1111,7 @@
(库存不足)
(配送不匹配)
-
+
(库存不足)
@@ -1177,7 +1183,7 @@
-
+
库存不足
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 7cc56c4..2d78505 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -194,7 +194,8 @@
(配送不匹配2)
-
+
(库存不足)
@@ -630,7 +631,8 @@
(库存不足)
(配送不匹配1)
-
+
(库存不足)
diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index d81e608..e2e58ef 100644
--- a/pages/goods/goodsInfo/buy_com_pop.wxml
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -13,10 +13,14 @@
已售:{{sele_g.sales_sum}}
-
- 可售:{{def_pick_store.CanOutQty}}
-
- 可售:0
+
+
+
+ 可售:{{def_pick_store.CanOutQty}}
+
+ 可售:0
+
+
可售:{{sele_g.store_count}}
@@ -53,7 +57,7 @@
(库存不足)
(配送不匹配)
-
+
(库存不足)
@@ -136,7 +140,7 @@
-
+
库存不足
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index fc198a4..891eb4d 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -28,7 +28,7 @@
{{def_pick_store.pickup_name}}
-
+
距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -47,11 +47,11 @@
(库存不足)
(配送不匹配)
- (库存不足)
+ (库存不足)
- 地址:{{def_pick_store.fulladdress}}
+ 地址:{{def_pick_store.fulladdress}}
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 62530c5..0af0bf5 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -71,7 +71,7 @@
(库存不足)
(配送不匹配)
- (库存不足)
+ (库存不足)
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 446adb6..6de3a7e 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -6897,7 +6897,7 @@ Page({
var lock = 0;
//---如果是活动的时候,同时不是普通购买---
- if (th.data.sele_g.whsle_id || [1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) > -1 && !th.data.is_normal) {
+ if (getApp().is_virtual(th.data.sele_g) || th.data.sele_g.whsle_id || ([1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) > -1 && !th.data.is_normal)) {
func();
return false;
}
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index d327e41..2d17a69 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -681,7 +681,7 @@
(配送不匹配)
-
+
(库存不足)
@@ -1261,12 +1261,19 @@
已售:{{sele_g.sales_sum}}
+
-
- 可售:{{def_pick_store.CanOutQty}}
-
- 可售:0
+
+
+
+
+ 可售:{{def_pick_store.CanOutQty}}
+
+ 可售:0
+
+
+
可售:{{sele_g.store_count}}
@@ -1311,7 +1318,7 @@
(库存不足)
(配送不匹配)
-
+
(库存不足)
@@ -1391,7 +1398,7 @@
-
+
库存不足
@@ -1607,7 +1614,7 @@
{{item.pickup_name}}
- (库存不足)
+ (库存不足)
@@ -1635,7 +1642,7 @@
{{item.pickup_name}}
- (库存不足)
+ (库存不足)
@@ -1665,7 +1672,7 @@
{{item.pickup_name}}
- (库存不足)
+ (库存不足)
diff --git a/utils/filter.wxs b/utils/filter.wxs
index c74dce0..a3f3eb5 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -289,4 +289,8 @@ module.exports = {
isExpired: filters.isExpired,
gettimestamp: filters.gettimestamp,
showStartAndEndDate: filters.showStartAndEndDate,
+ is_virtual_gd:function (is_virtual){
+ if(is_virtual==2) return true;
+ return false;
+ }
}
\ No newline at end of file