diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index a2a43e9..2328dc0 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -1631,6 +1631,7 @@ Page({
//---------拿出门店分类和门店------------
get_sto(e) {
+ var is_normal=e;
var th = this,that=this;
var timer_get = setInterval(function() {
if (th.data.is_get_local_ok == 0) return false;
@@ -1688,7 +1689,7 @@ Page({
}
//如果有秒杀的指定门店
- if(th.data.prom_type==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length){
+ if(th.data.prom_type==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){
var pick_up_lists=th.data.prom_act.pick_up_lists;
for (var kq = 0; kq < e.data.data.pageData.length; kq++) {
var it0=e.data.data.pageData[kq];
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
index f14d797..9c62aca 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
@@ -55,7 +55,7 @@
更多门店
(该店不可售)
- (该店不可售)
+ (该店不可售)
(库存不足)
地址:{{def_pick_store.fulladdress}}
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index 00a60d5..258fba8 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -358,7 +358,6 @@ Page({
var appd = getApp().globalData;
var w_time = setInterval(function () {
if (that.data.is_get_local_ok == 0) return false;
-
if (!th.data.data) return false;
var ser_card = th.data.data;
//--如果默认门店不在等级卡的默认们店以内
@@ -1217,6 +1216,7 @@ Page({
//---------拿出门店分类和门店------------
get_sto(e) {
+ var is_normal=e;
var th = this, that = this;
var timer_get = setInterval(function () {
if (th.data.is_get_local_ok == 0) return false;
@@ -1276,7 +1276,7 @@ Page({
}
//如果有秒杀的指定门店
- if(th.data.prom_type==6 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length){
+ if(th.data.prom_type==6 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){
var pick_up_lists=th.data.prom_act.pick_up_lists;
for (var kq = 0; kq < e.data.data.pageData.length; kq++) {
var it0=e.data.data.pageData[kq];
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
index e4a323a..af8db1e 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
@@ -2525,6 +2525,7 @@ margin-left: 17rpx;
}
.address_name{
margin-right: 10rpx;
+ max-width: 370rpx;
}
.address-val{