diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js
index 3d5d7d5..4d70ce1 100644
--- a/packageA/pages/checkin/checkin.js
+++ b/packageA/pages/checkin/checkin.js
@@ -2,6 +2,7 @@
var md5 = require("../../../utils/md5.js");
var ut = require("../../../utils/util.js");
const app = getApp();
+const os=app.globalData.setting;
let self;
Page({
@@ -77,6 +78,27 @@ Page({
});
self.loadQd();
});
+
+ // 广告
+ getApp().request.promiseGet("/api/weshop/ad/page?pid=1205&store_id=" + os.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+ var a = res.data.data.pageData;
+ var narr=[];
+ for(var i in a){
+ var tt = {
+ 'ad_code': os.imghost + a[i].ad_code,
+ 'media_link': '',
+ 'ad_weapplink':a[i].ad_weapplink
+ };
+ narr.push(tt);
+ }
+ self.setData({ad_data:narr});
+ }
+ });
},
@@ -362,6 +384,11 @@ Page({
var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
//return y + "-" + m + "-" + d;
return [m + "-" + d,dd.getDate()];
+ },
+ go_url(e){
+ let url=e.currentTarget.dataset.url;
+ if(url){
+ getApp().goto(url);
+ }
}
-
})
diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml
index 04b5b9b..ac082ff 100644
--- a/packageA/pages/checkin/checkin.wxml
+++ b/packageA/pages/checkin/checkin.wxml
@@ -1,12 +1,13 @@
-
+
+
规则
- 我的积分
-
+
+ 我的积分
+
-
+{{res.cday1}}
@@ -38,7 +39,7 @@
-
+
{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}}
@@ -48,14 +49,14 @@
补签(-{{res.getBQIntegral}}分)
-
-
+
+
+ -->
-
+
@@ -64,35 +65,35 @@
补签卡：{{res.getkbqnum}}
-
-
-
+
+
-
-
-
- {{item}}
-
-
-
-
-
-
- {{item.num}}
-
-
-
-
+
+
+
+ {{item}}
+
+
+
+
+
+
+ {{item.num}}
+
+
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/packageA/pages/checkin/checkin.wxss b/packageA/pages/checkin/checkin.wxss
index 597b366..f524734 100644
--- a/packageA/pages/checkin/checkin.wxss
+++ b/packageA/pages/checkin/checkin.wxss
@@ -197,7 +197,7 @@ page,
.jfbuy {
/* border: 2rpx solid black; */
border-radius: 16rpx;
- padding: 40rpx 30rpx;
+ /* padding: 40rpx 30rpx; */
background-color: #FF980F;
box-shadow: 0 2rpx 16rpx #FF7A07;
/* position: fixed;
diff --git a/packageA/pages/checkin/g_filter.wxs b/packageA/pages/checkin/g_filter.wxs
new file mode 100644
index 0000000..0015aca
--- /dev/null
+++ b/packageA/pages/checkin/g_filter.wxs
@@ -0,0 +1,38 @@
+var g_filters = {
+ has_char:function(url,key){
+ if(!url) return -1;
+ return url.indexOf(key);
+ },
+ beg_time:function(beg_date){
+ var fmt1 = beg_date.substring(0, 19);
+ var reg = getRegExp("-", "g");
+ var fmt2 = fmt1.replace(reg, '/');
+ var t1 = getDate(fmt2);
+ var tnow=getDate();
+ if(t1<=tnow) return 1;
+ return 0;
+ },
+ end_time:function(end_date){
+ var fmt1 = end_date.substring(0, 19);
+ var reg = getRegExp("-", "g");
+ var fmt2 = fmt1.replace(reg, '/');
+ var t1 = getDate(fmt2);
+ var tnow=getDate();
+ if(t1>=tnow) return 1;
+ return 0;
+ },
+ goToUrl: function(type, id, name) {
+ if (type == 1) {
+ return "/packageB/pages/zuhegou/index/index?id="+id+"&title="+name
+ } else {
+ return "/packageB/pages/zuhegou/preIndex/index?id="+id+"&title="+name
+ }
+ },
+
+}
+module.exports = {
+ has_char: g_filters.has_char,
+ beg_time: g_filters.beg_time,
+ end_time: g_filters.end_time,
+ goToUrl: g_filters.goToUrl,
+}
\ No newline at end of file
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index 0c8e2ef..45d30d6 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -269,6 +269,7 @@ Page({
if (res.data.code == 0) {
var r_data = res.data.data;
+
th.data.is_coupon = r_data.collocationPromList.is_coupon;
diff --git a/packageB/pages/evaluate/evaluate.js b/packageB/pages/evaluate/evaluate.js
index bbc29d5..5cb90b6 100644
--- a/packageB/pages/evaluate/evaluate.js
+++ b/packageB/pages/evaluate/evaluate.js
@@ -26,6 +26,7 @@ Page({
is_act:0, //是否能购获取图片
actId:0, //活动ID
giftBagId:0, //礼包ID
+ ftype:0
},
//点击星级
@@ -98,8 +99,19 @@ Page({
//查询美导信息
query_bea: function() {
- var th = this;
- var url = "/api/weshop/order/pagePosOrder";
+ var th = this;
+ var url = "/api/weshop/order/pagePosOrder";
+
+ switch (this.data.ftype){
+ case 3:
+ break;
+ case 4:
+ url = "/api/weshop/serviceCard/pagePos";
+ break;
+ default:
+ break
+ }
+
var number = th.data.number; //订单编号
getApp().request.promiseGet(url, {
data: {
@@ -175,10 +187,10 @@ Page({
var url = th.data.url + "/api/weshop/evaluation/evaluate/insert";
var posNo = th.data.number; //收银单号
var proposal = th.data.proposal; //用户建议内容
- var fromType = th.data.fromType; //评价来源
+ var fromType = th.data.ftype?th.data.ftype:1; //评价来源
var json = {
"evaLabList": evaLabList,
- "fromType": 1,
+ "fromType": fromType,
"number": posNo,
"remark": proposal,
"star": stars + 1,
@@ -197,9 +209,15 @@ Page({
if (res.data.code == 0) {
getApp().my_warnning("评价成功", 1, th);
var namber=th.data.number;
+
+ var url="/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1";
+ if(th.data.ftype==4){
+ url="/pages/user/index/index";
+ }
+
setTimeout(function() {
wx.redirectTo({
- url: "/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1"
+ url: url
});
}, 2000);
} else {
@@ -218,11 +236,17 @@ Page({
number: options.number,
//is_evaluate: options.evaluate
})
+
+ if(options.fromtype){
+ this.setData({ftype:parseInt(options.fromtype)}) ;
+ if(options.fromtype==4) th.judge_act();
+ }
//th.query_bea();
- //th.judge_act();
+
var userinfo=getApp().globalData.userInfo;
console.log("userinfo",userinfo)
-
+
+
if(!userinfo){
getApp().goto("/pages/togoin/togoin");
}
@@ -260,9 +284,11 @@ Page({
var id=this.data.actId;
var gifbagid = this.data.gifbagid;
- console.log(id,"订单", this.data.number),
+ console.log(id,"订单", this.data.number);
+
+ var ty=this.data.ftype?this.data.ftype:2;
wx.redirectTo({
- url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number
+ url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number
});
},
@@ -271,10 +297,13 @@ Page({
judge_act: function () {
var th = this;
var url = "/api/weshop/marketing/comment/act/judge";
+
+ var ty=this.data.ftype?this.data.ftype:2;
+
getApp().request.promiseGet(url, {
data: {
orderNumber: th.data.number,
- orderType: 2,
+ orderType: ty,
storeId: a.stoid,
userId: d.user_id
}
diff --git a/packageB/pages/evaluate/evaluate.wxml b/packageB/pages/evaluate/evaluate.wxml
index ebfa0e5..e2db52d 100644
--- a/packageB/pages/evaluate/evaluate.wxml
+++ b/packageB/pages/evaluate/evaluate.wxml
@@ -17,7 +17,7 @@
购买商品：
- {{it.list[0].WareName}}
+ {{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}
@@ -94,13 +94,14 @@
-
+
评价其他
查看已评价的订单
+
@@ -133,7 +134,7 @@
商品详情
- {{item.WareName}}
+ {{item.WareName?item.WareName:item.ItemName}}
{{item.Qty}}
diff --git a/packageB/pages/zuhegou/list/list.js b/packageB/pages/zuhegou/list/list.js
index 3060968..662d908 100644
--- a/packageB/pages/zuhegou/list/list.js
+++ b/packageB/pages/zuhegou/list/list.js
@@ -251,6 +251,12 @@ Page({
if (hei< viewHeight) {
this.setData({ max_sw_height: viewHeight });
}
- }
+ },
+ go_url(e){
+ let url=e.currentTarget.dataset.url;
+ if(url){
+ getApp().goto(url);
+ }
+ }
});
diff --git a/packageB/pages/zuhegou/preindex/index.wxml b/packageB/pages/zuhegou/preindex/index.wxml
index cf64874..6a7929e 100644
--- a/packageB/pages/zuhegou/preindex/index.wxml
+++ b/packageB/pages/zuhegou/preindex/index.wxml
@@ -6,7 +6,7 @@
- 距结束还剩
+ 距开始还剩
{{djs.day}}天
{{djs.hou}}
:
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
index 7e4956c..efeb85c 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
@@ -1605,16 +1605,19 @@ Page({
}).then(res => {
if (res.data.code == 0) {
var ord_prom = res.data.data;
- order_prom_id = ord_prom['id'];
- switch (ord_prom['type']) {
- case 0:
- order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
- order_prom_amount = (o_condition - order_m).toFixed(2);
- break;
- case 1:
- //order_m = o_condition - ord_prom['expression'];//满额优惠金额
- order_prom_amount = ord_prom['expression'];
- break;
+ //么有使用券，或者活动没有限制使用优惠券
+ if(quan_price<=0 || !ord_prom.is_xz_yh) {
+ order_prom_id = ord_prom['id'];
+ switch (ord_prom['type']) {
+ case 0:
+ order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+ order_prom_amount = (o_condition - order_m).toFixed(2);
+ break;
+ case 1:
+ //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+ order_prom_amount = ord_prom['expression'];
+ break;
+ }
}
}
})
@@ -1955,16 +1958,20 @@ Page({
var order_prom_id = 0;
if (th.data.order_prom[th.data.bn_pick]) {
var ord_prom = th.data.order_prom[th.data.bn_pick];
- order_prom_id = ord_prom['id'];
- switch (ord_prom['type']) {
- case 0:
- order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
- order_prom_amount = (o_condition - order_m).toFixed(2);
- break;
- case 1:
- order_m = o_condition - ord_prom['expression'];//满额优惠金额
- order_prom_amount = ord_prom['expression'];
- break;
+
+ //么有使用券，或者活动没有限制使用优惠券
+ if(coupon_price<=0 || !ord_prom.is_xz_yh) {
+ order_prom_id = ord_prom['id'];
+ switch (ord_prom['type']) {
+ case 0:
+ order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+ order_prom_amount = (o_condition - order_m).toFixed(2);
+ break;
+ case 1:
+ order_m = o_condition - ord_prom['expression'];//满额优惠金额
+ order_prom_amount = ord_prom['expression'];
+ break;
+ }
}
}
//--订单优惠的显示--
diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js
index b1ad6f5..7c3cffd 100644
--- a/packageC/pages/payForAnother/payForAnother.js
+++ b/packageC/pages/payForAnother/payForAnother.js
@@ -1508,16 +1508,19 @@ Page({
}).then(res => {
if (res.data.code == 0) {
var ord_prom = res.data.data;
- order_prom_id = ord_prom['id'];
- switch (ord_prom['type']) {
- case 0:
- order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
- order_prom_amount = (o_condition - order_m).toFixed(2);
- break;
- case 1:
- //order_m = o_condition - ord_prom['expression'];//满额优惠金额
- order_prom_amount = ord_prom['expression'];
- break;
+ //么有使用券，或者活动没有限制使用优惠券
+ if(quan_price<=0 || !ord_prom.is_xz_yh) {
+ order_prom_id = ord_prom['id'];
+ switch (ord_prom['type']) {
+ case 0:
+ order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+ order_prom_amount = (o_condition - order_m).toFixed(2);
+ break;
+ case 1:
+ //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+ order_prom_amount = ord_prom['expression'];
+ break;
+ }
}
}
})
@@ -1855,16 +1858,19 @@ Page({
var order_prom_id = 0;
if (th.data.order_prom[th.data.bn_pick]) {
var ord_prom = th.data.order_prom[th.data.bn_pick];
- order_prom_id = ord_prom['id'];
- switch (ord_prom['type']) {
- case 0:
- order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
- order_prom_amount = (o_condition - order_m).toFixed(2);
- break;
- case 1:
- order_m = o_condition - ord_prom['expression'];//满额优惠金额
- order_prom_amount = ord_prom['expression'];
- break;
+ //么有使用券，或者活动没有限制使用优惠券
+ if(coupon_price<=0 || !ord_prom.is_xz_yh) {
+ order_prom_id = ord_prom['id'];
+ switch (ord_prom['type']) {
+ case 0:
+ order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+ order_prom_amount = (o_condition - order_m).toFixed(2);
+ break;
+ case 1:
+ order_m = o_condition - ord_prom['expression'];//满额优惠金额
+ order_prom_amount = ord_prom['expression'];
+ break;
+ }
}
}
//--订单优惠的显示--
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index 6ffa3a9..9374ed6 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -700,10 +700,13 @@ Page({
}
}
//--订单优惠的显示--
+ var order_prom_txt1 = "order_prom_id";
+ var order_prom_txt2 = "order_prom_amount";
if (order_prom_id > 0) {
- var order_prom_txt1 = "order_prom_id";
- var order_prom_txt2 = "order_prom_amount";
th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
+ }else{
+ o_condition1=ord_price;
+ th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0})
}
o_condition1=parseFloat(o_condition1)-parseFloat(th.data.presell.presell_deposit);
@@ -1826,18 +1829,21 @@ Page({
var order_m=0;
if (th.data.order_prom[bn_pick]) {
var ord_prom = th.data.order_prom[bn_pick];
- order_prom_id = ord_prom['id'];
- switch (ord_prom['type']) {
- case 0:
- order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
- order_prom_amount = (ord_price - order_m).toFixed(2);
- break;
- case 1:
- order_m = ord_price - ord_prom['expression'];//满额优惠金额
- order_prom_amount = ord_prom['expression'];
- break;
+ //么有使用券，或者活动没有限制使用优惠券
+ if(quan_price<=0 || !ord_prom.is_xz_yh) {
+ order_prom_id = ord_prom['id'];
+ switch (ord_prom['type']) {
+ case 0:
+ order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
+ order_prom_amount = (ord_price - order_m).toFixed(2);
+ break;
+ case 1:
+ order_m = ord_price - ord_prom['expression'];//满额优惠金额
+ order_prom_amount = ord_prom['expression'];
+ break;
+ }
+ ord_price = order_m;
}
- ord_price=order_m;
}
//--订单优惠的显示--
diff --git a/packageC/pages/presell/list/list.js b/packageC/pages/presell/list/list.js
index 0667eff..c6323d9 100644
--- a/packageC/pages/presell/list/list.js
+++ b/packageC/pages/presell/list/list.js
@@ -228,9 +228,11 @@ Page({
th.setData({ [txt]: obj});
}
},
-
-
-
-
+ go_url(e){
+ let url=e.currentTarget.dataset.url;
+ if(url){
+ getApp().goto(url);
+ }
+ },
});
diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index 82fb069..0eaca33 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -266,5 +266,11 @@ Page({
title: '秒杀活动-' + store_name,
}
},
+ go_url(e){
+ let url=e.currentTarget.dataset.url;
+ if(url){
+ getApp().goto(url);
+ }
+},
});
\ No newline at end of file
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index d583d14..d8c38c0 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -243,6 +243,12 @@ Page({
if (hei< viewHeight) {
this.setData({ max_sw_height: viewHeight });
}
- }
+ },
+ go_url(e){
+ let url=e.currentTarget.dataset.url;
+ if(url){
+ getApp().goto(url);
+ }
+ },
});
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 95bfc3e..81f1105 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -625,28 +625,28 @@ Page({
if (arr.length > 0) {
for (var j = 0; j < arr.length; j++) {
if (arr[j].pickup_id == pcid) {
- //if(item.is_gift!=1){
- //确定配送方式
- if (arr[j].distr_t == 0) {
- arr[j].distr_t = car_item.distr_type;
- }
- var e_t = 0
- switch (arr[j].distr_t) {
- case 0:
- e_t = 1;
- if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
- break;
- case 1:
- e_t = 1;
- break;
- case 2:
- e_t = 0;
- break;
+ if(item.is_gift!=1){
+ //确定配送方式
+ if (arr[j].distr_t == 0) {
+ arr[j].distr_t = car_item.distr_type;
+ }
+ var e_t = 0
+ switch (arr[j].distr_t) {
+ case 0:
+ e_t = 1;
+ if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
+ break;
+ case 1:
+ e_t = 1;
+ break;
+ case 2:
+ e_t = 0;
+ break;
+ }
+ arr[j].exp_type = e_t;
+ if (e_t == 0) th.setData({is_all_zt: 0});
+ else if(e_t==1) th.setData({is_all_zt: 1});
}
- arr[j].exp_type = e_t;
- if (e_t == 0) th.setData({is_all_zt: 0});
- else if(e_t==1) th.setData({is_all_zt: 1});
- //}
//-- 把等级卡会优惠多少钱装进去 --
if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1;
@@ -689,6 +689,7 @@ Page({
}
//如果是物流的话，全部自提的控制要弄成0
if (e_t == 0) th.setData({is_all_zt: 0});
+ else th.setData({is_all_zt: 1});
var narr = new Array();
narr.push(car_item);
@@ -920,7 +921,6 @@ Page({
th.data.check_quan_price_list = t.data.data.offline_price * gg.goods_num + "";
th.data.check_quan_ware_list = t.data.data.erpwareid + "";
}
-
t.data.data.prom_id = 0;
t.data.data.prom_type = 0;
@@ -976,6 +976,12 @@ Page({
if (gg.prom_type == 5) {
t.data.data.prom_id = gg.prom_id;
t.data.data.prom_type = 5;
+
+ // console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon)
+ th.is_coupon = gg.is_coupon;
+ th.setData({
+ is_coupon: gg.is_coupon
+ });
if (gg.room_id) {
t.data.data.room_id = gg.room_id;
}
@@ -1050,6 +1056,9 @@ Page({
th.calculatePrice2();
th.get_cart_quan();
});
+
+
+
} else {
//计算价格
th.calculatePrice2();
@@ -1724,16 +1733,19 @@ Page({
}).then(res => {
if (res.data.code == 0) {
var ord_prom = res.data.data;
- order_prom_id = ord_prom['id'];
- switch (ord_prom['type']) {
- case 0:
- order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
- order_prom_amount = (o_condition - order_m).toFixed(2);
- break;
- case 1:
- //order_m = o_condition - ord_prom['expression'];//满额优惠金额
- order_prom_amount = ord_prom['expression'];
- break;
+ //么有使用券，或者活动没有限制使用优惠券
+ if(quan_price<=0 || !ord_prom.is_xz_yh) {
+ order_prom_id = ord_prom['id'];
+ switch (ord_prom['type']) {
+ case 0:
+ order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+ order_prom_amount = (o_condition - order_m).toFixed(2);
+ break;
+ case 1:
+ //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+ order_prom_amount = ord_prom['expression'];
+ break;
+ }
}
}
})
@@ -2079,16 +2091,19 @@ Page({
var order_prom_id = 0;
if (th.data.order_prom[th.data.bn_pick]) {
var ord_prom = th.data.order_prom[th.data.bn_pick];
- order_prom_id = ord_prom['id'];
- switch (ord_prom['type']) {
- case 0:
- order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
- order_prom_amount = (o_condition - order_m).toFixed(2);
- break;
- case 1:
- order_m = o_condition - ord_prom['expression'];//满额优惠金额
- order_prom_amount = ord_prom['expression'];
- break;
+ //么有使用券，或者活动没有限制使用优惠券
+ if(coupon_price<=0 || !ord_prom.is_xz_yh) {
+ order_prom_id = ord_prom['id'];
+ switch (ord_prom['type']) {
+ case 0:
+ order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+ order_prom_amount = (o_condition - order_m).toFixed(2);
+ break;
+ case 1:
+ order_m = o_condition - ord_prom['expression'];//满额优惠金额
+ order_prom_amount = ord_prom['expression'];
+ break;
+ }
}
}
//--订单优惠的显示--
@@ -3257,7 +3272,7 @@ Page({
else {
using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
}
- this.setData({using_quan: using_quan, is_coupon: 2222});
+ this.setData({using_quan: using_quan, is_coupon: th.is_coupon});
return;
}
@@ -3323,7 +3338,7 @@ Page({
else {
using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
}
- this.setData({using_quan: using_quan, is_coupon: 2222});
+ this.setData({using_quan: using_quan, is_coupon: th.is_coupon});
return;
}
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 7be9d90..ff1b79e 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -341,7 +341,6 @@
立即开通
-
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 66e466b..ef632a6 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -83,19 +83,13 @@ Page({
sec_show: 3, //倒计时的秒数
full_ad: null, //全屏广告
full_screen: 0, //全屏广告
+ is_ok_h5:0, //判断要不要显示关注二维码
},
onLoad: async function (tt) {
- // onLoad生命周期内判断
- let obj = wx.getLaunchOptionsSync();
- console.log(obj.scene,'launch_scene');
- if (obj.scene === 1011 || obj.scene === 1012 || obj.scene === 1013 || obj.scene === 1017 ||
- obj.scene === 1047 ||obj.scene === 1089 || obj.scene === 1038) {
- this.setData({is_ok_h5:1})
- }
- var th = this;
+ var th = this;
var first_leader = tt.first_leader;
if (!first_leader && tt.scene) {
var first_leader_str = decodeURIComponent(tt.scene);
@@ -459,6 +453,15 @@ Page({
}
}, 1500)
+ setTimeout(function () {
+ const query = wx.createSelectorQuery();
+ query.select('#off_top').boundingClientRect();
+ query.exec((res) => {
+ if(res && res[0] && res[0].height>0){
+ th.setData({is_ok_h5:1});
+ }
+ })
+ },3600);
},
//当隐藏的时候就关闭计时器
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 8404648..ba0ca97 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -16,7 +16,7 @@
-
+
@@ -414,7 +414,7 @@
-
+
diff --git a/pages/user/coupons/coupons.wxml b/pages/user/coupons/coupons.wxml
index 8bbddce..4af8c9e 100644
--- a/pages/user/coupons/coupons.wxml
+++ b/pages/user/coupons/coupons.wxml
@@ -81,7 +81,8 @@
- 使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}
+
+ 使用说明:购买礼包得优惠券【消费满{{time.toFix(detail.condition,2)}}元可用】
@@ -107,8 +108,8 @@
- {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}
- 使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
+ 使用说明:{{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};{{detail.Remark1}}
+ 使用说明: {{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}}
diff --git a/pages/user/coupons/filter.wxs b/pages/user/coupons/filter.wxs
index 94bb477..4043c1f 100644
--- a/pages/user/coupons/filter.wxs
+++ b/pages/user/coupons/filter.wxs
@@ -14,7 +14,7 @@ var numFr = {
while (s.length <= rs + 2) {
s += '0';
}
- return s;
+ return f;
},
showBtnText: function(index) {
switch(index) {
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 0ce9fbe..a060b49 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -274,6 +274,10 @@ Page({
pageSize: 100
},
success: async function(res) {
+
+ //判断有没有值，没有值返回
+ if(!ut.ajax_ok(res)) return false;
+
var arr_data = res.data.data.pageData;
var gid = null,
g_qy_list = null,