From 6034fb6e76aadc91a14e8d7edab96a3ae3fb06f7 Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Wed, 10 Apr 2024 10:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetingRoom/meetingCoupon/meetingCoupon.js | 5 ++++- .../meetingRoom/meetingCoupon/meetingCoupon.wxml | 7 ++++--- .../meetingRoom/meetingOrder/meetingOrder.js | 13 +++++++++++-- .../meetingRoom/meetingOrder/meetingOrder.wxml | 2 +- miniprogram/utils/util.js | 12 +++++++++++- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js index dcdefa7..cd873ef 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js @@ -18,7 +18,8 @@ Page({ couponId: null, meetingRoomId: null, dataList: [], - userDetail: {} + userDetail: {}, + parkName : wx.getStorageSync('parkName') }, /** @@ -54,8 +55,10 @@ Page({ let jieshuTime = new Date(item.endDate + " 23:59:59") if (nowTime >= kaishiTime && nowTime <= jieshuTime) { item.isDisable = false + item.bgUrl = '/profile/static/meeting/coupon/couponBg.png' } else { item.isDisable = true + item.bgUrl = '/profile/static/meeting/coupon/couponBgDisabled.png' } return item; }) diff --git a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml index 2c11d43..fab6427 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml @@ -5,7 +5,7 @@ - + {{item.duration}}小时 抵用券 @@ -14,9 +14,10 @@ - {{item.ticketName}} - 适用平台: {{item.content}} + {{item.ticketName}} x {{item.num}}张 + {{parkName}} {{item.startTime}}~{{item.endDate}} + 单次可用一张 diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index 773e5f2..1b23451 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -13,7 +13,8 @@ import { import { selfFormatTimeYMD, selfFormatTimeHM, - twoTimeInterval + twoTimeInterval, + selfArrSum } from "../../../../utils/util.js" @@ -37,8 +38,11 @@ Page({ couponId: '', couponData: {}, couponList: [], + couponCount: 0, couponUseList: [], + couponUseCount: 0, couponNotUseList: [], + couponNotUseCount: 0, countAmount: '', totalAmount: '', priceDialogShow: false, @@ -70,7 +74,7 @@ Page({ let bannerList = [] if (detail.indoorPicUrl) { try { - bannerList = JSON.parse(detail.indoorPicUrl).map(item=>item.url) + bannerList = JSON.parse(detail.indoorPicUrl).map(item => item.url) } catch (error) { console.log(`JSON error : ${error}`); } @@ -108,14 +112,19 @@ Page({ let useList = res.data.filter(item => !item.isDisable) // 不可用 let notUseList = res.data.filter(item => item.isDisable) + _this.setData({ couponList: dataList, + couponCount: selfArrSum(dataList.map(item => item.num)), couponUseList: useList, + couponUseCount: selfArrSum(useList.map(item => item.num)), couponNotUseList: notUseList, + couponNotUseCount: selfArrSum(notUseList.map(item => item.num)), }) }) }, + // 主题修改监听 titleChange(event) { this.setData({ diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index cfd84b0..d078c72 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -56,7 +56,7 @@ 优惠券 - {{couponId? couponData.ticketName : couponUseList.length + '张可用' + '(共计'+ couponList.length +'张)'}} + {{couponId? couponData.ticketName : couponUseCount + '张可用'}} diff --git a/miniprogram/utils/util.js b/miniprogram/utils/util.js index e23bba1..2cbae6a 100644 --- a/miniprogram/utils/util.js +++ b/miniprogram/utils/util.js @@ -206,6 +206,15 @@ const formatNumber = n => { return n[1] ? n : '0' + n } +// 数组sum合计 +function selfArrSum(list) { + let count = 0; + list.map(item => { + count = count + item + }) + return count +} + module.exports = { formatTime: formatTime, formatDate: formatDate, @@ -220,5 +229,6 @@ module.exports = { selfFormatTimeHM, selfFormatTimeYMDH, twoTimeInterval, - twoTimeIntervalReturnHours + twoTimeIntervalReturnHours, + selfArrSum } \ No newline at end of file