xt / xcx-book · Commits

Go to a project

Commit 607d69097b37d1233dffcf7b7b9edee2e5fa1f9f

Authored by pengye
1 parent 163d3b7e
build: skipped

领券后更新已被领取数量

Inline Side-by-side
Showing 9 changed files with 54 additions and 27 deletions
... ... @@ -67,6 +67,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
tablestr: '',
urlsValue: [],
... ... @@ -114,8 +115,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -699,6 +701,7 @@ Page({
themeSixteen,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -907,7 +910,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -951,7 +954,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -67,6 +67,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
tablestr: '',
urlsValue: [],
... ... @@ -114,8 +115,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -654,6 +656,7 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -862,7 +865,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -906,7 +909,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -67,6 +67,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
tablestr: '',
urlsValue: [],
... ... @@ -114,8 +115,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -654,6 +656,7 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -862,7 +865,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -906,7 +909,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -66,6 +66,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
tablestr: '',
urlsValue: [],
... ... @@ -113,8 +114,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -653,6 +655,7 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -861,7 +864,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -905,7 +908,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -68,6 +68,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
screenHeight: '',
attentionAnim: {},
... ... @@ -113,8 +114,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -610,6 +612,7 @@ Page({
whiteBj,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -818,7 +821,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -862,7 +865,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -67,6 +67,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
tablestr: '',
urlsValue: [],
... ... @@ -114,8 +115,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -654,6 +656,7 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -862,7 +865,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -906,7 +909,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -67,6 +67,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
tablestr: '',
urlsValue: [],
... ... @@ -114,8 +115,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -653,6 +655,7 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -861,7 +864,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -905,7 +908,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -75,6 +75,7 @@ Page({
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
tablestr: '',
urlsValue: [],
... ... @@ -122,8 +123,9 @@ Page({
closeModal() {
this.modal.closeModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 页面滚动事件
... ... @@ -687,6 +689,7 @@ Page({
colors,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
}
... ... @@ -895,7 +898,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -939,7 +942,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...
... ... @@ -36,6 +36,7 @@ Page({
dataStr: Date.now() * 1 / 1000,
StyleType:'',
couponArr: [],//待领取的优惠券列表
couponList:[],//优惠券列表
},
couponModal: '',
/**
... ... @@ -55,8 +56,9 @@ Page({
this.couponModal = this.selectComponent("#couponModal");
this.couponModal.showModal()
},
// 关闭优惠券弹框
// 关闭优惠券弹框(更新已被领取数量)
closeCouponModal() {
this.getActivityByIdFun(this.data.couponList,'1')
this.couponModal.closeModal()
},
// 获取商家是否收藏状态
... ... @@ -201,6 +203,7 @@ Page({
couponList,
StyleType,
titleType,
couponList,
}
console.log('获取数据', {
...obj
... ... @@ -248,7 +251,7 @@ Page({
})
},
// 根据券ID获取券详情
getActivityByIdFun(obj) {
getActivityByIdFun(obj,setcoupon) {
App.Activity.GetActivityById({
id: obj.map(item => item.id).join(','),
}).then(res => {
... ... @@ -292,7 +295,7 @@ Page({
return item.is_type == '3'
})
// 免费券判断是否领取，弹框领取
if (freeCoupons.length > 0) {
if (freeCoupons.length > 0 && setcoupon!='1') {
let length = freeCoupons.length - 1
freeCoupons.forEach(i => {
this.getCoupon(i, freeCoupons[length].id, obj)
... ...