Commit 0e36ad14 by 谢中龙

领取中心和集点优化

parent b1a37f2c
{"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-19 14:29:17","alipay:alipay-mini:packageSize":null,"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":"d4cc6583d2755134a23395bb0d795199","_loginCode":"4ab19666307443a5b00703e11d2fVX45","_accreditUserInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/T1yVJjXnxgXXXXXXXX","city":"上海市","countryCode":"CN","gender":"m","nickName":"谢中龙","province":"上海"},"_baseUserInfo":{"token":"d4cc6583d2755134a23395bb0d795199","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":"composeBc066c65a675b456c872fc330c3ed1B45","outerStr":"{\"activateType\":\"normal\"}","memberId":"594104268563292160","member":{"id":"594104268563292160","createTime":"2019-06-28 09:58:15","updateTime":"2020-04-16 19:04:52","code":"770084118008766216","brandId":"2711","storeId":"2711","mobile":"18817382046","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4","openid":"of8NluBTFNqUHHpPogObPN2vb3Qo","cardNoWeixin":"305490426989","cardNoAlipay":"svneleven0003335945","alipayUserId":"2088702833166455","alipayCardOpenDate":"2019-11-07 08:20:12","name":"谢中龙","sex":"男","birthday":"1991-11-19 00:00:00","address":"上海市-上海市-浦东新区-盛夏路58号天之骄子创业公寓6号楼蜂巢柜","lock":false,"registerTime":"2019-06-28 09:58:15","activateWxCardTime":"2019-06-28 09:58:15","activateAlipayCardTime":"2019-11-07 08:20:12","memberWeixin":{"nickname":"言夕","sex":"男"},"level":0,"exp":0,"memberWeixinApps":[{"openid":"oUOIF0basUF5heHcuZwvPSEJIG3E","appid":"wx700028bf32a3be66","unionid":"oV1j3vwp9HNqOhwN2Fl0gIOVHDr4"}]},"memberActivateStatus":true}},"alipay:alipay-mini:userAuthorization":[],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.47","alipay:alipay-mini:currentVersion":"1.0.48","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"}],"compilerIndex":1}
\ No newline at end of file
{"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-19 14:29:17","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":"3a79b40edda7119d645fa105da4c1c88","_loginCode":"2792d9fb27264303a4943fadb2dfOX45","_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":"composeB94517ba5a64a405a8aa98ffc80135X45","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":"d4cc6583d2755134a23395bb0d795199"}},"alipay:alipay-mini:userAuthorization":[],"alipay:alipay-mini:_appId":"2019101168315187","alipay:alipay-mini:_appName":"广东7-Eleven会员俱乐部","alipay:alipay-mini:remoteVersion":"1.0.47","alipay:alipay-mini:currentVersion":"1.0.48","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"},{"title":"消费集点列表","page":"pages/pointList/pointList"}],"compilerIndex":0}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
{"tabs":["file:///d%3A/work/711Web/711/7_Eleven_Alipay/config/index.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/project.config.json"],"current":"file:///d%3A/work/711Web/711/7_Eleven_Alipay/project.config.json","storageVersion":"0.70.14"}
\ No newline at end of file
{"tabs":["file:///d%3A/work/711Web/711/7_Eleven_Alipay/config/index.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/utils/Http.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/wx2my.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
......@@ -48,6 +48,8 @@ require('../../subPackage/page/pages/valueCardInfo/valueCardInfo');
require('../../subPackage/page/pages/valueCardRecords/valueCardRecords');
require('../../subPackage/page/pages/myValueCard/myValueCard');
require('../../subPackage/page/pages/myValueCardInfo/myValueCardInfo');
require('../../subPackage/page/pages/couponCenter/couponCenter');
require('../../subPackage/page/pages/couponCenterInfo/couponCenterInfo');
require('../../subPackageA/page/pages/pointActivityGroup/pointActivityGroup');
require('../../subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon');
require('../../subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods');
......@@ -65,6 +65,8 @@ require('../../subPackage/page/pages/valueCardInfo/valueCardInfo');
require('../../subPackage/page/pages/valueCardRecords/valueCardRecords');
require('../../subPackage/page/pages/myValueCard/myValueCard');
require('../../subPackage/page/pages/myValueCardInfo/myValueCardInfo');
require('../../subPackage/page/pages/couponCenter/couponCenter');
require('../../subPackage/page/pages/couponCenterInfo/couponCenterInfo');
require('../../subPackageA/page/pages/pointActivityGroup/pointActivityGroup');
require('../../subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon');
require('../../subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods');
......
......@@ -48,6 +48,8 @@ require('../../subPackage/page/pages/valueCardInfo/valueCardInfo');
require('../../subPackage/page/pages/valueCardRecords/valueCardRecords');
require('../../subPackage/page/pages/myValueCard/myValueCard');
require('../../subPackage/page/pages/myValueCardInfo/myValueCardInfo');
require('../../subPackage/page/pages/couponCenter/couponCenter');
require('../../subPackage/page/pages/couponCenterInfo/couponCenterInfo');
require('../../subPackageA/page/pages/pointActivityGroup/pointActivityGroup');
require('../../subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon');
require('../../subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods');
......@@ -65,6 +65,8 @@ require('../../subPackage/page/pages/valueCardInfo/valueCardInfo');
require('../../subPackage/page/pages/valueCardRecords/valueCardRecords');
require('../../subPackage/page/pages/myValueCard/myValueCard');
require('../../subPackage/page/pages/myValueCardInfo/myValueCardInfo');
require('../../subPackage/page/pages/couponCenter/couponCenter');
require('../../subPackage/page/pages/couponCenterInfo/couponCenterInfo');
require('../../subPackageA/page/pages/pointActivityGroup/pointActivityGroup');
require('../../subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon');
require('../../subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods');
......
{"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\project.config.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\config\\index.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.js","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\\Behavior.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\debug.log","d:\\work\\711Web\\711\\7_Eleven_Alipay\\package-lock.json","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\\subPackage\\page\\pages\\myValueCard\\myValueCard.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\myValueCard\\myValueCard.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\wxService.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCard\\valueCard.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","d:\\work\\projects\\7_Eleven_Alipay\\app.json","d:\\work\\projects\\7_Eleven_Alipay\\app.js","d:\\work\\projects\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\projects\\7_Eleven_Alipay\\package-lock.json","d:\\work\\projects\\7_Eleven_Alipay\\debug.log","d:\\work\\projects\\7_Eleven_Alipay\\pages\\consumptionDetails\\consumptionDetails.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\projects\\7_Eleven_Alipay\\wx2my.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\couponCodeDetail\\couponCodeDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.axml","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.json","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","d:\\work\\projects\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml"],"storageVersion":"0.70.14"}
\ No newline at end of file
{"files":["d:\\work\\711Web\\711\\7_Eleven_Alipay\\wx2my.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\couponCenter\\couponCenter.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCardInfo\\valueCardInfo.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCard\\valueCard.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\\app.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCard\\valueCard.acss","d:\\work\\711Web\\711\\7_Eleven_Alipay\\subPackage\\page\\pages\\valueCard\\valueCard.json","d:\\work\\711Web\\711\\7_Eleven_Alipay\\project.config.json","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\\Behavior.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\debug.log","d:\\work\\711Web\\711\\7_Eleven_Alipay\\package-lock.json","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\\pages\\pointList\\pointList.acss","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","d:\\work\\projects\\7_Eleven_Alipay\\app.json","d:\\work\\projects\\7_Eleven_Alipay\\app.js","d:\\work\\projects\\7_Eleven_Alipay\\utils\\Http.js","d:\\work\\projects\\7_Eleven_Alipay\\package-lock.json","d:\\work\\projects\\7_Eleven_Alipay\\debug.log","d:\\work\\projects\\7_Eleven_Alipay\\pages\\consumptionDetails\\consumptionDetails.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","d:\\work\\projects\\7_Eleven_Alipay\\wx2my.js","d:\\work\\projects\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","d:\\work\\projects\\7_Eleven_Alipay\\component\\citySelection\\citySelection.js","d:\\work\\projects\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js"],"storageVersion":"0.70.14"}
\ No newline at end of file
......@@ -33,7 +33,9 @@
"pages/valueCardInfo/valueCardInfo",
"pages/valueCardRecords/valueCardRecords",
"pages/myValueCard/myValueCard",
"pages/myValueCardInfo/myValueCardInfo"
"pages/myValueCardInfo/myValueCardInfo",
"pages/couponCenter/couponCenter",
"pages/couponCenterInfo/couponCenterInfo"
]
},
{
......
const wx2my = require('../wx2my');
const Behavior = require('../Behavior');
const PROJECT_ENV = 'prod'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const brandId = 2711; //2711 生产 1002 测试
const PROJECT_ENV = 'test'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const brandId = 1002; //2711 生产 1002 测试
const needMock = ''; //
// appid_dev_wx wxc3b64b09b1d3dfc2
......
......@@ -145,12 +145,66 @@ wxService.page({
} 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;
my.alert({
title: '集点领取提示',
content: '恭喜您获得一个集点',
buttonText: '确认领取',
success: () => {
self.userConfirmGetCollectionPoint(id);
self.showModal = false;
}
});
},
//调用领取接口
userConfirmGetCollectionPoint(id){
wxService.post(`/sale/touchpoints/pointConsumptionActivity/award?id=${id}`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
//如果需要 弹出提示框
wx2my.showToast({
title: '领取成功~',
});
this.getPointDetail(this.data.id);
}
}
});
},
showTimeStatus(status) {
my.showToast({
title: `${status}`,
......
/* subPackage/page/pages/couponCenter/couponCenter.wxss */
/* subPackage/page/pages/couponCenter/couponCenter.wxss */
/* pages/userCenter.wxss */
@import "/base/base.acss";
page {
/* background-color: rgba(0, 0, 0, 0.05); */
background: #ffffff;
}
.page-integral-mall {
border-top: 1px solid rgba(151, 151, 151, 0.1);
}
.empty-wrap {
width: 300rpx;
margin: 190rpx auto 0;
text-align: center;
}
.empty-img {
width: 197rpx;
height: 176rpx;
margin-bottom: 48rpx;
}
.empty-text {
color: #cccccc;
font-size: 28rpx;
}
/* 卡劵列表 */
.coupon-wrap {
padding: 20rpx;
clear: both;
}
.coupon-list {
margin-bottom: 10rpx;
border-bottom: solid 1px #eeeeee;
}
.coupon-img-title {
display: flex;
align-items: center;
}
.coupon-item {
display: flex;
align-items: center;
height: 144rpx;
background-color: #fff;
justify-content: space-between;
}
.coupon-btn {
margin-right: 30rpx;
}
.coupon-btn-click {
width: 153.8rpx;
height: 50rpx;
border-radius: 25rpx;
color: #ffffff;
font-size: 24rpx;
display: flex;
justify-content: center;
align-items: center;
background-color: #cb3c3c;
}
.coupon-btn-click.disabled{
background-color: #dddddd !important;
box-shadow: none;
}
.coupon-btn-num {
width: 153.8rpx;
height: 22rpx;
color: rgba(250, 100, 0, 1);
font-size: 22rpx;
text-align: center;
margin-top: 10rpx;
}
.coupon-img {
box-sizing: border-box;
margin-left: 30rpx;
}
.coupon-img image {
width: 80rpx;
height: 80rpx;
}
.coupon-info {
padding: 42rpx 39rpx;
box-sizing: border-box;
}
.coupon-name {
color: #333;
}
.coupon-time {
color: #fc921e;
margin-bottom: 18rpx;
font-size: 26rpx;
}
.coupon-desc {
/* color: #999;
margin-top: 11rpx;
width: 360rpx;
font-size: 24rpx; */
color: rgba(118, 161, 213, 1);
font-size: 22rpx;
text-align: right;
margin-top: 18rpx;
}
.ac-date{
font-size: 22rpx;
color: #999999;
}
.text-align-left{
text-align: left !important;
}
.coupon-code {
color: #ffffff;
word-wrap: break-word;
font-weight: bold;
margin: 0 10rpx;
padding: 35rpx 20rpx;
box-sizing: content-box;
width: 40rpx;
line-height: 35rpx;
}
.invalid-coupon {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.5);
z-index: 3;
border-radius: 7rpx;
}
.invalid-img {
position: absolute;
width: 147rpx;
height: 147rpx;
right: 81rpx;
top: 31rpx;
z-index: 4;
}
.point-img {
width: 28rpx;
height: 36rpx;
}
.title-img-point {
display: flex;
align-items: center;
}
.point-exchange-goods-records{
font-size: 28rpx;
color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
height: 80rpx;
position: fixed;
left: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.65);
z-index: 2;
width: 100%;
}
.point-exchange-goods-records:active{
opacity: 0.7;
}
.text-point {
color: rgba(51, 51, 51, 1);
font-size: 42rpx;
margin-left: 10rpx;
}
.mall-title {
height: 150rpx;
padding-left: 50rpx;
padding-right: 42rpx;
box-sizing: border-box;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 8px 5px rgba(0, 0, 0, 0.05),
0px 0px 3px 0px rgba(0, 0, 0, 0.03);
}
.title-num-point {
padding-top: 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
.integral-vip-rules {
width: 133rpx;
height: 42rpx;
line-height: 42rpx;
border-radius: 34rpx;
font-size: 23rpx;
text-align: center;
border: 1px solid rgba(204, 204, 204, 1);
}
.title-time-point {
color: rgba(102, 102, 102, 1);
font-size: 20rpx;
text-align: left;
padding-top: 3rpx;
margin-top: 15rpx;
}
.mall-tab {
height: 80rpx;
display: flex;
align-items: center;
background-color: #fff;
padding: 5rpx 0;
box-sizing: border-box;
margin-top: 10rpx;
border-bottom: solid 1px #eeeeee;
}
.tab-coupon, .tab-goods,.tab-coupon-goods {
flex: 1;
text-align: center;
color: rgba(102, 102, 102, 1);
font-size: 26rpx;
}
.tab-coupon {
border-right: 1rpx solid rgba(102, 102, 102, 1);
}
.tab-active {
color: rgba(5, 195, 91, 1);
}
\ No newline at end of file
<!--pages/userCenter.wxml-->
<view class='page-integral-mall'>
<!-- 优惠券列表-->
<view>
<view class='coupon-wrap' a:if="{{integralCouponList.length}}">
<view
class='coupon-list'
a:for="{{integralCouponList}}"
a:for-item="item"
a:for-index="k"
a:key="{{k}}"
data-id="{{item.acvivityId}}"
>
<view class="coupon-item">
<view class='coupon-img-title' data-id="{{item.acvivityId}}" onTap="goCouponDetail">
<view class='coupon-img'>
<image a:if="{{item.listPicture}}" src='{{item.listPicture}}' mode="aspectFit"/>
<image a:else src='https://img3.bigaka.com/prd/3001/202003/20200331/3001649f2f08-3b4e-4b5b-97c1-30cdf646651c.png' />
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>{{item.activityName}}</view>
<view class='coupon-desc text-align-left fs-24'>查看详情</view>
</view>
</view>
<view class='coupon-btn positionRe'>
<button a:if="{{!userHasBaseInfo}}"
open-type="getAuthorize"
onGetAuthorize="onGetAuthorize"
onError="onAuthError"
scope='userInfo'
class="clear-btn positionAbs"></button>
<view class='coupon-btn-click theme-color'
data-id="{{item.acvivityId}}"
onTap='exchange'>立即领取</view>
<!-- <view class='ac-date'>{{item.startTime}}至{{item.endTime}}</view> -->
</view>
</view>
</view>
</view>
<view class='empty-wrap' a:if="{{!integralCouponList.length}}">
<view class='empty-info'>
<image class='empty-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/30012bce7628-f373-4fa7-a6a4-ada9c1c721d6.png' />
<view class='empty-text'>没有任何领劵活动</view>
</view>
</view>
</view>
</view>
// pages/userCenter.js
const wx2my = require('../../../../wx2my');
const Behavior = require('../../../../Behavior');
const wxService = require('../../../../utils/wxService')
wxService.page({
/**
* 页面的初始数据
*/
data: {
query: '',
integralCouponList: [], // 积分兑换优惠券列表
userHasBaseInfo : false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
my.hideShareMenu();
},
onShow(){
this.userHasLogin();
this.initIntegralCouponList();
},
// 获取优惠券活动列表
initIntegralCouponList(refresh) {
wx2my.showLoading({
title: '加载中'
});
wxService.post(`/coupon/couponCenterActivity/buyer/getValidList`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx2my.hideLoading()
this.data.integralCouponList = data ? data : [];
this.setData({
integralCouponList: this.data.integralCouponList
});
}
}
if(refresh){
wx2my.showToast({
title: '刷新成功',
});
my.stopPullDownRefresh();
}
}).finally(() => {
wx2my.hideLoading();
})
},
//立即兑换优惠券
exchange(e) {
wx2my.showLoading({
title: '领取中..',
});
const { id } = e.currentTarget.dataset;
wxService.post(`/coupon/couponCenterActivity/buyer/coupon/draw?id=${id}`).then(res => {
wx2my.hideLoading();
if(res){
if(res.data.result == 0){
wx2my.showToast({
title: '领取成功',
});
}
else{
wx2my.showToast({
title: '领取失败,请稍后再试',
icon : 'none'
});
}
}
});
},
//跳转到详情
goCouponDetail(e) {
const { id } = e.currentTarget.dataset
wxService.router(`/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${id}`)
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
this.initIntegralCouponList(true);
},
//获取当前用户是否登录
userHasLogin(){
const baseUserInfo = wx2my.getStorageSync('_baseUserInfo').data;
if(baseUserInfo){
this.setData({
userHasBaseInfo : true
})
}
else{
this.setData({
userHasBaseInfo: false
})
}
},
//授权
onGetAuthorize(){
// 获取会员基础信息
my.getOpenUserInfo({
fail: (res) => {
console.log("refails", res)
},
success: (res) => {
let userInfo = JSON.parse(res.response).response // 以下方的报文格式解析两层 response
if (userInfo) {
utils.getUserInfoByBtn(userInfo).then((data = {}) => {
const {
token
} = data;
wx2my.setStorageSync('_accreditUserInfo', userInfo);
if (token) {
wx2my.setStorageSync('token', token);
} else {
wx2my.setStorageSync('token', '');
}
wx2my.setStorageSync('_baseUserInfo', data); // 存储用户开卡状态
this.setUserInfo();
}).catch(err => {
if (err) {
wx2my.showToast({
title: `会员系统异常请稍后重试!`,
icon: 'none'
});
}
});
} else {
this.setData({
userHasBaseInfo: false
});
}
}
});
},
setUserInfo() {
// 判断有无开卡
const userInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data; // 新用户去激活领卡
if (userInfo && userInfo.member && !userInfo.member.mobile && !userInfo.member.cardNoAlipay) {
wxService.openCard();
return false;
}
const urls = getCurrentPages();
setTimeout(() => {
this.onShow();
}, 200);
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
{
"defaultTitle": "领券中心",
"pullRefresh": true,
"usingComponents": {}
}
\ No newline at end of file
/* subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxss */
/* subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxss */
page{
background: #ffffff;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
view{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.coupon-info-con{
padding: 30rpx;
}
.coupon-info-bg{
width: 100%;
height: 174rpx;
background-position: center;
background-size: 100%;
background-repeat: no-repeat;
position: relative;
padding-left: 170rpx;
}
.coupon-info-bg .lf-coupon-Bg{
position: absolute;
left: 0;
top: 0;
width: 170rpx;
height: 100%;
padding: 15rpx;
}
.coupon-info-bg .lf-coupon-Bg image{
width: 100%;
height: 100%;
}
.coupon-info-bg .rg-coupon-info{
width: 100%;
height: 100%;
padding: 15rpx;
font-size: 24rpx;
}
.coupon-title{
font-size: 28rpx;
color: #333333;
margin-bottom: 8rpx;
font-weight: 550;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.coupon-date{
font-size: 22rpx;
color: #999999;
margin-bottom: 5rpx;
}
.exp-intro{
margin-top: 60rpx;
}
.exp-intro .exp-intro-item{
display: flex;
font-size: 28rpx;
color: #333333;
}
.exp-intro .exp-intro-item .intro-title{
flex: 0;
min-width: 100rpx;
max-width: 100rpx;
}
.exp-intro .exp-intro-item .intro-desc{
flex: 1;
color: #999999;
}
.integral-detail{
margin-top: 60rpx;
}
.integral-list{
margin-bottom: 20rpx;
font-size: 24rpx;
color: #999999;
}
.integral-title{
font-size: 24rpx;
color: #333333;
margin-right: 8rpx;
}
.integral-title,.integral-desc{
display: inline-block;
}
.get-btn{
width: 100%;
height: 90rpx;
margin-top: 80rpx;
background: -webkit-linear-gradient(left,rgb(203,60,60,0.7),rgb(203,60,60,1));
border-radius: 8rpx;
color: #ffffff;
font-size: 28rpx;
display: flex;
justify-content: center;
align-items: center;
}
.get-btn button{
color: #ffffff;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: center;
}
.get-btn .view-btn{
color: #ffffff;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: center;
position: absolute;
width: 100%;
height: 100%;
left: 0;
top: 0;
z-index: 1;
}
.get-btn:active{
opacity: 0.7;
}
\ No newline at end of file
<!--subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxml-->
<view class="coupon-info-con">
<view class="coupon-info-bg" style="background-image:url('https://img3.bigaka.com/prd/3001/202003/20200331/3001df30305c-f4fe-4c35-bd73-5d87d4882f7a.png')">
<view class="lf-coupon-Bg">
<image a:if="{{activityInfo.listPicture}}" mode="aspectFit" src="{{activityInfo.listPicture}}"></image>
<image a:else src='https://img3.bigaka.com/prd/3001/202003/20200331/3001649f2f08-3b4e-4b5b-97c1-30cdf646651c.png' />
</view>
<view class="rg-coupon-info">
<view class="coupon-title">{{activityInfo.couponName}}</view>
<view class="coupon-date">{{activityInfo.startTime}} 至 {{activityInfo.endTime}}</view>
<view class="coupon-price theme-text-color">
{{activityInfo.couponInfoDTO.couponSetting.typeDesc}} {{activityInfo.couponInfoDTO.couponSetting.faceAmountDesc}}
</view>
</view>
</view>
<!-- 活动说明 -->
<view class='integral-detail' a:if="{{activityInfo.hasExpDate}}">
<view class='integral-list'>
<text class='integral-title'>有效时间</text>
<text class='integral-desc wpl'>{{activityInfo.startTime}}至{{activityInfo.endTime}}</text>
</view>
</view>
<view class='integral-detail' style="margin-top:20rpx;" a:if="{{activityInfo.desc.length > 0}}">
<view class='integral-list' a:for="{{activityInfo.desc}}" a:key="*this">
<text class='integral-title'>{{item.label}}</text>
<text class='integral-desc wpl'>{{item.value}}</text>
</view>
</view>
<!-- 按钮 -->
<view class="get-btn positionRe">
<button a:if="{{!userHasBaseInfo}}"
open-type="getAuthorize"
onGetAuthorize="onGetAuthorize"
onError="onAuthError"
scope='userInfo'
class="clear-btn positionAbs"></button>
<view a:else class="view-btn" onTap="onTapGetCoupon">立即领取</view>
</view>
</view>
// subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
const wx2my = require('../../../../wx2my');
const Behavior = require('../../../../Behavior');
const wxService = require('../../../../utils/wxService')
wxService.page({
/**
* 页面的初始数据
*/
data: {
activityId : null,
activityInfo : {},
userHasBaseInfo : false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let id = options.id;
this.data.activityId = id;
// this.getACtivityInfo();
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.userHasLogin();
this.getACtivityInfo();
},
//获取活动详情
getACtivityInfo(){
wxService.post(`/coupon/couponCenterActivity/buyer/getDetail?id=${this.data.activityId}`).then(res => {
if(res){
let obj = res.data.data ? res.data.data : null;
if (obj){
let arr = obj.definition ? JSON.parse(obj.definition) : [];
obj.desc = arr.filter(item => item.type == 2);
obj.hasExpDate = arr.filter(item => item.type == 1).length > 0 ;
this.data.activityInfo = obj;
this.setData({
activityInfo: this.data.activityInfo
});
}
}
})
},
//领取优惠券
onTapGetCoupon(){
wx2my.showLoading({
title: '领取中..',
});
let id = this.data.activityId;
wxService.post(`/coupon/couponCenterActivity/buyer/coupon/draw?id=${id}`).then(res => {
wx2my.hideLoading();
if (res) {
if (res.data.result == 0) {
wx2my.showToast({
title: '领取成功',
});
}
else {
wx2my.showToast({
title: '领取失败,请稍后再试',
icon: 'none'
});
}
}
});
},
//获取当前用户是否登录
userHasLogin(){
const baseUserInfo = wx2my.getStorageSync('_baseUserInfo').data;
if(baseUserInfo){
this.setData({
userHasBaseInfo : true
})
}
else{
this.setData({
userHasBaseInfo: false
})
}
},
//授权
onGetAuthorize(){
// 获取会员基础信息
my.getOpenUserInfo({
fail: (res) => {
console.log("refails", res)
},
success: (res) => {
let userInfo = JSON.parse(res.response).response // 以下方的报文格式解析两层 response
if (userInfo) {
utils.getUserInfoByBtn(userInfo).then((data = {}) => {
const {
token
} = data;
wx2my.setStorageSync('_accreditUserInfo', userInfo);
if (token) {
wx2my.setStorageSync('token', token);
} else {
wx2my.setStorageSync('token', '');
}
wx2my.setStorageSync('_baseUserInfo', data); // 存储用户开卡状态
this.setUserInfo();
}).catch(err => {
if (err) {
wx2my.showToast({
title: `会员系统异常请稍后重试!`,
icon: 'none'
});
}
});
} else {
this.setData({
userHasBaseInfo: false
});
}
}
});
},
setUserInfo() {
// 判断有无开卡
const userInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data; // 新用户去激活领卡
if (userInfo && userInfo.member && !userInfo.member.mobile && !userInfo.member.cardNoAlipay) {
wxService.openCard();
return false;
}
const urls = getCurrentPages();
setTimeout(() => {
this.onShow();
}, 200);
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
let url = this.data.activityInfo.listPicture ? this.data.activityInfo.listPicture : 'https://img3.bigaka.com/prd/3001/202003/20200331/3001649f2f08-3b4e-4b5b-97c1-30cdf646651c.png';
return {
title: `我分享给你一张“${this.data.activityInfo.couponName}”的优惠券,赶快领取吧~`,
path: `/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${this.data.activityId}`,
imageUrl: url, // 可以更换分享的图片
}
}
})
\ No newline at end of file
{
"defaultTitle": "优惠券信息",
"usingComponents": {}
}
\ No newline at end of file
......@@ -23,6 +23,12 @@ wxService.page({
*/
onLoad: function (options) {
my.hideShareMenu();
this.data.pageNum = 1;
this.data.pageSize = 10;
this.data.isNoData = false;
this.data.myCardsList = [];
this.getMyValueCardList();
},
......@@ -164,7 +170,6 @@ wxService.page({
this.data.myCardsList[index].isOpen = true;
this.data.no = this.data.myCardsList[index].no;
let canvasId = 'barcode' + index;
console.log(canvasId)
this.setData({
myCardsList: this.data.myCardsList,
......
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