Commit 0a2315f3 by 谢中龙

修改字段

parent b515a2d1
{"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":{"_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":"88684861da494c6b87f5f8ac6ef5YX45","_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":"composeBd9b25e0f7dff42cbacaea02a550eaX45","outerStr":"{\"activateType\":\"normal\"}","memberId":"594104268563292160","member":{"id":"594104268563292160","createTime":"2019-06-28 09:58:15","updateTime":"2020-04-21 14:16:32","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":"保密","address":"上海市-上海市-浦东新区-盛夏路58号天之骄子创业公寓6号楼蜂巢柜","email":"xiezl@bigaka.com","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":["userInfo"],"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"},{"title":"消费集点列表","page":"pages/pointList/pointList"},{"title":"领券中心","page":"subPackage/page/pages/couponCenter/couponCenter"},{"title":"首页","page":"pages/userCenter/userCenter"}],"compilerIndex":6,"SimulatorMode":"EMBED"}
\ 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-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"}
\ 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/subPackage/page/pages/couponCenter/couponCenter.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/app.json","file:///d%3A/work/711Web/711/7_Eleven_Alipay/Behavior.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/wx2my.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/component/picNav/picNav.axml","file:///d%3A/work/711Web/711/7_Eleven_Alipay/component/picNav/picNav.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/utils/currentLinkRouter.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/app.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/utils/common.js","file:///d%3A/work/711Web/711/7_Eleven_Alipay/wxs/utils.sjs","file:///d%3A/work/711Web/711/7_Eleven_Alipay/component/imageSwiper/imageSwiper.js"],"current":"file:///d%3A/work/711Web/711/7_Eleven_Alipay/utils/common.js","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/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"}
\ No newline at end of file
......@@ -15,6 +15,7 @@ require('../../component/statusPoint/statusPoint');
require('../../component/dialog/dialog');
require('../../component/progressPoint/progressPoint');
require('../../component/progressImage/progressImage');
require('../../component/imageDialog/imageDialog');
require('../../component/authorization-modal-point/authorization-modal-point');
require('../../component/dialogStockEmpty/dialogStockEmpty');
require('../../component/dialogUserLimit/dialogUserLimit');
......
......@@ -32,6 +32,7 @@ require('../../component/statusPoint/statusPoint');
require('../../component/dialog/dialog');
require('../../component/progressPoint/progressPoint');
require('../../component/progressImage/progressImage');
require('../../component/imageDialog/imageDialog');
require('../../component/authorization-modal-point/authorization-modal-point');
require('../../component/dialogStockEmpty/dialogStockEmpty');
require('../../component/dialogUserLimit/dialogUserLimit');
......
{"files":["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\\component\\imageSwiper\\imageSwiper.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\configScreen\\configScreen.js","d:\\work\\711Web\\711\\7_Eleven_Alipay\\config\\index.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\\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"],"storageVersion":"0.70.14"}
\ No newline at end of file
{"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"}
\ No newline at end of file
/* component/adDialog/adDialog.wxss */
.ad-modal-bg{
position: fixed;
z-index: 9999;
width: 100vw;
height: 100vh;
background: rgba(0, 0, 0, 0.5);
left: 0;
top: 0;
display: flex;
justify-content: center;
align-items: center;
}
.ad-modal-bg .ad-modal-body{
width: 70vw;
height: auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.ad-modal-bg .ad-modal-body .show-img{
width: 100%;
height: auto;
}
.ad-modal-bg .ad-modal-body .show-img image{
width: 100%;
height: auto;
}
.ad-modal-bg .ad-modal-body .close-dia{
width: 100%;
height: auto;
padding-top: 10rpx;
display: flex;
align-items: center;
justify-content: center;
}
.ad-modal-bg .ad-modal-body .close-dia image{
width: 80rpx;
height: 80rpx;
}
.ad-modal-bg .ad-modal-body .close-dia image:active{
opacity: 0.7;
}
\ No newline at end of file
<!--component/adDialog/adDialog.wxml-->
<view class="ad-modal-bg" a:if="{{showDialog}}">
<view class="ad-modal-body">
<view class="show-img">
<image mode="widthFix" src="{{imageUrl}}" onTap="onTapPic"></image>
</view>
</view>
</view>
// component/adDialog/adDialog.js
const wx2my = require('../../wx2my');
const Behavior = require('../../Behavior');
var app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
Component({
/**
* 组件的属性列表
*/
properties: {
showDialog : {
type:Boolean,
value: false
},
imageUrl : {
type : String,
default : ''
},
params: {
type:Object,
value: null
}
},
observers:{
},
/**
* 组件的初始数据
*/
data: {
},
lifetimes:{
attached(){
// console.log(this.data.pageInfo)
},
created(){
}
},
/**
* 组件的方法列表
*/
methods: {
//关闭
onTapClose(){
this.setData({
showDialog :false
});
},
//图片的点击
onTapPic(){
// this.triggerEvent('dialogTap',this.data.params);
this.props.onDialogTap(this.data.params);
this.setData({
showDialog :false
});
}
}
})
{
"component": true
}
\ No newline at end of file
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
......
......@@ -2,7 +2,7 @@
<wxs src="./tools.wxs" module="tools" />
<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" wx:if="{{goal}}">
<view class="info-top weui-flex df-j--bt">
<view class="info-num">
进度:
......@@ -60,3 +60,6 @@ view class="detail-info border_box" wx:if="{{goal}}">
/>
<authorization-modal-point isAuthorization='{{isAuthorization}}'/>
<image-dialog showDialog="{{showDonateImgUrl}}" imageUrl="{{donateImgUrl}}" onDialogTap="onDialogTap"/>
......@@ -43,6 +43,8 @@ wxService.page({
currentStatus: 2, // 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentTimeStatus: 1, // 1 进行中 2 已结束 3 未开始
isAuthorization: false,
donateImgUrl : '',
showDonateImgUrl : false,
},
watch: {
experAccessible(newVal, oldVal) {
......@@ -110,6 +112,7 @@ wxService.page({
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();
......@@ -134,7 +137,8 @@ wxService.page({
desc: JSON.parse(data.content),
detailImage: data.detailImage,
dialog,
currentTimeStatus: timeFlag
currentTimeStatus: timeFlag,
donateImgUrl : this.data.donateImgUrl
}, () => {
// 1 进行中 2 已结束
if (timeFlag == 2) {
......@@ -146,7 +150,7 @@ wxService.page({
// 会员集点活动统计信息 进行中且有效
this.getPointConsumptionCount(id)
//扫码进去领取集点
// this.getUserShowRewardCollectionPoint(id);
this.getUserShowRewardCollectionPoint(id);
}
})
}
......@@ -177,17 +181,32 @@ wxService.page({
this.showModal = true;
my.alert({
title: '集点领取提示',
content: '恭喜您获得一个集点',
buttonText: '确认领取',
success: () => {
self.userConfirmGetCollectionPoint(id);
self.showModal = false;
}
this.setData({
showDonateImgUrl : true,
});
// return ;
// my.alert({
// title: '集点领取提示',
// content: '恭喜您获得一个集点',
// buttonText: '确认领取',
// success: () => {
// self.userConfirmGetCollectionPoint(id);
// self.showModal = false;
// }
// });
},
onDialogTap(e){
this.setData({
showDonateImgUrl : false
});
this.userConfirmGetCollectionPoint(this.data.id);
},
//调用领取接口
userConfirmGetCollectionPoint(id){
wxService.post(`/sale/touchpoints/pointConsumptionActivity/award?id=${id}`).then(res => {
......
......@@ -4,6 +4,7 @@
"x-dialog":"/component/dialog/dialog",
"x-progress-point":"/component/progressPoint/progressPoint",
"x-progress-image":"/component/progressImage/progressImage",
"image-dialog" : "/component/imageDialog/imageDialog" ,
"authorization-modal-point": "/component/authorization-modal-point/authorization-modal-point"
},
"defaultTitle": "集点详情",
......
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