xt / xcx-book · Commits

Go to a project

Commit 61c494e6a6936683459d45ef682f76b6503a009d

Authored by pengye
1 parent 2f5e2b2e

邀请函、商家详情、商家有礼充值活动未设置有效期展示充值活动

Inline Side-by-side
Showing 16 changed files with 17 additions and 16 deletions
... ... @@ -1143,7 +1143,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr < detail.etime * 1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值', recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1184,7 +1184,7 @@ Page({
})
// 筛选出 未过期的 && 开启状态的充值活动
recharge_data = recharge_data.filter(item => {
return this.data.dataStr < (item.etime * 1) && item.is_open == '1'
return (this.data.dataStr < (item.etime * 1) || !item.etime) && item.is_open == '1'
})
console.log('邀请函--------------充值', recharge_data);
let entry = this.data.titleList
... ...
... ... @@ -1183,7 +1183,7 @@ Page({
})
// 筛选出 未过期的 && 开启状态的充值活动
recharge_data = recharge_data.filter(item => {
return this.data.dataStr < (item.etime * 1) && item.is_open == '1'
return (this.data.dataStr < (item.etime * 1) || !item.etime) && item.is_open == '1'
})
console.log('邀请函--------------充值', recharge_data);
let entry = this.data.titleList
... ...
... ... @@ -994,7 +994,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1222,7 +1222,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1129,7 +1129,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1129,7 +1129,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1128,7 +1128,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1086,7 +1086,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1129,7 +1129,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1128,7 +1128,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -1173,7 +1173,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -597,7 +597,8 @@
border: 2rpx solid #FFEFC5;
border-radius: 22rpx;
text-align: center;
padding: 10rpx;
padding: 10rpx;
margin-top: 20rpx;
}
.sharewidth {
... ...
... ... @@ -65,7 +65,7 @@ Page({
})
// 筛选出 未过期的 && 开启状态的充值活动
recharge_data = recharge_data.filter(item => {
return this.data.dataStr < (item.etime * 1) && item.is_open == '1'
return (this.data.dataStr < (item.etime * 1) || !item.etime) && item.is_open == '1'
})
console.log('所有充值活动--------------', recharge_data);
this.setData({
... ...
... ... @@ -271,7 +271,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('邀请函--------------充值',recharge_data);
this.setData({
recharge_data,
... ...
... ... @@ -282,7 +282,7 @@ Page({
if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';
if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';
if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');
let recharge_data = (this.data.dataStr<detail.etime*1 && detail.is_open == '1') ? detail : ''
let recharge_data = ((this.data.dataStr<detail.etime*1 || !detail.etime) && detail.is_open == '1') ? detail : ''
console.log('商家详情--------------充值',recharge_data);
this.setData({
recharge_data,
... ...