Skip to content

7
7_Eleven_Alipay
Commit 77921c0d by 谢中龙
Options

修改集点

parent 0a2315f3
Showing with 699 additions and 331 deletions
.tea/configuration/mini-program.json
{"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":false,"alipay:alipay-mini:_enableAutoPush":false,"alipay:alipay-mini:_appIdList":[{"appid":"2019101168315187","name":"广东7-Eleven会员俱乐部"},{"appid":"2019092667869080","name":"名称释放00279678"},{"appid":"2019092667878018","name":"名称释放00309560"},{"appid":"2019091967575819","name":"名称释放00286936"}],"alipay:alipay-mini:uploadTime":"2020-04-30 19:25:31","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"reLoginErr":false},"alipay:alipay-mini:userAuthorization":[],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.50","alipay:alipay-mini:currentVersion":"1.0.51","alipay:alipay-mini:whiteList":["b.bigaka.com"],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/6ac7a3a5-d755-458e-9da7-1b03a72f61d2.png","isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"alipay:alipay-mini:lastDeviceName":"iPhone 6 Plus","compilerList":[{"title":"普通编译","query":"","page":""},{"title":"超值卡列表","page":"subPackage/page/pages/valueCard/valueCard"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"领券中心详情","page":"subPackage/page/pages/couponCenterInfo/couponCenterInfo","pageQuery":"id=702214327956017152"},{"title":"消费集点列表","page":"pages/pointList/pointList"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"首页","page":"pages/userCenter/userCenter"},{"title":"集点活动详情","page":"pages/pointDetail/pointDetail","pageQuery":"id=702214327956017152"}],"compilerIndex":7,"SimulatorMode":"EMBED"} {"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":true,"alipay:alipay-mini:_enableAutoPush":false,"alipay:alipay-mini:_appIdList":[{"appid":"2019101168315187","name":"广东7-Eleven会员俱乐部"},{"appid":"2019092667869080","name":"名称释放00279678"},{"appid":"2019092667878018","name":"名称释放00309560"},{"appid":"2019091967575819","name":"名称释放00286936"}],"alipay:alipay-mini:uploadTime":"2020-05-20 10:26:00","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"_showCouponDialog":"true","_userInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/T1yVJjXnxgXXXXXXXX","city":"上海市","countryCode":"CN","gender":"m","nickName":"谢中龙","province":"上海"},"reLoginErr":false,"token":"7b904616ad184b23b5e9f78f419abf52","_loginCode":"316aaf42677044da9daba9a368a5UX45","_accreditUserInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/T1yVJjXnxgXXXXXXXX","city":"上海市","countryCode":"CN","gender":"m","nickName":"谢中龙","province":"上海"},"_baseUserInfo":{"applyCardUrl":"https%3A%2F%2Fmemberprod.alipay.com%2Faccount%2Fopenform%2Factivecard.htm%3Fapp_id%3D2019101168315187%26template_id%3D20191018000000002120493000300552%26__webview_options__%3DcanPullDown%253dNO%2526transparentTitle%253dauto%26out_string%3Dalipay","authToken":"composeB431dcd83ab4049bbb2266a29d0c5fE45","member":{"activateAlipayCardTime":"2019-11-07 08:20:12","activateWxCardTime":"2019-06-28 09:58:15","address":"上海市-上海市-浦东新区-盛夏路58号天之骄子创业公寓6号楼蜂巢柜","alipayCardOpenDate":"2019-11-07 08:20:12","alipayUserId":"2088702833166455","brandId":"2711","cardNoAlipay":"svneleven0003335945","cardNoWeixin":"305490426989","code":"770084118008766216","createTime":"2019-06-28 09:58:15","email":"xiezl@bigaka.com","exp":0,"id":"594104268563292160","level":0,"lock":false,"memberWeixin":{"nickname":"言夕","sex":"男"},"memberWeixinApps":[{"appid":"wx700028bf32a3be66","openid":"oUOIF0basUF5heHcuZwvPSEJIG3E","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4"}],"mobile":"18817382046","name":"谢中龙","openid":"of8NluBTFNqUHHpPogObPN2vb3Qo","registerTime":"2019-06-28 09:58:15","sex":"保密","storeId":"2711","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4","updateTime":"2020-04-21 14:16:32"},"memberActivateStatus":true,"memberId":"594104268563292160","outerStr":"{\"activateType\":\"normal\"}","token":"7b904616ad184b23b5e9f78f419abf52"}},"alipay:alipay-mini:userAuthorization":["userInfo"],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.51","alipay:alipay-mini:currentVersion":"1.0.52","alipay:alipay-mini:whiteList":["b.bigaka.com"],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/6ac7a3a5-d755-458e-9da7-1b03a72f61d2.png","isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"alipay:alipay-mini:lastDeviceName":"iPhone 6 Plus","compilerList":[{"title":"普通编译","query":"","page":""},{"title":"超值卡列表","page":"subPackage/page/pages/valueCard/valueCard"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"领券中心详情","page":"subPackage/page/pages/couponCenterInfo/couponCenterInfo","pageQuery":"id=702214327956017152"},{"title":"消费集点列表","page":"pages/pointList/pointList"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"首页","page":"pages/userCenter/userCenter"},{"title":"集点活动详情","page":"pages/pointDetail/pointDetail","pageQuery":"id=711939547193294848"}],"compilerIndex":7,"SimulatorMode":"EMBED"}
\ No newline at end of file \ No newline at end of file
.tea/editor.json
This source diff could not be displayed because it is too large. You can view the blob instead.
.tea/editorTabs.json
{"tabs":["file:///d%3A/work/711Web/711/7_Eleven_Alipay/config/index.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointList/pointList.acss","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointList/pointList.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.axml"],"current":"file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","storageVersion":"0.70.14"} {"tabs":["file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js"],"current":"file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","storageVersion":"0.70.14"}
\ No newline at end of file \ No newline at end of file
.tea/entryFiles-production/index$.web.js
...@@ -15,6 +15,7 @@ require('../../component/statusPoint/statusPoint'); ...@@ -15,6 +15,7 @@ require('../../component/statusPoint/statusPoint');
require('../../component/dialog/dialog'); require('../../component/dialog/dialog');
require('../../component/progressPoint/progressPoint'); require('../../component/progressPoint/progressPoint');
require('../../component/progressImage/progressImage'); require('../../component/progressImage/progressImage');
require('../../component/imageDialog/imageDialog');
require('../../component/authorization-modal-point/authorization-modal-point'); require('../../component/authorization-modal-point/authorization-modal-point');
require('../../component/dialogStockEmpty/dialogStockEmpty'); require('../../component/dialogStockEmpty/dialogStockEmpty');
require('../../component/dialogUserLimit/dialogUserLimit'); require('../../component/dialogUserLimit/dialogUserLimit');
......
.tea/entryFiles-production/index$.worker.js
...@@ -32,6 +32,7 @@ require('../../component/statusPoint/statusPoint'); ...@@ -32,6 +32,7 @@ require('../../component/statusPoint/statusPoint');
require('../../component/dialog/dialog'); require('../../component/dialog/dialog');
require('../../component/progressPoint/progressPoint'); require('../../component/progressPoint/progressPoint');
require('../../component/progressImage/progressImage'); require('../../component/progressImage/progressImage');
require('../../component/imageDialog/imageDialog');
require('../../component/authorization-modal-point/authorization-modal-point'); require('../../component/authorization-modal-point/authorization-modal-point');
require('../../component/dialogStockEmpty/dialogStockEmpty'); require('../../component/dialogStockEmpty/dialogStockEmpty');
require('../../component/dialogUserLimit/dialogUserLimit'); require('../../component/dialogUserLimit/dialogUserLimit');
......
.tea/recentlyTouched.json
{"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageDialog\\imageDialog.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialogStockEmpty\\dialogStockEmpty.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialog\\dialog.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\home-modal\\home-modal.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\common.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\configScreen\\configScreen.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wxs\\utils.sjs","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wx2my.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\Behavior.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenter\\couponCenter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\project.config.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackageA\\page\\pages\\pointActicityGroup\\pointActivityGroup.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\package-lock.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\debug.log","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenter\\couponCenter.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\myValueCardInfo\\myValueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\myValueCardInfo\\myValueCardInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\citySelection\\citySelection.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\wxService.js","d:\\work\\projects\\7_Eleven_Alipay\\config\\index.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegralMallGoods\\IntegralMallGoods.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\projects\\7_Eleven_Alipay\\project.config.json","d:\\work\\projects\\7_Eleven_Alipay\\Behavior.js"],"storageVersion":"0.70.14"} {"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointDetail\\tools.wxs","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\progressImage\\progressImage.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialogStockEmpty\\dialogStockEmpty.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wx2my.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\router.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\project.config.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\wxService.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\wxs\\utils.sjs","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\authorization-modal-point\\authorization-modal-point.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\exchangeAddress\\exchangeAddress.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenterInfo\\couponCenterInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageDialog\\imageDialog.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\IntegrateGoodsExchangeInfo\\IntegrateGoodsExchangeInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\dialog\\dialog.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\home-modal\\home-modal.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\common.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\configScreen\\configScreen.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\app.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\711Web\\711\\7_Eleven_Alipay\\Behavior.js"],"storageVersion":"0.70.14"}
\ No newline at end of file \ No newline at end of file
.tea/tmp-saving/efc2b59c8d5b18066a9ae78dd6c5da751589862868607c8b 0 → 100644
const wx2my = require('../../wx2my');
const Behavior = require('../../Behavior');
// pages/userCenter.js
const app = getApp();
const wxService = require('../../utils/wxService');
const utils = require('../../utils/util');
const envInfo = require('../../config/index').envInfo;
wxService.page({
/**
* 页面的初始数据
*/
data: {
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,
donateImgUrl : '',
showDonateImgUrl : false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
let id = options.id ? options.id : null;
if(id){
this.data.id = id;
this.getUserIsLogin();
}
},
//用户是否登录
getUserIsLogin(){
const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data;
const reLoginErrFlag = wx2my.getStorageSync('reLoginErr') && wx2my.getStorageSync('reLoginErr').data;
if(!baseUserInfo || reLoginErrFlag){
this.setData({
isAuthorization : true
});
}
else{
this.setData({
isAuthorization : false
});
this.getPointDetail(this.data.id)
}
},
// 集点详情
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
this.data.donateImgUrl = data.donateImgUrl ? data.donateImgUrl : 'https://img3.bigaka.com/test/1001/202005/20200517/10010c6f71af-479e-4663-adde-00f64c1fb941.png';
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,
donateImgUrl : this.data.donateImgUrl
}, () => {
// 1 进行中 2 已结束
if (timeFlag == 2) {
this.showTimeStatus('活动已经结束啦')
} else if (data.status == 3) {
// 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
this.showTimeStatus('活动已经失效啦，看看其他的')
} else {
// 会员集点活动统计信息 进行中且有效
this.getPointConsumptionCount(id)
//扫码进去领取集点
this.getUserShowRewardCollectionPoint(id);
}
})
}
}
})
},
//获取用户扫码进来是否需要弹出领取集点的
getUserShowRewardCollectionPoint(id){
wxService.post(`/sale/touchpoints/pointConsumptionActivity/verifyWhetherReward?id=${id}`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
//如果需要 弹出提示框
if(data == 1){
this.showConfirmModal(id);
}
}
}
})
},
//弹出原生提示框让用户去点击
showConfirmModal(id){
let self = this;
if(this.showModal){
return ;
}
this.showModal = true;
this.setData({
showDonateImgUrl : true,
});
},
onDialogTap(e){
this.setData({
showDonateImgUrl : false
});
this.userConfirmGetCollectionPoint(this.data.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')
wx.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) {
wx.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)
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
});
\ No newline at end of file
component/progressImage/progressImage.acss
/* component/noMore.wxss */ /* component/progressImage/progressImage.wxss */
.section {
padding-left: 10px;
box-sizing: border-box;
}
.text-section {
text-align: center;
display: flex;
justify-content: center;
.detail-list-bottom { }
.text-item {
float: left;
width: 120rpx;
height: 118.6rpx;
margin: 0 15rpx 15rpx 7rpx;
box-sizing: border-box;
text-align: center; text-align: center;
font-size: 21rpx; }
color: #bfbfbf; .item-img {
/* margin-top: 45rpx; */ height: 118.6rpx;
width: 100%;
}
.clearfix::after {
content: '';
display: block;
clear: both;
} }
\ No newline at end of file
component/progressImage/progressImage.axml
<!--component/noMore.axml--> <!--component/progressImage/progressImage.wxml-->
<view class="detail-list-bottom">-已经到底啦-</view> <view class="section clearfix">
\ No newline at end of file <view class="{{goal >= 5 ? '' : 'text-section'}}">
<!-- 当前已完成 -->
<block a:for="{{currentProgress}}" a:key="{{index}}">
<view class="text-item" style="width: {{100 / 6}}%;">
<image class="item-img" src="{{iconImageFinsh}}" mode="widthFix" />
</view>
</block>
<!-- 当前目标进度 未完成 -->
<block a:for="{{goal - currentProgress}}" a:key="{{index}}">
<view class="text-item" style="width: {{100 / 6}}%;">
<image class="item-img" src="{{iconImage}}" mode="widthFix" />
</view>
</block>
</view>
</view>
\ No newline at end of file
component/progressImage/progressImage.js
...@@ -2,48 +2,51 @@ const wx2my = require('../../wx2my'); ...@@ -2,48 +2,51 @@ const wx2my = require('../../wx2my');
const Behavior = require('../../Behavior'); const Behavior = require('../../Behavior');
// component/noMore.js // component/noMore.js
Component({ Component({
properties: {
goal: {
type: Number,
value: 0
},
showNum: {
type: Boolean,
value: false
},
AvailableNum: {
type: Number,
value: 0
},
showRemNum: {
type: Number,
value: 0
},
iconImage: {
type: String,
value: ''
},
iconImageFinsh: {
type: String,
value: ''
}
},
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: {}, data: {
num: 5,
currentProgress: 0, // 当前已完成进度
},
/** didUpdate(val) {
* 生命周期函数--监听页面加载 console.log(val)
*/ console.log(this.data.AvailableNum)
onLoad: function (options) {}, console.log('currentProgress---',this.data.currentProgress)
},
/** methods:{
* 生命周期函数--监听页面初次渲染完成 //更新数据
*/ updateCurrentProcess(res){
onReady: function () {}, console.log(res)
},
}
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {}
}); });
\ No newline at end of file
component/statusPoint/statusPoint.axml
<!--component/noMore.axml--> <!--component/noMore.axml-->
<view class="status" style="height: {{imgHeight}}rpx" wx:if="{{img}}"> <view class="status" style="height: {{imgHeight}}rpx" a:if="{{img}}">
<view class="status-tips" style="background-color:rgba(5, 195, 91, 1);" wx:if="{{currentStatus == 2 && currentTimeStatus == 1}}">进行中 >></view> <view class="status-tips" style="background-color:rgba(5, 195, 91, 1);" a:if="{{currentStatus == 2 && currentTimeStatus == 1}}">进行中 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentStatus == 3}}"> 已失效 >></view> <view class="status-tips" style="background-color:rgb(170, 170, 170);" a:elif="{{currentStatus == 3}}"> 已失效 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentTimeStatus == 2}}">已结束 >></view> <view class="status-tips" style="background-color:rgb(170, 170, 170);" a:elif="{{currentTimeStatus == 2}}">已结束 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentTimeStatus == 3}}">未开始 >></view> <view class="status-tips" style="background-color:rgb(170, 170, 170);" a:elif="{{currentTimeStatus == 3}}">未开始 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:else>已结束 >></view> <view class="status-tips" style="background-color:rgb(170, 170, 170);" a:else>已结束 >></view>
<!--<image class='status-tips' src='/assets/imgs/point/status.png' mode="widthFix"/>--> <!--<image class='status-tips' src='/assets/imgs/point/status.png' mode="widthFix"/>-->
<image wx:if="{{img}}" class='status-img' src='{{img}}' /> <image a:if="{{img}}" class='status-img' src='{{img}}' />
</view> </view>
\ No newline at end of file
config/index.js
const wx2my = require('../wx2my'); const wx2my = require('../wx2my');
const Behavior = require('../Behavior'); const Behavior = require('../Behavior');
const PROJECT_ENV = 'test'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre const PROJECT_ENV = 'prod'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const brandId = 1002; //2711 生产 1002 测试 const brandId = 2711; //2711 生产 1002 测试
const needMock = ''; // const needMock = ''; //
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
......
pages/pointDetail/pointDetail.acss
...@@ -74,3 +74,32 @@ ...@@ -74,3 +74,32 @@
.total-points { .total-points {
font-size: 48rpx; font-size: 48rpx;
} }
/* 进度 */
.section {
padding-left: 10px;
box-sizing: border-box;
}
.text-section {
text-align: center;
display: flex;
justify-content: center;
}
.text-item {
float: left;
width: 120rpx;
height: 118.6rpx;
margin: 0 15rpx 15rpx 7rpx;
box-sizing: border-box;
text-align: center;
}
.item-img {
height: 118.6rpx;
width: 100%;
}
.clearfix::after {
content: '';
display: block;
clear: both;
}
\ No newline at end of file
pages/pointDetail/pointDetail.axml
<!--pages/userCenter.axml--> <!--pages/userCenter.axml-->
<wxs src="./tools.wxs" module="tools" /> <import-sjs name="utils" from="../../wxs/utils.sjs"/>
<status-img imgHeight="{{imgHeight}}" img="{{detailImage}}" currentStatus="{{currentStatus}}" currentTimeStatus="{{currentTimeStatus}}"/> <status-img imgHeight="{{imgHeight}}" img="{{detailImage}}" currentStatus="{{currentStatus}}" currentTimeStatus="{{currentTimeStatus}}"/>
<view class="detail-info border_box" wx:if="{{goal}}"> <view class="detail-info border_box" a:if="{{goal}}">
<view class="info-top weui-flex df-j--bt"> <view class="info-top weui-flex df-j--bt">
<view class="info-num"> <view class="info-num">
进度: 进度:
<!--可领取次数_surplusExchangeCount 存在 3/3 不存在 0/3 --> <!--可领取次数_surplusExchangeCount 存在 3/3 不存在 0/3 -->
<span wx:if="{{countObj.surplusExchangeCount}}"> <span a:if="{{countObj.surplusExchangeCount}}">
<!-- 被整除 是 显示目标集点 否 显示余数--> <!-- 被整除 是 显示目标集点 否 显示余数-->
<text class="point_color" wx:if="{{tools.parse(countObj.totalPoints % goal) == 0}}"> {{goal}}</text> <text class="point_color" a:if="{{utils.parse(countObj.totalPoints % goal) == 0}}"> {{goal}}</text>
<text class="point_color" wx:else> {{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}</text> <text class="point_color" a:else> {{countObj.totalPoints ? utils.parse(countObj.totalPoints % goal) : 0}}</text>
</span> </span>
<text class="point_color" wx:else> {{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}</text> <text class="point_color" a:else> {{countObj.totalPoints ? utils.parse(countObj.totalPoints % goal) : 0}}</text>
/ {{goal}} / {{goal}}
</view> </view>
<view class="info-ready-num"> <view class="info-ready-num">
<!-- 已达成次数 总集点数/目标节点 取整 --> <!-- 已达成次数 总集点数/目标节点 取整 -->
已达成 {{countObj.totalPoints ? tools.parse(countObj.totalPoints / goal) : 0}} 次 已达成 {{countObj.totalPoints ? utils.parse(countObj.totalPoints / goal) : 0}} 次
</view> </view>
</view> </view>
<view class="info-progress border_box"> <view class="info-progress border_box">
<!-- <x-progress-point <!-- <x-progress-image
active-color='#3EEB9A, #04C25C' goal="{{goal}}"
percent='{{currentPercent != null ? currentPercent : 0}}' iconImageFinsh="{{iconImageFinsh}}"
stroke-width='20' iconImage="{{iconImage}}"
radius='20' AvailableNum="{{countObj.surplusExchangeCount}}"
/>--> showRemNum="{{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}" showNum="{{tools.parse(countObj.totalPoints % goal) == 0}}"
<x-progress-image goal="{{goal}}" iconImageFinsh="{{iconImageFinsh}}" iconImage="{{iconImage}}" AvailableNum="{{countObj.surplusExchangeCount}}" showRemNum="{{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}" showNum="{{tools.parse(countObj.totalPoints % goal) == 0}}"/> id="img-process"/> -->
<view class="section clearfix">
<view class="{{goal >= 5 ? '' : 'text-section'}}">
<!-- 当前已完成 -->
<block a:for="{{currentProgress}}" a:key="{{index}}">
<view class="text-item" style="width: {{100 / 6}}%;">
<image class="item-img" src="{{iconImageFinsh}}" mode="widthFix" />
</view> </view>
<!-- 活动剩余点数 >= 目标点数 wx:if="{{countObj.surplusPoints >= goal}}"--> </block>
<button <!-- 当前目标进度 未完成 -->
hidden="{{hideGetBtn}}" <block a:for="{{goal - currentProgress}}" a:key="{{index}}">
bindtap="handleToGet" <view class="text-item" style="width: {{100 / 6}}%;">
class="info-status-btn border_box available breathe-btn" <image class="item-img" src="{{iconImage}}" mode="widthFix" />
disabled="{{isDisabled}}" </view>
>可领取奖励 </block>
<text class="total-points"> {{countObj.surplusExchangeCount}} </text> </view>
次 </view>
</view>
<button a:if="{{showGetBtn}}" onTap="handleToGet" class="info-status-btn border_box available breathe-btn" disabled="{{isDisabled}}">可领取奖励
<text class="total-points"> {{countObj.surplusExchangeCount}} </text>次
</button> </button>
<view hidden="{{showGetBtn}}" class="info-status-btn unacommpolished border_box"> <view a:if="{{!showGetBtn}}" class="info-status-btn unacommpolished border_box">
还未达成，继续加油呀 还未达成，继续加油呀
</view> </view>
</view> </view>
<view class="detail-desc"> <view class="detail-desc">
<view class="detail-active point_color" bindtap="handleCheckGoods" wx:if="{{type == 1}}">查看活动商品 ></view> <view class="detail-active point_color" onTap="handleCheckGoods" a:if="{{type == 1}}">查看活动商品 ></view>
<view class='integral-list' wx:for="{{desc}}" wx:key="{{index}}"> <view class='integral-list' a:for="{{desc}}" a:key="{{index}}">
<text class='integral-title'>{{item.title}}</text> <text class='integral-title'>{{item.title}}</text>
<text class='integral-desc wpl'>{{item.value}}</text> <text class='integral-desc wpl'>{{item.value}}</text>
</view> </view>
...@@ -59,7 +69,7 @@ ...@@ -59,7 +69,7 @@
show="{{dialog.show}}" show="{{dialog.show}}"
/> />
<authorization-modal-point isAuthorization='{{isAuthorization}}'/> <authorization-modal isAuthorization="{{isAuthorization}}"/>
<image-dialog showDialog="{{showDonateImgUrl}}" imageUrl="{{donateImgUrl}}" onDialogTap="onDialogTap"/> <image-dialog showDialog="{{showDonateImgUrl}}" imageUrl="{{donateImgUrl}}" onDialogTap="onDialogTap"/>
pages/pointDetail/pointDetail.js
...@@ -39,61 +39,49 @@ wxService.page({ ...@@ -39,61 +39,49 @@ wxService.page({
currentPercent: 0, // 当前进度 currentPercent: 0, // 当前进度
isDisabled: false, isDisabled: false,
hideGetBtn: true, // 默认隐藏 可领取按钮 hideGetBtn: true, // 默认隐藏 可领取按钮
showGetBtn: true, // 默认展示 未达成按钮 showGetBtn: false, // 默认展示 未达成按钮
currentStatus: 2, // 活动状态 1 未生效 2 生效中 3 已失效 0 已删除 currentStatus: 2, // 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentTimeStatus: 1, // 1 进行中 2 已结束 3 未开始 currentTimeStatus: 1, // 1 进行中 2 已结束 3 未开始
isAuthorization: false, isAuthorization: false,
donateImgUrl : '', donateImgUrl : '',
donate :false,
showDonateImgUrl : false, showDonateImgUrl : false,
currentProgress : '',
showNum : false,
AvailableNum : 0,
showRemNum : 0,
}, },
watch: { /**
experAccessible(newVal, oldVal) { * 生命周期函数--监听页面加载
if (newVal) { */
// 登录接口返回err onLoad: function(options) {
const reLoginErrFlag = my.getStorageSync('reLoginErr') let id = options.id ? options.id : null;
const baseUserInfo = my.getStorageSync('_baseUserInfo') if(id){
let id this.data.id = id;
if (baseUserInfo && !reLoginErrFlag) { this.getUserIsLogin();
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
} }
if (id) { },
this.setData({
id //用户是否登录
}, () => { getUserIsLogin(){
this.getPointDetail(id) const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : null;
}) const reLoginErrFlag = wx2my.getStorageSync('reLoginErr') ? wx2my.getStorageSync('reLoginErr').data : false;
} if(!baseUserInfo || reLoginErrFlag){
// 隐藏 dialog
this.isShowDialog(false)
})
}
else if (!baseUserInfo && reLoginErrFlag) {
this.setData({ this.setData({
isAuthorization: true isAuthorization : true
}) });
} }
else { else{
this.setData({ this.setData({
isAuthorization: true isAuthorization : false
}) });
} this.getPointDetail(this.data.id)
} else {
// 去别的页面
wxService.router(`/subPackage/page/pages/goToHome/goToHome`).replace()
}
} }
}, },
// 集点详情 // 集点详情
getPointDetail(id) { getPointDetail(id) {
my.showLoading({ my.showLoading({
...@@ -104,6 +92,20 @@ wxService.page({ ...@@ -104,6 +92,20 @@ wxService.page({
const { result, data } = res.data const { result, data } = res.data
if (result == 0) { if (result == 0) {
my.hideLoading() my.hideLoading()
const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : null;
if(baseUserInfo){
let isUat = data.isUat;
if(isUat == 'y'){
let isTrial = baseUserInfo.member.trial ? baseUserInfo.member.trial : false;
if(!isTrial){
wx2my.redirectTo({
url: '/subPackage/page/pages/goToHome/goToHome',
});
}
}
}
let dialog = this.data.dialog let dialog = this.data.dialog
dialog.show = false dialog.show = false
// 弹框背景 // 弹框背景
...@@ -112,6 +114,7 @@ wxService.page({ ...@@ -112,6 +114,7 @@ wxService.page({
let timeFlag = 1 let timeFlag = 1
let endT = data.endTime let endT = data.endTime
let startT = data.startTime let startT = data.startTime
this.data.donate = data.donate == 1 ? true : false;
this.data.donateImgUrl = data.donateImgUrl ? data.donateImgUrl : 'https://img3.bigaka.com/test/1001/202005/20200517/10010c6f71af-479e-4663-adde-00f64c1fb941.png'; this.data.donateImgUrl = data.donateImgUrl ? data.donateImgUrl : 'https://img3.bigaka.com/test/1001/202005/20200517/10010c6f71af-479e-4663-adde-00f64c1fb941.png';
let currentEndTime = (new Date(endT.replace(/-/g, '/'))).getTime(); let currentEndTime = (new Date(endT.replace(/-/g, '/'))).getTime();
let currentstartTime = (new Date(startT.replace(/-/g, '/'))).getTime(); let currentstartTime = (new Date(startT.replace(/-/g, '/'))).getTime();
...@@ -150,8 +153,70 @@ wxService.page({ ...@@ -150,8 +153,70 @@ wxService.page({
// 会员集点活动统计信息 进行中且有效 // 会员集点活动统计信息 进行中且有效
this.getPointConsumptionCount(id) this.getPointConsumptionCount(id)
//扫码进去领取集点 //扫码进去领取集点
if(this.data.donate){
this.getUserShowRewardCollectionPoint(id); this.getUserShowRewardCollectionPoint(id);
} }
}
})
}
}
})
},
//显示状态
showTimeStatus(status) {
wx2my.showToast({
title: `${status}`,
icon: 'none'
})
},
//统计信息
getPointConsumptionCount(activityId){
const { memberId } = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : {};
if(!memberId){
return ;
}
wx2my.showLoading({
title: '加载中'
})
wxService.post(`/sale/touchpoints/pointConsumptionCount/getPointConsumptionCount?activityId=${activityId}&memberId=${memberId}`).then(res => {
if (res) {
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) {
this.setData({
countObj: data,
currentPercent: 100 / (this.data.goal / newPercent),
surplusExchangeCount: data.surplusExchangeCount,
hideGetBtn: hasNum ? false : true,
showGetBtn: hasNum ? true : false,
}, () => {
wx2my.hideLoading();
this.generatePointInfo();
}) })
} }
} }
...@@ -185,20 +250,29 @@ wxService.page({ ...@@ -185,20 +250,29 @@ wxService.page({
showDonateImgUrl : true, showDonateImgUrl : true,
}); });
// return ;
// my.alert({
// title: '集点领取提示',
// content: '恭喜您获得一个集点',
// buttonText: '确认领取',
// success: () => {
// self.userConfirmGetCollectionPoint(id);
// self.showModal = false;
// }
// });
}, },
onDialogTap(e){ onDialogTap(e){
//判断是否开卡了
const { member } = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : {};
if(!member){
wx2my.showToast({
title: '请先去登录',
icon : 'none'
})
return ;
}
if(!member.cardNoAlipay){
wx2my.showToast({
title: '请先开卡后购买',
icon : 'none',
});
wxService.openCard()
return ;
}
this.setData({ this.setData({
showDonateImgUrl : false showDonateImgUrl : false
}); });
...@@ -206,7 +280,6 @@ wxService.page({ ...@@ -206,7 +280,6 @@ wxService.page({
this.userConfirmGetCollectionPoint(this.data.id); this.userConfirmGetCollectionPoint(this.data.id);
}, },
//调用领取接口 //调用领取接口
userConfirmGetCollectionPoint(id){ userConfirmGetCollectionPoint(id){
wxService.post(`/sale/touchpoints/pointConsumptionActivity/award?id=${id}`).then(res => { wxService.post(`/sale/touchpoints/pointConsumptionActivity/award?id=${id}`).then(res => {
...@@ -224,66 +297,6 @@ wxService.page({ ...@@ -224,66 +297,6 @@ wxService.page({
}); });
}, },
showTimeStatus(status) {
my.showToast({
title: `${status}`,
icon: 'none'
})
},
// 会员集点活动统计信息
getPointConsumptionCount(activityId) {
const { memberId } = my.getStorageSync('_baseUserInfo').data;
my.showLoading({
title: '加载中'
})
wxService.post(`/sale/touchpoints/pointConsumptionCount/getPointConsumptionCount?activityId=${activityId}&memberId=${memberId}`).then(res => {
if (res) {
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) {
this.setData({
countObj: data,
currentPercent: 100 / (this.data.goal / newPercent),
surplusExchangeCount: data.surplusExchangeCount,
hideGetBtn: hasNum ? false : true,
showGetBtn: hasNum ? true : false,
}, () => {
my.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() { handleGo() {
// 跳转 popupType: 0 默认不跳转 1 优惠券 2 积分 // 跳转 popupType: 0 默认不跳转 1 优惠券 2 积分
const { popupType, id } = this.data const { popupType, id } = this.data
...@@ -301,16 +314,17 @@ wxService.page({ ...@@ -301,16 +314,17 @@ wxService.page({
// 触点有礼-消费集点兑换 // 触点有礼-消费集点兑换
getPointExchange() { getPointExchange() {
const { activityId } = this.data const { activityId } = this.data
const { memberId } = wx.getStorageSync('_baseUserInfo') const { memberId } = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : {};
my.showLoading({ wx2my.showLoading({
title: '加载中' title: '加载中'
}) });
wxService.get(`/sale/touchpoints/pointConsumptionExchange/exchange?activityId=${activityId}&memberId=${memberId}`).then(res => { wxService.get(`/sale/touchpoints/pointConsumptionExchange/exchange?activityId=${activityId}&memberId=${memberId}`).then(res => {
if (res) { if (res) {
const { result, data } = res.data const { result, data } = res.data
const { popupType, id } = this.data const { popupType, id } = this.data
if (result == 0) { if (result == 0) {
my.hideLoading() wx2my.hideLoading()
// 显示 dialog // 显示 dialog
this.isShowDialog(true) this.isShowDialog(true)
// popupType == 0 3s 关闭 // popupType == 0 3s 关闭
...@@ -324,6 +338,7 @@ wxService.page({ ...@@ -324,6 +338,7 @@ wxService.page({
} }
}) })
}, },
//修改
isShowDialog(flag) { isShowDialog(flag) {
let dialog = this.data.dialog let dialog = this.data.dialog
dialog.show = flag dialog.show = flag
...@@ -331,6 +346,7 @@ wxService.page({ ...@@ -331,6 +346,7 @@ wxService.page({
dialog dialog
}) })
}, },
//获取
handleToGet() { handleToGet() {
// 按钮防止短时间多次点击 // 按钮防止短时间多次点击
const { countObj } = this.data const { countObj } = this.data
...@@ -346,10 +362,27 @@ wxService.page({ ...@@ -346,10 +362,27 @@ wxService.page({
}) })
}, 3000) }, 3000)
}, },
/** //处理选择商品
* 生命周期函数--监听页面加载 handleCheckGoods() {
*/ const { activityId } = this.data
onLoad: function(options) { }, wxService.router(`/subPackage/page/pages/pointGoodsList/pointGoodsList`).search({ activityId })
},
//弹出层关闭
_closeDialog() {
const { id } = this.data
if (id) this.getPointDetail(id)
},
//生成数据
generatePointInfo(){
const { goal } = this.data;
let AvailableNum = this.data.countObj.surplusExchangeCount;
let showRemNum = this.data.countObj.totalPoints ? parseInt(this.data.countObj.totalPoints % goal) : 0;
let showNum = parseInt(this.data.countObj.totalPoints % goal) == 0;
this.setData({
currentProgress: AvailableNum ? (showNum ? goal : showRemNum) : showRemNum
})
},
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
...@@ -357,14 +390,12 @@ wxService.page({ ...@@ -357,14 +390,12 @@ wxService.page({
onShow: function() { onShow: function() {
}, },
/** onPullDownRefresh(){
* 页面相关事件处理函数--监听用户下拉动作 this.getUserIsLogin();
*/
onPullDownRefresh: function() { }, setTimeout(() => {
my.stopPullDownRefresh()
},1000);
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
}
}); });
\ No newline at end of file
pages/pointDetail/pointDetail.json
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"x-progress-point":"/component/progressPoint/progressPoint", "x-progress-point":"/component/progressPoint/progressPoint",
"x-progress-image":"/component/progressImage/progressImage", "x-progress-image":"/component/progressImage/progressImage",
"image-dialog" : "/component/imageDialog/imageDialog" , "image-dialog" : "/component/imageDialog/imageDialog" ,
"authorization-modal": "/component/authorization-modal/authorization-modal",
"authorization-modal-point": "/component/authorization-modal-point/authorization-modal-point" "authorization-modal-point": "/component/authorization-modal-point/authorization-modal-point"
}, },
"defaultTitle": "集点详情", "defaultTitle": "集点详情",
......
pages/pointList/pointList.acss
/* pages/userCenter.wxss */ /* pages/pointList/pointList.wxss */
@import './../../base/base.acss'; @import './../../base/base.acss';
page { page {
background-color: #fff; background-color: #fff;
......
pages/pointList/pointList.axml
<!--pages/userCenter.axml-->
<wxs src="./tools.wxs" module="tools" /> <!--pages/pointList/pointList.aml-->
<view class="point--no-list border_box" wx:if="{{!pointList.length}}"> <import-sjs name="utils" from="../../wxs/utils.sjs"/>
<view class="point--no-list border_box" a:if="{{!pointList.length}}">
<text>您当前暂无集点活动</text> <text>您当前暂无集点活动</text>
</view> </view>
<view class="point-list border_box" wx:if="{{pointList.length}}"> <view class="point-list border_box" a:if="{{pointList.length}}">
<block wx:for="{{pointList}}" wx:key="item"> <block a:for="{{pointList}}" a:key="item" a:for-item="item">
<view class="point border_box" data-id="{{item.id}}" bindtap="handleDetail"> <view class="point border_box" data-id="{{item.id}}" data-item="{{item}}" onTap="handleDetail">
<status-img img="{{item.listImage}}" currentStatus="{{currentStatus}}" currentTimeStatus="{{currentTimeStatus}}" /> <status-img img="{{item.listImage}}" currentStatus="{{item.status}}" currentTimeStatus="{{item.currentTimeStatus}}" />
<view class="progress weui-flex df-j--bt"> <view class="progress weui-flex df-j--bt">
<view class="rate">进度： <view class="rate">进度：
<span wx:if="{{item.surplusExchangeCount}}"> <span a:if="{{item.surplusExchangeCount}}">
<text class="point_color" wx:if="{{tools.parse(item.totalPoints % item.goal) == 0}}"> {{item.goal}}</text> <text class="point_color" a:if="{{utils.parse(item.totalPoints % item.goal) == 0}}"> {{item.goal}}</text>
<text class="point_color" wx:else> {{item.totalPoints && item.goal ? tools.parse(item.totalPoints % item.goal) : 0}}</text> <text class="point_color" a:else> {{item.totalPoints && item.goal ? utils.parse(item.totalPoints % item.goal) : 0}}</text>
</span> </span>
<text class="point_color" wx:else> {{item.totalPoints && item.goal ? item.totalPoints % item.goal : 0}}</text> <text class="point_color" a:else> {{item.totalPoints && item.goal ? item.totalPoints % item.goal : 0}}</text>
/ {{item.goal}} / {{item.goal}}
</view> </view>
<view class="time-out">距离结束时间： <view class="time-out">距离结束时间：
<!--<text class="time">{{item.countdown.day}}天{{item.countdown.min<= 59 ? item.countdown.hour + 1: item.countdown.hour}}小时</text>--> <text class="time">{{item.countdown.day}} 天 {{item.countdown.min < 59 ? (item.countdown.hour+1) : item.countdown.hour}}小时</text>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
<!-- 登录授权 -->
<authorization-modal isAuthorization="{{isAuthorization}}"/>
\ No newline at end of file
pages/pointList/pointList.js
const wx2my = require('../../wx2my'); const wx2my = require('../../wx2my');
const Behavior = require('../../Behavior'); const Behavior = require('../../Behavior');
// pages/userCenter.js // pages/pointList/pointList.js
const app = getApp(); const app = getApp()
const wxService = require('../../utils/wxService')
const wxService = require('../../utils/wxService'); const utils = require('../../utils/util')
// import * as watch from "../../utils/watch.js";
const utils = require('../../utils/util');
const envInfo = require('../../config/index').envInfo;
wxService.page({ wxService.page({
/** /**
...@@ -17,60 +14,54 @@ wxService.page({ ...@@ -17,60 +14,54 @@ wxService.page({
pointList: [], pointList: [],
currentStatus: 2, // 活动状态 1 未生效 2 生效中 3 已失效 0 已删除 currentStatus: 2, // 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentTimeStatus: 1, // 1 进行中 2 已结束 3 未开始 currentTimeStatus: 1, // 1 进行中 2 已结束 3 未开始
isAuthorization: false,
hasUserInfo: false
}, },
watch: {
experAccessible(newVal, oldVal) {
if(newVal) {
this.getPointList()
} else {
// 去别的页面
wxService.router(`/subPackage/page/pages/goToHome/goToHome`).replace()
}
}
},
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function(options) { }, onLoad() {
// watch.setWatcher(this);
my.hideShareMenu();
},
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function() { onShow() {
this.getUserIsLogin();
}, },
getPointConsumptionCount(activityId) {
const { memberId } = wx.getStorageSync('_baseUserInfo') //用户是否登录
// 会员集点活动统计信息 getUserIsLogin(){
wxService.post(`/sale/touchpoints/pointConsumptionCount/getPointConsumptionCount?activityId=${activityId}&memberId=${memberId}`).then(res => { const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data;
if (res) { const reLoginErrFlag = wx2my.getStorageSync('reLoginErr') && wx2my.getStorageSync('reLoginErr').data;
const { result, data } = res.data if(!baseUserInfo || reLoginErrFlag){
const { pointList } = this.data
if (result == 0) {
pointList.forEach(item => {
if (item.id == data.activityId) {
item.surplusPoints = data.surplusPoints
item.totalPoints = data.totalPoints
item.surplusExchangeCount = data.surplusExchangeCount
this.setData({ this.setData({
pointList isAuthorization : true
}) });
}
})
} }
else{
this.setData({
isAuthorization : false
});
this.getPointList();
} }
})
},
handleDetail(e) {
const { id } = e.currentTarget.dataset
wxService.router(`/pages/pointDetail/pointDetail`).search({ id })
}, },
//判断用户是否是体验账号
//获取集点列表
getPointList() { getPointList() {
wx.showLoading({ wx2my.showLoading({
title: '加载中' title: '加载中'
}) });
wxService.get(`/sale/touchpoints/pointConsumptionActivity/findAllValidActivityList`).then(res => { wxService.get(`/sale/touchpoints/pointConsumptionActivity/findAllValidActivityList`).then(res => {
if (res) { if (res) {
const { result, data } = res.data const { result, data } = res.data;
if (result == 0) { if (result == 0) {
data.forEach(item => { data.forEach(item => {
// 是否在有效期 // 是否在有效期
...@@ -118,13 +109,15 @@ wxService.page({ ...@@ -118,13 +109,15 @@ wxService.page({
// if (result.hour < 10) result.hour = '0' + result.hour; // if (result.hour < 10) result.hour = '0' + result.hour;
// if (result.day < 10) result.day = '0' + result.day; // if (result.day < 10) result.day = '0' + result.day;
} }
item.currentTimeStatus = timeFlag;
item.countdown = result item.countdown = result
this.setData({ this.setData({
pointList: data, pointList: data,
currentStatus: item.status, currentStatus: item.status,
currentTimeStatus: timeFlag currentTimeStatus: timeFlag
}, () => { }, () => {
wx.hideLoading() wx2my.hideLoading()
this.getPointConsumptionCount(item.id) this.getPointConsumptionCount(item.id)
}) })
}) })
...@@ -132,60 +125,57 @@ wxService.page({ ...@@ -132,60 +125,57 @@ wxService.page({
} }
}) })
}, },
//获取集点统计
//获取消费列表 getPointConsumptionCount(activityId) {
initOrderList(pageNo, pageSize) { const { memberId } = wx2my.getStorageSync('_baseUserInfo') ? wx2my.getStorageSync('_baseUserInfo').data : {};
wx2my.showLoading({ if(!memberId){
title: '加载中' return ;
}); // 取会员id }
// 会员集点活动统计信息
const { wxService.post(`/sale/touchpoints/pointConsumptionCount/getPointConsumptionCount?activityId=${activityId}&memberId=${memberId}`).then(res => {
memberId
} = wx2my.getStorageSync('_baseUserInfo').data;
const params = {
memberId
};
wxService.post(`/sale/order/list?pageNo=${pageNo}&pageSize=${pageSize}`, params).then(res => {
if (res) { if (res) {
const { const { result, data } = res.data
result, const { pointList } = this.data
data
} = res.data;
if (result == 0) { if (result == 0) {
wx2my.hideLoading(); // 数量 pointList.forEach(item => {
if (item.id == data.activityId) {
item.surplusPoints = data.surplusPoints
item.totalPoints = data.totalPoints
item.surplusExchangeCount = data.surplusExchangeCount
this.setData({ this.setData({
orderList: this.data.pageNo == 1 ? [...data.content] : [...this.data.orderList, ...data.content], pointList
totalPages: data.totalPages })
});
} }
})
} }
}).finally(() => { }
wx2my.hideLoading(); })
});
}, },
/** handleDetail(e) {
* 页面相关事件处理函数--监听用户下拉动作 const { id ,item} = e.currentTarget.dataset;
*/ const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data;
onPullDownRefresh: function() { }, if(!baseUserInfo){
wx2my.showToast({
title: '请先登录',
icon : 'none'
});
/** return ;
* 页面上拉触底事件的处理函数 }
*/
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); let isUat = item.isUat;
} else { if(isUat != 'y'){
this.setData({ wxService.router(`/pages/pointDetail/pointDetail`).search({ id })
noMore: true }
}); else{
let isTrial = baseUserInfo.member.trial ? baseUserInfo.member.trial : false;
if(isTrial){
wxService.router(`/pages/pointDetail/pointDetail`).search({ id })
} }
else{
wxService.router(`/subPackage/page/pages/goToHome/goToHome`);
} }
}
},
}); });
\ No newline at end of file
pages/pointList/pointList.json
{ {
"usingComponents": { "usingComponents": {
"authorization-modal": "/component/authorization-modal/authorization-modal",
"status-img": "/component/statusPoint/statusPoint" "status-img": "/component/statusPoint/statusPoint"
}, },
"defaultTitle": "集点列表", "defaultTitle": "集点列表",
......
pages/pointList/tools.wxs → pages/pointList/tools.sjs
var parse = function(str) { function parse(str) {
return parseInt(str); return parseInt(str);
}; };
module.exports = {
export default {
parse: parse parse: parse
} }
subPackage/page/pages/goToHome/goToHome.json
{"usingComponents": {}} {"defaultTitle": "敬请期待","usingComponents": {}}
\ No newline at end of file \ No newline at end of file
wxs/utils.sjs
...@@ -21,10 +21,17 @@ function handerNickName(nickName, limitLength) { ...@@ -21,10 +21,17 @@ function handerNickName(nickName, limitLength) {
return nickName || ''; return nickName || '';
} }
function parse(str) {
return parseInt(str);
};
export default { export default {
numberFormat: numberFormat, numberFormat: numberFormat,
date: date, date: date,
handerNickName: handerNickName handerNickName: handerNickName,
parse : parse,
} }
// module.exports = { // module.exports = {
// numberFormat: numberFormat, // numberFormat: numberFormat,
......
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