Commit 8b1e9f93 by 谢中龙

超值卡

parent 1136500f
...@@ -43,3 +43,8 @@ require('../../subPackage/page/pages/IntegralMallGoods/IntegralMallGoods?hash=e0 ...@@ -43,3 +43,8 @@ require('../../subPackage/page/pages/IntegralMallGoods/IntegralMallGoods?hash=e0
require('../../subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo?hash=b4c0a5af1dc62ebff6a5ef0697590876d1297701'); require('../../subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo?hash=b4c0a5af1dc62ebff6a5ef0697590876d1297701');
require('../../subPackage/page/pages/exchangeAddress/exchangeAddress?hash=ed22392e095acc6c49aa01d6de0fcec176d41787'); require('../../subPackage/page/pages/exchangeAddress/exchangeAddress?hash=ed22392e095acc6c49aa01d6de0fcec176d41787');
require('../../subPackage/page/pages/recordList/recordList?hash=15ffdcc67ea7c18f6aec5cf8d50acebf6f4842c8'); require('../../subPackage/page/pages/recordList/recordList?hash=15ffdcc67ea7c18f6aec5cf8d50acebf6f4842c8');
require('../../subPackage/page/pages/valueCard/valueCard?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/valueCardInfo/valueCardInfo?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/valueCardRecords/valueCardRecords?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/myValueCard/myValueCard?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/myValueCardInfo/myValueCardInfo?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
...@@ -69,6 +69,11 @@ require('../../subPackage/page/pages/IntegralMallGoods/IntegralMallGoods?hash=e0 ...@@ -69,6 +69,11 @@ require('../../subPackage/page/pages/IntegralMallGoods/IntegralMallGoods?hash=e0
require('../../subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo?hash=b4c0a5af1dc62ebff6a5ef0697590876d1297701'); require('../../subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo?hash=b4c0a5af1dc62ebff6a5ef0697590876d1297701');
require('../../subPackage/page/pages/exchangeAddress/exchangeAddress?hash=ed22392e095acc6c49aa01d6de0fcec176d41787'); require('../../subPackage/page/pages/exchangeAddress/exchangeAddress?hash=ed22392e095acc6c49aa01d6de0fcec176d41787');
require('../../subPackage/page/pages/recordList/recordList?hash=15ffdcc67ea7c18f6aec5cf8d50acebf6f4842c8'); require('../../subPackage/page/pages/recordList/recordList?hash=15ffdcc67ea7c18f6aec5cf8d50acebf6f4842c8');
require('../../subPackage/page/pages/valueCard/valueCard?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/valueCardInfo/valueCardInfo?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/valueCardRecords/valueCardRecords?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/myValueCard/myValueCard?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../subPackage/page/pages/myValueCardInfo/myValueCardInfo?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
} }
self.bootstrapApp ? self.bootstrapApp({ success }) : success(); self.bootstrapApp ? self.bootstrapApp({ success }) : success();
} }
\ No newline at end of file
{"layout":{"left":{"currentId":"explorer","size":310},"right":{"currentId":""},"bottom":{"currentId":"devtools","size":384}},"storageVersion":"1.5.7"} {"layout":{"left":{"currentId":"explorer","size":310},"right":{"currentId":""},"bottom":{"currentId":"devtools","size":468}},"storageVersion":"1.5.7"}
\ No newline at end of file \ No newline at end of file
{"OPENED_FILE":["file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/project.config.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/coupons/coupons.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointList/pointList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/mySpend/mySpend.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/integralWater/integralWater.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/recordList/recordList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/pointGoodsList/pointGoodsList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/userCenter/userCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/integralWater/integralWater.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/userCenter/userCenter.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.axml"],"SEARCH_WORD":["person-center","memberId","pullRefresh"],"storageVersion":"1.5.7"} {"OPENED_FILE":["file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/utils/Http.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/project.config.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/coupons/coupons.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointList/pointList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/mySpend/mySpend.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/integralWater/integralWater.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/recordList/recordList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/pointGoodsList/pointGoodsList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/userCenter/userCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/integralWater/integralWater.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/userCenter/userCenter.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.axml"],"SEARCH_WORD":["person-center","memberId","pullRefresh"],"storageVersion":"1.5.7"}
\ No newline at end of file \ No newline at end of file
{"grid":{"editorGroup":{"uris":["file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js"],"current":"file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js","previewIndex":-1}},"storageVersion":"1.5.7"} {"grid":{"editorGroup":{"uris":["file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.js"],"current":"file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.axml","previewIndex":-1}},"storageVersion":"1.5.7"}
\ No newline at end of file \ No newline at end of file
...@@ -109,9 +109,9 @@ App({ ...@@ -109,9 +109,9 @@ App({
isFullSucreen: false, isFullSucreen: false,
// 当前设备是否为 FullSucreen // 当前设备是否为 FullSucreen
commonFunc: commonFunc, commonFunc: commonFunc,
// brandId: 2711, brandId: 2711,
// brandId: 2005, // brandId: 2005,
// brandId: 1001, // brandId: 1001,
brandId: 1002, // brandId: 1002,
} }
}); });
\ No newline at end of file
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 needMock = ''; // const needMock = ''; //
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
......
/* subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxss */ /* subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxss */
page{ page{
background: #ffffff; background: #f2f2f2;
box-sizing: border-box; box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
} }
...@@ -42,7 +42,7 @@ view{ ...@@ -42,7 +42,7 @@ view{
width: 100%; width: 100%;
height: auto; height: auto;
padding: 30rpx 90rpx; padding: 30rpx 90rpx;
background: #f2f2f2; background: #ffffff;
} }
.left-num-container .left-icons{ .left-num-container .left-icons{
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<view class='card-info-body'> <view class='card-info-body'>
<view class='card-desc-item'> <view class='card-desc-item' a:if="{{valueCardInfo.hasDate}}">
<view class='lf'>活动时间</view> <view class='lf'>活动时间</view>
<view class='rg'>{{valueCardInfo.startTime}} 至 {{valueCardInfo.endTime}}</view> <view class='rg'>{{valueCardInfo.startTime}} 至 {{valueCardInfo.endTime}}</view>
</view> </view>
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
<view class='lf'>积分兑换</view> <view class='lf'>积分兑换</view>
<view class='rg'>{{valueCardInfo.buyIntegration}}积分</view> <view class='rg'>{{valueCardInfo.buyIntegration}}积分</view>
</view> </view>
<view class='card-desc-item'> <view class='card-desc-item'
<view class='lf'>使用说明</view> a:for="{{valueCardInfo.descArr}}"
a:for-item="item"
a:for-index="idx"
a:key="*this">
<view class='lf'>{{item.label ? item.label : '说明内容'}}</view>
<view class='rg'> <view class='rg'>
<view class='list-item' <view class='list-item'>{{item.value}}</view>
a:for="{{valueCardInfo.descArr}}"
a:for-item="item"
a:for-index="idx"
a:key="*this"> {{idx + 1}}、{{item}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -60,13 +60,14 @@ wxService.page({ ...@@ -60,13 +60,14 @@ wxService.page({
} }
obj.activityDesc = obj.activityDesc ? JSON.parse(obj.activityDesc) : []; obj.activityDesc = obj.activityDesc ? JSON.parse(obj.activityDesc) : [];
obj.hasDate = obj.activityDesc.filter(item => item.type == 1).length > 0;
let descArr = JSON.parse(JSON.stringify(obj.activityDesc)); let descArr = JSON.parse(JSON.stringify(obj.activityDesc));
descArr = descArr.filter(item => item.type != 1); descArr = descArr.filter(item => item.type != 1);
let tempArr = descArr.map(item => { // let tempArr = descArr.map(item => {
return item.value; // return item.value;
}); // });
obj.descArr = tempArr; obj.descArr = descArr;
this.data.valueCardInfo = obj; this.data.valueCardInfo = obj;
this.setData({ this.setData({
valueCardInfo: this.data.valueCardInfo, valueCardInfo: this.data.valueCardInfo,
......
...@@ -61,4 +61,25 @@ view{ ...@@ -61,4 +61,25 @@ view{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
}
/* component/empty/empty.wxss */
.page-empty{
width: 100%;
height: auto;
padding: 100rpx 40rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: 24rpx;
color: #999999;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.page-empty image{
width: 200rpx;
height: 160rpx;
margin-bottom: 20rpx;
} }
\ No newline at end of file
<!--subPackage/page/pages/valueCard/valueCard.wxml--> <!--subPackage/page/pages/valueCard/valueCard.wxml-->
<view class='cards-list'> <view class='cards-list' a:if="{{cardList.length > 0}}">
<view class='card-item' <view class='card-item'
a:for="{{cardList}}" a:for="{{cardList}}"
a:for-item="item" a:for-item="item"
...@@ -12,4 +12,9 @@ ...@@ -12,4 +12,9 @@
</view> </view>
</view> </view>
<view class='no-more'>-- 我也是有底线滴 --</view> <view class='page-empty' a:else>
\ No newline at end of file <image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/empty.png' mode='aspectFit'></image>
<view>暂无超值卡活动哦~</view>
</view>
<!-- <view class='no-more'>-- 我也是有底线滴 --</view> -->
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<image src='{{valueCardInfo.listUrl}}' class='card-info' mode='widthFix'></image> <image src='{{valueCardInfo.listUrl}}' class='card-info' mode='widthFix'></image>
<view class='card-info-body'> <view class='card-info-body'>
<view class='card-title'>{{valueCardInfo.activityName}}</view> <view class='card-title'>{{valueCardInfo.activityName}}</view>
<view class='card-desc-item'> <view class='card-desc-item' a:if="{{valueCardInfo.hasDate}}">
<view class='lf'>活动时间</view> <view class='lf'>活动时间</view>
<view class='rg'>{{valueCardInfo.startTime}} 至 {{valueCardInfo.endTime}}</view> <view class='rg'>{{valueCardInfo.startTime}} 至 {{valueCardInfo.endTime}}</view>
</view> </view>
...@@ -14,15 +14,14 @@ ...@@ -14,15 +14,14 @@
<view class='lf'>积分兑换</view> <view class='lf'>积分兑换</view>
<view class='rg'>{{valueCardInfo.integrationAmount}}积分</view> <view class='rg'>{{valueCardInfo.integrationAmount}}积分</view>
</view> </view>
<view class='card-desc-item'> <view class='card-desc-item'
<view class='lf'>使用说明</view> a:for="{{valueCardInfo.descArr}}"
a:for-item="item"
a:for-index="idx"
a:key="*this">
<view class='lf'>{{item.label ? item.label : '说明内容'}}</view>
<view class='rg'> <view class='rg'>
<view class='list-item' <view class='list-item'> {{item.value}}</view>
a:for="{{valueCardInfo.descArr}}"
a:for-item="item"
a:for-index="idx"
a:key="*this"
> {{idx+1}}、{{item}}</view>
</view> </view>
</view> </view>
</view> </view>
......
...@@ -48,14 +48,14 @@ wxService.page({ ...@@ -48,14 +48,14 @@ wxService.page({
obj.acPayMoney = parseFloat(obj.moneyAmount / 10 / 10).toFixed(2); obj.acPayMoney = parseFloat(obj.moneyAmount / 10 / 10).toFixed(2);
obj.startTime = obj.startTime.substring(0, 10); obj.startTime = obj.startTime.substring(0, 10);
obj.endTime = obj.endTime.substring(0,10); obj.endTime = obj.endTime.substring(0,10);
obj.hasDate = obj.activityDesc.filter(item => item.type == 1).length > 0;
//处理说明文本 //处理说明文本
let descArr = JSON.parse(JSON.stringify(obj.activityDesc)); let descArr = JSON.parse(JSON.stringify(obj.activityDesc));
descArr = descArr.filter(item => item.type != 1); descArr = descArr.filter(item => item.type != 1);
let tempArr = descArr.map(item => { // let tempArr = descArr.map(item => {
return item.value; // return item.value;
}); // });
obj.descArr = tempArr; obj.descArr = descArr;
this.data.valueCardInfo = obj; this.data.valueCardInfo = obj;
this.setData({ this.setData({
buyType: this.data.buyType, buyType: this.data.buyType,
...@@ -119,6 +119,10 @@ wxService.page({ ...@@ -119,6 +119,10 @@ wxService.page({
else{ else{
url = `/merchant/superValueCard/miniProgram/buy?activityId=${activityId}&memberId=${memeberId}&storeId=${storeId}`; url = `/merchant/superValueCard/miniProgram/buy?activityId=${activityId}&memberId=${memeberId}&storeId=${storeId}`;
} }
this.setData({
checked: false,
});
wx2my.showLoading({ wx2my.showLoading({
title: '支付中..', title: '支付中..',
...@@ -127,9 +131,6 @@ wxService.page({ ...@@ -127,9 +131,6 @@ wxService.page({
wxService.post(url).then(res => { wxService.post(url).then(res => {
wx2my.hideLoading(); wx2my.hideLoading();
if(res.data.result == 0){ if(res.data.result == 0){
this.setData({
checked: false,
});
//现金支付 //现金支付
if (this.data.buyType == 1){ if (this.data.buyType == 1){
let data = res.data.data ? res.data.data : null; let data = res.data.data ? res.data.data : null;
......
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