diff --git a/components/diy_shopname/diy_shopname.wxss b/components/diy_shopname/diy_shopname.wxss
index 7654f73..dc3f2aa 100644
--- a/components/diy_shopname/diy_shopname.wxss
+++ b/components/diy_shopname/diy_shopname.wxss
@@ -166,7 +166,8 @@ left:-116rpx;
}
.fonts {
- width: 186rpx;
+ min-width: 186rpx;
+ max-width: 360rpx;
height: 70rpx;
/* 倒角 */
border-radius: 25rpx;
@@ -181,6 +182,9 @@ left:-116rpx;
top: 20rpx;
left: 0rpx;
/* background-color: rgba(255, 255, 255, 0.7); */
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
/* 底层文字 */
@@ -225,7 +229,7 @@ left:-116rpx;
}
.shopname_title_size{ font-size: 34rpx}
-.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:rpx;right: 0 }
+.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:15rpx;right: 0 }
.big .all_view .v_item{width:33%; }
.big_border_two .title_center{ display: flex; justify-content: center;}
diff --git a/packageA/pages/chongzhi/chongzhi.wxml b/packageA/pages/chongzhi/chongzhi.wxml
index cf0c47c..6a44a32 100644
--- a/packageA/pages/chongzhi/chongzhi.wxml
+++ b/packageA/pages/chongzhi/chongzhi.wxml
@@ -28,7 +28,7 @@
{{item.ActName}}
零售价：￥{{item.PosPrice}}
- {{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + item.EndDate}}
+ {{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + (item.EndDate==''?'不限':item.EndDate)}}
diff --git a/packageA/pages/chongzhi/g_filter.wxs b/packageA/pages/chongzhi/g_filter.wxs
index f9bd741..5166129 100644
--- a/packageA/pages/chongzhi/g_filter.wxs
+++ b/packageA/pages/chongzhi/g_filter.wxs
@@ -1,5 +1,6 @@
var is_acting = function(endtime){
//判断结束时间减去当前时间 ，如果当前时间大于0则为True
+ if(endtime=='') return true;
endtime = endtime.substring(0, 19);
var reg = getRegExp("-", "g");
endtime = endtime.replace(reg, '/');
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index f13d81e..6887a28 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2260,6 +2260,10 @@ Page({
var th=this;
var ty = t.currentTarget.dataset.t,def_exp_code= getApp().globalData.userInfo.def_exp_code;
th.setData({ bn_exp_type:ty});
+ if(ty==0){
+ th.setData({ is_all_zt: 0 });
+ }
+
//当物流为空的时候。
if (ty == 0 && th.data.wu_arr==null){
th.data.isget_by_quan={};
@@ -2921,8 +2925,10 @@ Page({
//如果是搭配购的立即购买的时候
if(th.data.is_b_now){
- var quanlist=arr[0].quan_list;
- th.setData({selected_quan_list:quanlist,cartlist:arr})
+ if(arr && arr.length>0){
+ var quanlist=arr[0].quan_list;
+ th.setData({selected_quan_list:quanlist,cartlist:arr})
+ }
}else{
th.setData({cartlist:arr })
th.set_can_num();
@@ -2972,6 +2978,7 @@ Page({
//检查区域是不是包邮
check_area:function(arr){
var user_addr=this.data.user_addr;
+ if(!user_addr) return 0;
for(var i in arr){
var item=arr[i];
if(user_addr.twon==item || user_addr.district==item
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 0f8474c..8c8b69f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -245,6 +245,7 @@ Page({
showPoster: false,
hui_condition:null,
+ sto_sele_name_1:'',//分享的门店名称
},
//------初始化加载----------
@@ -331,12 +332,16 @@ Page({
if(c_guide_id){
th.data.c_guide_id=c_guide_id;
}
+
+ getApp().getConfig(function(e) {
+ ee.setData({sto_sele_name_1:e.store_name})
+ })
//----获取系统参数-----
getApp().getConfig2(function(e) {
ee.setData({
bconfig: e,
- sales_rules:e.sales_rules
+ sales_rules:e.sales_rules,
});
if (e.categoryset.indexOf("," + 1 + ",") != -1) {
@@ -3873,7 +3878,7 @@ Page({
context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
context.setFillStyle("black")
context.setFontSize(28 * unit)
- context.fillText(th.data.sto_sele_name, 40 * unit, 766 * unit);
+ context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
}else{
// 原来start --->
// context.fillText("长按识别二维码", 40 * unit, 776 * unit);
@@ -3882,7 +3887,7 @@ Page({
context.fillText("立即开始兑换", 40 * unit, 846 * unit);
context.setFillStyle("black")
context.setFontSize(28 * unit)
- context.fillText(th.data.sto_sele_name, 40 * unit, 766 * unit);
+ context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
}
//---二维吗图---
@@ -3915,7 +3920,7 @@ Page({
context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * unit);
context.setFillStyle("black")
context.setFontSize(28 * unit)
- context.fillText(th.data.sto_sele_name, 40 * unit, 786 * unit);
+ context.fillText(th.data.sto_sele_name_1, 40 * unit, 786 * unit);
//---二维吗图---
//-- 自定义海报 --
if(th.data.poster){
@@ -3962,7 +3967,7 @@ Page({
context.fillText("长按识别二维码，立即参团", 40 * unit, 866 * unit);
context.setFillStyle("black")
context.setFontSize(26 * unit)
- context.fillText(th.data.sto_sele_name, 40 * unit, 806 * unit);
+ context.fillText(th.data.sto_sele_name_1, 40 * unit, 806 * unit);
//---二维吗图---
//-- 自定义海报 --
if(th.data.poster){
@@ -4016,7 +4021,7 @@ Page({
context.setFillStyle("black")
context.setFontSize(26 * unit)
- context.fillText(th.data.sto_sele_name, 40 * unit, 876 * unit);
+ context.fillText(th.data.sto_sele_name_1, 40 * unit, 876 * unit);
//-- 自定义海报 --
if(th.data.poster){