Commit 6d8d9ddf by 高淑倩

集点list

parent 64b880e8
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/pages/pointList/pointList.axml"],"current":"file:///f%3A/code/7_Eleven_Alipay/pages/pointList/pointList.axml"}
\ No newline at end of file
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///f%3A/code/7_Eleven_Alipay/pages/pointDetail/pointDetail.json","file:///f%3A/code/7_Eleven_Alipay/pages/pointDetail/pointDetail.axml","file:///f%3A/code/7_Eleven_Alipay/pages/pointDetail/pointDetail.acss"],"current":"file:///f%3A/code/7_Eleven_Alipay/pages/pointDetail/pointDetail.js"}
\ No newline at end of file
{"files":["f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.axml","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.json","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.js","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.acss","f:\\code\\7_Eleven_Alipay\\utils\\helper.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\tools.wxs","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.json","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.json","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.acss","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\wx2my.js","f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\Behavior.js","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7-Eleven\\src_output\\utils\\util.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.js","f:\\code\\7-Eleven\\src_output\\utils\\wxService.js","f:\\code\\7-Eleven\\src_output\\app.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.acss","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.js","f:\\code\\7-Eleven\\src_output\\utils\\common.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.axml","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.json","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.axml","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.acss","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.axml","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.acss","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.acss","f:\\code\\7-Eleven\\src_output\\app.json","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.json","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.axml"]}
\ No newline at end of file
{"files":["f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.json","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.axml","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.axml","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.json","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.js","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.acss","f:\\code\\7_Eleven_Alipay\\utils\\helper.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\tools.wxs","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.json","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\wx2my.js","f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\Behavior.js","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7-Eleven\\src_output\\utils\\util.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.js","f:\\code\\7-Eleven\\src_output\\utils\\wxService.js","f:\\code\\7-Eleven\\src_output\\app.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.acss","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.js","f:\\code\\7-Eleven\\src_output\\utils\\common.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.axml","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.json","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.axml","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.acss","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.axml","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.acss","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.acss","f:\\code\\7-Eleven\\src_output\\app.json","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.json"]}
\ No newline at end of file
......@@ -14,64 +14,274 @@ wxService.page({
* 页面的初始数据
*/
data: {
pageNo: 1,
pageSize: 10,
totalPages: '',
orderList: [],
noMore: false
id: 0,
imgHeight: 450,
dialog: {
show: false,
image: '../../assets/imgs/point/bgc.png',
content: '优惠券和积分流水',
tip: '立即查看'
},
desc: [],
activityId: '',
type: 0, // 0 不显示 1 显示
popupType: 0, // 默认不跳转 1 优惠券 2 积分
goal: 0,
iconImage: '',
iconImageFinsh: '',
detailImage: '',
countObj: {
surplusPoints: 0,
exchangeCount: 0,
totalPoints: 0,
surplusExchangeCount: 0
},
currentPercent: 0, // 当前进度
isDisabled: false,
hideGetBtn: true, // 默认隐藏 可领取按钮
showGetBtn: true, // 默认展示 未达成按钮
currentStatus: 2, // 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentTimeStatus: 1, // 1 进行中 2 已结束 3 未开始
isAuthorization: false,
},
watch: {
experAccessible(newVal, oldVal) {
if (newVal) {
// 登录接口返回err
const reLoginErrFlag = my.getStorageSync('reLoginErr')
const baseUserInfo = my.getStorageSync('_baseUserInfo')
let id
if (baseUserInfo && !reLoginErrFlag) {
this.setData({
isAuthorization: false
}, () => {
const option = this.options || {}
const { scene } = option
if (scene) {
let idParam = decodeURIComponent(scene).split('&')[0]
let shareId = idParam && idParam.split('=')[1] || 0
id = shareId
} else {
id = option.id
}
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) { },
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
// const { orderNo } = this.options
this.initOrderList(this.data.pageNo, this.data.pageSize);
if (id) {
this.setData({
id
}, () => {
this.getPointDetail(id)
})
}
// 隐藏 dialog
this.isShowDialog(false)
})
}
else if (!baseUserInfo && reLoginErrFlag) {
this.setData({
isAuthorization: true
})
}
else {
this.setData({
isAuthorization: true
})
}
} else {
// 去别的页面
wxService.router(`/subPackage/page/pages/goToHome/goToHome`).replace()
}
}
},
goDetail(e) {
const {
orderNo
} = e.currentTarget.dataset; // pages/consumptionDetails/consumptionDetails
wxService.router(`/pages/consumptionDetails/consumptionDetails?orderNo=${orderNo}`);
// 集点详情
getPointDetail(id) {
my.showLoading({
title: '加载中'
})
wxService.get(`/sale/touchpoints/pointConsumptionActivity/findById/${id}`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
my.hideLoading()
let dialog = this.data.dialog
dialog.show = false
// 弹框背景
dialog.image = data.popupImage
// 是否在有效期
let timeFlag = 1
let endT = data.endTime
let startT = data.startTime
let currentEndTime = (new Date(endT.replace(/-/g, '/'))).getTime();
let currentstartTime = (new Date(startT.replace(/-/g, '/'))).getTime();
let currentTime = (new Date()).getTime();
// 开始时间 小于 现在 && 小于 结束时间 进行中
if (currentstartTime < currentTime && currentTime < currentEndTime) {
timeFlag = 1
} else if (currentEndTime < currentTime) {
// 结束时间 小于 现在时间 已结束
timeFlag = 2
} else if (currentTime < currentstartTime) {
// 未开始
timeFlag = 3
}
this.setData({
activityId: data.id,
type: data.showActivitys,
currentStatus: data.status,
popupType: data.popupType,
goal: data.goal,
iconImage: data.iconImage,
iconImageFinsh: data.iconImageFinsh,
desc: JSON.parse(data.content),
detailImage: data.detailImage,
dialog,
currentTimeStatus: timeFlag
}, () => {
// 1 进行中 2 已结束
if (timeFlag == 2) {
this.showTimeStatus('活动已经结束啦')
} else if (data.status == 3) {
// 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
this.showTimeStatus('活动已经失效啦,看看其他的')
} else {
// 会员集点活动统计信息 进行中且有效
this.getPointConsumptionCount(id)
}
})
}
}
})
},
//获取消费列表
initOrderList(pageNo, pageSize) {
wx2my.showLoading({
showTimeStatus(status) {
my.showToast({
title: `${status}`,
icon: 'none'
})
},
// 会员集点活动统计信息
getPointConsumptionCount(activityId) {
const { memberId } = my.getStorageSync('_baseUserInfo')
my.showLoading({
title: '加载中'
}); // 取会员id
const {
memberId
} = wx2my.getStorageSync('_baseUserInfo');
const params = {
memberId
};
wxService.post(`/sale/order/list?pageNo=${pageNo}&pageSize=${pageSize}`, params).then(res => {
})
wxService.post(`/sale/touchpoints/pointConsumptionCount/getPointConsumptionCount?activityId=${activityId}&memberId=${memberId}`).then(res => {
if (res) {
const {
result,
data
} = res.data;
const { result, data } = res.data
// percent
let newPercent = 0
let hasNum = data.surplusExchangeCount
let totalPoints = data.totalPoints
let goal = this.data.goal
if (hasNum) {
if (parseInt(totalPoints % goal) == 0) {
newPercent = goal
} else {
if (totalPoints) {
newPercent = totalPoints % goal
} else {
newPercent = 0
}
}
} else {
if (totalPoints) {
newPercent = totalPoints % goal
} else {
newPercent = 0
}
}
if (result == 0) {
wx2my.hideLoading(); // 数量
this.setData({
orderList: this.data.pageNo == 1 ? [...data.content] : [...this.data.orderList, ...data.content],
totalPages: data.totalPages
});
countObj: data,
currentPercent: 100 / (this.data.goal / newPercent),
surplusExchangeCount: data.surplusExchangeCount,
hideGetBtn: hasNum ? false : true,
showGetBtn: hasNum ? true : false,
}, () => {
my.hideLoading()
})
}
}
}).finally(() => {
wx2my.hideLoading();
});
})
},
handleCheckGoods() {
const { activityId } = this.data
wxService.router(`/subPackage/page/pages/pointGoodsList/pointGoodsList`).search({ activityId })
},
_closeDialog() {
const { id } = this.data
if (id) this.getPointDetail(id)
},
handleGo() {
// 跳转 popupType: 0 默认不跳转 1 优惠券 2 积分
const { popupType, id } = this.data
if (popupType == 1) {
wxService.router(`/pages/coupons/coupons`)
} else if (popupType == 2) {
wxService.router(`/pages/integralWater/integralWater`)
} else {
// 隐藏 dialog
this.isShowDialog(false)
// 获取最新数据
this.getPointDetail(id)
}
},
// 触点有礼-消费集点兑换
getPointExchange() {
const { activityId } = this.data
const { memberId } = wx.getStorageSync('_baseUserInfo')
my.showLoading({
title: '加载中'
})
wxService.get(`/sale/touchpoints/pointConsumptionExchange/exchange?activityId=${activityId}&memberId=${memberId}`).then(res => {
if (res) {
const { result, data } = res.data
const { popupType, id } = this.data
if (result == 0) {
my.hideLoading()
// 显示 dialog
this.isShowDialog(true)
// popupType == 0 3s 关闭
if (popupType == 0) {
setTimeout(() => {
this.isShowDialog(false)
this.getPointDetail(id)
}, 3000)
}
}
}
})
},
isShowDialog(flag) {
let dialog = this.data.dialog
dialog.show = flag
this.setData({
dialog
})
},
handleToGet() {
// 按钮防止短时间多次点击
const { countObj } = this.data
if (countObj.surplusExchangeCount) {
this.getPointExchange()
}
this.setData({
isDisabled: true
})
setTimeout(() => {
this.setData({
isDisabled: false
})
}, 3000)
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) { },
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
......@@ -83,18 +293,5 @@ wxService.page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
if (this.data.pageNo < this.data.totalPages) {
this.setData({
pageNo: this.data.pageNo + 1,
pageSize: 10,
noMore: true
}); //
this.initOrderList(this.data.pageNo, this.data.pageSize);
} else {
this.setData({
noMore: true
});
}
}
});
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment