diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 27fcaa3..936168b 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -732,7 +732,7 @@ Page({
// console.log('0xxxxx999999', t.data.data);
//-----商品详情---
if(!t.data.data.serviceContent) t.data.data.serviceContent=" ";
- a.wxParse("content", "html", t.data.data.serviceContent, ee, 6);
+ a.wxParse("content", "html", ut.format_content(t.data.data.serviceContent), ee, 6);
e.wxParseAddFullImageUrl(ee, "content");
//获取重表
diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js
index 816b3cc..0391e40 100644
--- a/packageA/pages/jfbuy/jfbuy.js
+++ b/packageA/pages/jfbuy/jfbuy.js
@@ -454,7 +454,7 @@ Page({
viewItemDetails:function(e){
var index=e.currentTarget.dataset.index;
var item=this.data.list2[index];
- var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&title="+item.goods_name;
+ var url="/pages/goods/goodsInfo/goodsInfo?prom_type=4&prom_id="+item.id+"&goods_id="+item.goods_id+"&title="+item.goods_name;
getApp().goto(url);
},
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index eeaf691..24dcd80 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -234,50 +234,22 @@ Page({
}
t.data.data.gg = gg;
- //--看一下有没有开启等级卡---
- if (ee.data.rank_switch) {
- //---回调卡的列表---
- th.getPlusCardType(function (ob) {
- var user = getApp().globalData.userInfo;
- if (user) {
- if (user.card_field && user['card_expiredate']) {
- var str = user['card_expiredate'].replace(/-/g, '/');
- var end = new Date(str);
- end = Date.parse(end) / 1000;
- var now = ut.gettimestamp();
- //--- 判断是等级会员，且在有效期范围内 ---
- if (user.card_field && now < end) {
- var card_name = ob.name_map.get(user.card_field);
- if (card_name && card_name.length > 5) card_name = card_name.substring(0, 5);
- th.setData({
- card_field: user.card_field,
- card_name: card_name
- });
- if (t.data.data[user.card_field] > 0) t.data.data.shop_price = t.data.data[user.card_field];
- }
- }
- }
- ee.setData({
- data: t.data.data,
- });
- })
- } else {
- ee.setData({
- data: t.data.data,
- });
- }
+
- if (!ee.data.collocationList) {
+ if (!ee.data.collocationList) {
var user_id=getApp().globalData.user_id || 0;
/*---获取活动的重表---*/
//调用接口判断订单优惠，
- getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+user_id, {}).then(res => {
+ getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+user_id, {}).then(res => {
if (res.data.code == 0) {
var r_data = res.data.data;
th.data.is_coupon = r_data.collocationPromList.is_coupon;
+
+ t.data.data.prom_id=r_data.collocationPromList.id;
+
th.loop_promise(0, r_data.collocationList, function () {
var set_data=JSON.parse(JSON.stringify(r_data.collocationList));
@@ -299,8 +271,43 @@ Page({
})
}
- //获取统一条形码,普通商品和优惠促销的商品
- if (t.data.data.prom_type == 5) {
+
+ //--看一下有没有开启等级卡---
+ if (ee.data.rank_switch) {
+ //---回调卡的列表---
+ th.getPlusCardType(function (ob) {
+ var user = getApp().globalData.userInfo;
+ if (user) {
+ if (user.card_field && user['card_expiredate']) {
+ var str = user['card_expiredate'].replace(/-/g, '/');
+ var end = new Date(str);
+ end = Date.parse(end) / 1000;
+ var now = ut.gettimestamp();
+ //--- 判断是等级会员，且在有效期范围内 ---
+ if (user.card_field && now < end) {
+ var card_name = ob.name_map.get(user.card_field);
+ if (card_name && card_name.length > 5) card_name = card_name.substring(0, 5);
+ th.setData({
+ card_field: user.card_field,
+ card_name: card_name
+ });
+ if (t.data.data[user.card_field] > 0) t.data.data.shop_price = t.data.data[user.card_field];
+ }
+ }
+ }
+ ee.setData({
+ data: t.data.data,
+ });
+ })
+ } else {
+ ee.setData({
+ data: t.data.data,
+ });
+ }
+
+
+
+ //获取统一条形码,普通商品和优惠促销的商品
//默认门店要拿下门店库存
if (that.data.sales_rules >= 2) {
//--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
@@ -372,9 +379,7 @@ Page({
ee.get_sto();
}
- } else {
- return getApp().my_warnning("商品没有搭配购的活动", 0, th)
- }
+
}
}
});
@@ -497,10 +502,11 @@ Page({
//-----如果是秒杀，团购，积分购,拼团-----
- if (th.data.data.prom_type != 5) {
- th.setData({lding:0})
- return s.my_warnning("商品不是搭配活动！", 0, th);
- }else{
+ // if (th.data.data.prom_type != 5) {
+ // th.setData({lding:0})
+ // return s.my_warnning("商品不是搭配活动！", 0, th);
+ // }else{
+
//---如果是线下门店销售的时候---
if(th.data.sales_rules>=2){
@@ -569,8 +575,9 @@ Page({
return s.my_warnning("库存不足！", 0, th);
}
th.add_cart_next(e,t,a,o,newd); //加入购物车下一步
- }
- }
+ }
+
+ // }
})
},
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 62cfbc6..01d7539 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -990,7 +990,7 @@ Page({
//-----商品详情---
if (!t.data.data.goods_content) t.data.data.goods_content = " ";
- a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
+ a.wxParse("content", "html",ut.format_content(t.data.data.goods_content), ee, 6);
e.wxParseAddFullImageUrl(ee, "content");
if (ee.data.prom_type) {
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 4076ef1..aa2ce7f 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -784,7 +784,7 @@ Page({
//-----商品详情---
if (!t.data.data.goods_content) t.data.data.goods_content = " ";
- a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
+ a.wxParse("content", "html",ut.format_content( t.data.data.goods_content), ee, 6);
e.wxParseAddFullImageUrl(ee, "content");
ee.setData({
diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
index 2d63582..f2978e8 100644
--- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
@@ -772,7 +772,7 @@ Page({
//-----商品详情---
if (!t.data.data.goods_content) t.data.data.goods_content = " ";
- a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
+ a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
e.wxParseAddFullImageUrl(ee, "content");
ee.setData({
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 165a204..cd31d5b 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -53,6 +53,9 @@ Page({
bn_pickname: "", //选择的门店名称
bn_t_exp_t: 0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流
+ bn_is_order_yh:1, //是不是订单优惠
+ bn_is_post_temp:1, //是不是进行计算包邮模板
+
bn_plus_cut_price: 0, //显示等级卡会优惠多少钱
/*------------------------*/
user_addr: null,//物流
@@ -695,6 +698,19 @@ Page({
//如果有购买活动
item1.promgoodsbuynum = promgoodsbuynum;
+ //如果是秒杀的时候
+ if(item1.prom_type==1){
+ var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
+ + "/" + item1.goods_id + "/1/" + item1.prom_id + "/" + app.globalData.user_id;
+ await app.request.promiseGet(url,{}).then(res=>{
+ if(res.data.code==0){
+ console.log(res.data.data,"111");
+ item1.is_order_yh=res.data.data.is_order_yh;
+ item1.is_post_temp=res.data.data.is_post_temp;
+ }
+ })
+ }
+
//要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
// th.check_is_youhui(item1.goods_id, item1.pick_id);
@@ -1439,6 +1455,17 @@ Page({
t.data.data.thi_rate = tt.data.data.thi_rate;
t.data.data.commission = tt.data.data.commission;
+ if(tt.data.data.is_order_yh){
+ th.data.bn_is_order_yh=1;
+ }else{
+ th.data.bn_is_order_yh=0;
+ }
+
+ if(tt.data.data.is_post_temp){
+ th.data.bn_is_post_temp=1;
+ }else{
+ th.data.bn_is_post_temp=0;
+ }
} else {
t.data.data.prom_id = 0;
@@ -1958,6 +1985,11 @@ Page({
var zh_prom_goods = c_arr[i].zh_prom_goods; //组合购计算的原始数据存储空间
var ladder_prom_goods = c_arr[i].ladder_prom_goods; //组合购计算的原始数据存储空间
+
+ var no_order_yh=0; //-- 有些活动不能和订单优惠叠加的金额 --
+ var no_post_temp=0; //-- 有些活动不能和包邮模板的金额 --
+
+
if (th.data.using_quan[pickid] != null && th.data.using_quan[pickid] != undefined)
quan_no = th.data.using_quan[pickid].coupon_no;
@@ -2010,6 +2042,15 @@ Page({
}
o_price += item[j].goods_price * item[j].goods_num;
+ //-- 秒杀的时候，判断有没有订单优惠和包邮模板的叠加 --
+ if(item[j].prom_type==1 ){
+ if(!item[j].is_order_yh)
+ no_order_yh+=item[j].goods_price * item[j].goods_num;
+ if(!item[j].is_post_temp)
+ no_post_temp+=item[j].goods_price * item[j].goods_num;
+ }
+
+
}
//判断是不是有组合购的金额
var f_o_price = o_price;
@@ -2108,15 +2149,15 @@ Page({
})
}
- var user_addr = th.data.user_addr;
+ var user_addr=th.data.user_addr;
var req_d = {
province: user_addr.province, city: user_addr.city, district: user_addr.district,
- wuliu: parseFloat(o_price - quan_price - whsle_goods_price).toFixed(2), store_id: os.stoid
+ wuliu:parseFloat(o_price - quan_price-whsle_goods_price-no_post_temp).toFixed(2),store_id: os.stoid
}
await getApp().request.promisePost("/api/weshop/order/areaFreight", {
is_json: 1, data: req_d
}).then(rs => {
- if (rs.data.code == 0) back_data = rs.data.data;
+ if (rs.data.code == 0) back_data =rs.data.data;
});
}
@@ -2288,6 +2329,10 @@ Page({
}
+ if(no_order_yh){
+ o_condition=o_condition-no_order_yh;
+ t_o_condition=t_o_condition-no_order_yh;
+ }
var order_m = 0;
//---判断是不是有订单优惠---
@@ -2735,11 +2780,15 @@ Page({
store_id: os.stoid
}
var back_data = null;
- await getApp().request.promisePost("/api/weshop/order/areaFreight", {
- is_json: 1, data: req_d
- }).then(rs => {
- if (rs.data.code == 0) back_data = rs.data.data;
- });
+
+ //判断是不是包邮模板
+ if(th.data.bn_is_post_temp){
+ await getApp().request.promisePost("/api/weshop/order/areaFreight", {
+ is_json: 1, data: req_d
+ }).then(rs => {
+ if (rs.data.code == 0) back_data = rs.data.data;
+ });
+ }
//如果有包邮券的不包邮商品的时候
if (quan_no_goods_arr) {
@@ -2886,7 +2935,7 @@ Page({
o_condition = 0;
}
-
+
//预存金额使用参与计算
if(th.data.udata && th.data.udata.Balance>0 && order_m*1>0){
if(!th.data.bn_goods.keyid){
@@ -2984,9 +3033,8 @@ Page({
})
}
+ if (o_condition > 0 && th.data.bn_is_order_yh) {
-
- if (o_condition > 0) {
th.check_is_order_prom(o_condition, async function () {
var order_prom_amount = 0;
var order_prom_id = 0;
@@ -3379,11 +3427,12 @@ Page({
},
async submit_func(){
- let cartlist = this.data.cartlist || []
+ let cartlist = this.data.cartlist || [];
let allarr=[]
let strarr=[]
let cbarr=[]
let cbarr_id=[]
+
if(cartlist && cartlist.length>0){
for (let index = 0,length=cartlist.length; index < length; index++) {
let item=cartlist[index].goods
@@ -3397,6 +3446,7 @@ Page({
}
}
}
+
if(strarr.length>0){
if(allarr.length>0){
allarr.map(item=>{
@@ -3475,6 +3525,12 @@ Page({
if (this.data.is_summit_ing) return false;
this.data.is_summit_ing = 1;
+ function is_ok_wu_arr(index,name){
+ if(!th.data.wu_arr) return '';
+ if(!th.data.wu_arr[index]) return '';
+ return th.data.wu_arr[name];
+ }
+
var th = this, pdata = new Array();
var ff = true;
//------------立即购买-------------
@@ -3506,8 +3562,8 @@ Page({
//'mobile': th.data.userinfo.mobile,
'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile,
'email': '',
- 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code,
- 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name,
+ 'shipping_code': th.data.bn_exp_type == 1 ? 0 : is_ok_wu_arr(th.data.index,'code'),
+ 'shipping_name': th.data.bn_exp_type == 1 ? '' : is_ok_wu_arr(th.data.index,'name'),
'invoice_title': '',
'goods_price': parseFloat(th.data.formData.all_price).toFixed(2), //商品总价
'shipping_price': parseFloat(th.data.formData.shipping_price).toFixed(2), //物流金额
@@ -3784,8 +3840,8 @@ Page({
'more_address': addr == null ? "" : addr.more_address,
'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile,
'email': '',
- 'shipping_code': th.data.is_all_zt == 1 ? 0 : th.data.wu_arr[t_item.wind].code,
- 'shipping_name': th.data.is_all_zt == 1 ? '' : th.data.wu_arr[t_item.wind].name,
+ 'shipping_code': th.data.is_all_zt == 1 ? 0 : is_ok_wu_arr(t_item.wind,'code'),
+ 'shipping_name': th.data.is_all_zt == 1 ? '' : is_ok_wu_arr(t_item.wind,'name'),
'invoice_title': '',
'goods_price': parseFloat(t_item.goods_price).toFixed(2), //商品总价
'shipping_price': parseFloat(t_item.shipping_price).toFixed(2), //物流金额
diff --git a/packageE/pages/user/cardinfo/cardinfo.js b/packageE/pages/user/cardinfo/cardinfo.js
index 202e3a1..afa3ae1 100644
--- a/packageE/pages/user/cardinfo/cardinfo.js
+++ b/packageE/pages/user/cardinfo/cardinfo.js
@@ -63,7 +63,7 @@ Page({
getApp().request.promiseGet("/api/weshop/storeconfig/get/" + os.stoid, {
}).then(res => {
var is_cardrule = res.data.data.cardrules;
- w.wxParse("content", "html", is_cardrule, ee, 6);
+ w.wxParse("content", "html", ut.format_content(is_cardrule), ee, 6);
ee.setData({
is_card_rule: is_cardrule
});
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index daebd2f..77e4081 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -380,6 +380,12 @@ Page({
}
}
+
+ if(gg.prom_type==4){
+ gd.prom_type =4;
+ gd.prom_id = gg.prom_id;
+ }
+
switch (gd.prom_type) {
case 0:
case 2:
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 988baee..32bfc1b 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -293,38 +293,40 @@
-
-
-
-
- {{classify_name}}
-
- 更多
-
-
+
+
+
+ {{classify_name}}
+
+ 更多
+
-
-
+
+
+
+ 该类别无子级
+
+ -->
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
@@ -347,8 +349,19 @@
+
+
+
+
+
+
+
+ {{item.items.name}}
+
+
+
-
+
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 48a4978..d019da6 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -272,8 +272,8 @@ Page({
first_leader = t.first_leader,
room_id = t.room_id,
room_user_share = t.room_user_share, //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
- prom_type = t.prom_type,
- prom_id = t.prom_id; //活动ID
+ prom_type = t.prom_type || 0,
+ prom_id = t.prom_id || 0; //活动ID
var share_openid = t.share_openid;
@@ -982,7 +982,7 @@ Page({
//-- 把商品的赋值,同时给活动赋值 --
ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
- if (t.data.data.prom_type && t.data.data.prom_id) {
+ if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) {
ee.data.prom_type = t.data.data.prom_type;
ee.data.prom_id = t.data.data.prom_id;
}
@@ -1014,7 +1014,8 @@ Page({
//-----商品详情---
if (!t.data.data.goods_content) t.data.data.goods_content = " ";
- a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
+
+ a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
e.wxParseAddFullImageUrl(ee, "content");
if (ee.data.prom_type) {
@@ -1113,10 +1114,25 @@ Page({
}
});
}
+
+ console.log('bbbbbbbbbbbbbb');
+ console.log(th.data.prom_type);
+
+
+ setTimeout(()=> {
+ console.log('cccc');
+ console.log(th.data.prom_type);
+ },500)
+
+
+
}
});
})
+ console.log('aaaaaaaaaa');
+ console.log(this.data.prom_type);
+
this.data.enterAddressPage && (this.data.enterAddressPage = !1);
@@ -2603,7 +2619,7 @@ Page({
callback();
} else {
//-- 判断有没有优惠活动 --
- getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0" + "/" + usr.user_id, {}).then(res => {
+ getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0" + "/" + usr.user_id, {}).then(res => {
if (res.data.code == 0) {
var r_data = res.data.data;
th.data.prom_goods = r_data.promGoodsLists;
@@ -7064,7 +7080,7 @@ Page({
} else {
//调用接口判断订单优惠，
- getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
+ getApp().request.get("/api/weshop/goods/getGoodsPromListNew/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
success: function (res) {
if (res.data.code == 0 && res.data.data) {
var r_data = res.data.data;
@@ -7300,9 +7316,13 @@ Page({
getApp().goto("/packageB/pages/zuhegou/index/index?id=" + id);
},
- check_zh_acting: function (func) {
- var isok = 1,
+ check_zh_acting: function (func,item) {
+ var isok = 1;
+ if(!item){
item = this.data.sele_g;
+ }
+
+
//如果有组合购
var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.user_id;
getApp().request.promiseGet(url, {}).then(res => {
@@ -7398,10 +7418,10 @@ Page({
new_arr.push(item);
}
- if (new_arr.length == 1) {
- th.data.prom_id = new_arr[0].act_id;
- th.data.prom_type = new_arr[0].prom_type;
- }
+ // if (new_arr.length == 1) {
+ // th.data.prom_id = new_arr[0].act_id;
+ // th.data.prom_type = new_arr[0].prom_type;
+ // }
th.setData({
more_flash: new_arr
@@ -7516,7 +7536,11 @@ Page({
var arr2 = arr.filter(function (e) {
return e.s_time < ut.gettimestamp();
})
-
+
+ var arr3 = arr.filter(function (e) {
+ return e.s_time < ut.gettimestamp() && e.prom_type==7;
+ })
+
//-- 如果只有一个活动的话 --
if (arr.length == 1) {
th.data.prom_type = arr[0].prom_type;
@@ -7527,6 +7551,30 @@ Page({
th.data.prom_type = arr2[0].prom_type;
th.data.prom_id = arr2[0].act_id;
}
+
+
+ if(arr3 && arr3.length>0){
+ //获取活动信息
+ var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
+ arr3[0].act_id + "/" + getApp().globalData.user_id;
+ getApp().request.get(url, {
+ success: function (e) {
+ if (e.data.code == 0 && e.data.data) {
+ if (ut.gettimestamp() < e.data.data.start_time) {
+ return false;
+ }
+ if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
+ //-- 获取商品列表 --
+ th.setData({
+ zh_act: e.data.data
+ });
+ }
+
+ }
+ }
+ });
+ }
+
}
//-- 调用回调 --
func();
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index d776779..d0ce6b0 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -15,7 +15,7 @@ Page({
requestData: null,
allData: null,
openFilterModal: !1,
- baseUrl: "/api/weshop/goods/page?1=1",
+ baseUrl: "/api/weshop/goods/page?isnewwhere=1",
requestUrl: "",
old_req_url:'',
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index 7102c02..81a10a0 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -15,7 +15,7 @@ Page({
allData: null,
openFilterModal: !1,
openSearchModal: !1,
- baseUrl: "/api/weshop/goods/page?1=1",
+ baseUrl: "/api/weshop/goods/page?isnewwhere=1",
requestUrl: "",
old_req_url:'',
//hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ]
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 316fd04..1da7ff8 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -680,7 +680,7 @@ Page({
th.setData({ paying: 0 });
return false;
}
-
+
//当是组合优惠的时候
if (good.prom_type == 7) {
//如果有组合购
@@ -706,6 +706,7 @@ Page({
isok = 0;
}
+
} else {
//未找到商品的活动
isok = 0;
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index d14558a..0fffe61 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -108,7 +108,7 @@ Page({
var switch_list = res.data.data.switch_list;
var swi_arr = JSON.parse(switch_list);
- w.wxParse("content", "html", is_cardrule, that, 6);
+ w.wxParse("content", "html", ut.format_content(is_cardrule), that, 6);
that.setData({
is_card_rule: is_cardrule,
isyaoqingma: parseInt(swi_arr.isyaoqingma),
diff --git a/utils/util.js b/utils/util.js
index ac6b76f..299a655 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -591,6 +591,16 @@ function calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight,
return rspice;
}
+function format_content(str_con){
+ str_con=str_con.replaceAll("display:block;", 'display:none;');
+ str_con=str_con.replaceAll("display: block;", 'display:none;');
+
+ str_con=str_con.replaceAll("position:absolute;", '');
+ str_con=str_con.replaceAll("position: absolute", '');
+
+ return str_con;
+}
+
module.exports = {
formatTime: function(e, r) {
var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
@@ -772,4 +782,5 @@ module.exports = {
wx_back:wx_back,
_debounce,
calculatewuliu:calculatewuliu, //计算物流的函数进行抽象
+ format_content
};