From bbc4553764b560a7a37bd279147f3926318debb1 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Mon, 22 May 2023 15:51:29 +0800 Subject: [PATCH] upload --- ext.json | 12 +++++------- pages/coupon/detail/index.js | 2 ++ pages/coupon/detail/index.ttml | 8 +++++++- pages/order/detail/index.js | 7 ++++++- pages/order/detail/index.ttml | 6 ++++++ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ext.json b/ext.json index d547379..bd289e8 100644 --- a/ext.json +++ b/ext.json @@ -1,23 +1,21 @@ { "ext": { "attr": { - "configUrl": "https://c.malls.iformall.com/C/api" + "configUrl": "https://ctest.malls.iformall.com/C/api" }, - "name": "吾悦广场", - "weappId": "tt48a23e1fd79d648801" + "name": "富茂券券集团版", + "weappId": "tt620e14b3fd30264101" }, "window": { "backgroundTextStyle": "light", "navigationBarTextStyle": "black", - "navigationBarTitleText": "Mini Program", "navigationBarBackgroundColor": "#fff" }, - "extAppid": "tt48a23e1fd79d648801", + "extAppid": "tt620e14b3fd30264101", "extEnable": true, "directCommit": false, "networkTimeout": { "request": 30000, "downloadFile": 10000 - }, - "requiredPrivateInfos": ["chooseLocation", "getLocation"] + } } \ No newline at end of file diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 873c7e8..287505b 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -789,6 +789,8 @@ Page({ } if (res.data.validType == 1) { that.setData({ + soldStartTime: util.formatTime(res.data.soldStartTime, "yyyy-MM-dd") || null, + soldEndTime: util.formatTime(res.data.soldEndTime, "yyyy-MM-dd") || null, validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"), pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), diff --git a/pages/coupon/detail/index.ttml b/pages/coupon/detail/index.ttml index f9b47d8..60825df 100644 --- a/pages/coupon/detail/index.ttml +++ b/pages/coupon/detail/index.ttml @@ -140,8 +140,14 @@ 购买须知 - 有效期 + 使用期 • {{validStartDate}}至{{validEndDate}} + + + 售卖期 + • {{soldStartTime}}至{{soldEndTime}} + + 可用时间 • 商家营业时间内到店使用 • 周末不支持使用 diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 4c913bb..ce478ce 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -281,8 +281,13 @@ Page({ let tempData = res.data.orders[0] tempData.deliveryInfo = tempData.deliveryInfo ? JSON.parse(tempData.deliveryInfo) : "" tempData.itemGroup = tempData.itemGroup ? JSON.parse(tempData.itemGroup) : "" - tempData.validStartDate = util.formatTime(tempData.validStartDate, "yyyy-MM-dd") + + tempData.soldStartTime = util.formatTime(tempData.soldStartTime, "yyyy-MM-dd") || null, + tempData.soldEndTime = util.formatTime(tempData.soldEndTime, "yyyy-MM-dd") || null, + + tempData.validStartDate = util.formatTime(tempData.validStartDate, "yyyy-MM-dd") tempData.validEndDate = util.formatTime(tempData.validEndDate, "yyyy-MM-dd") + tempData.couponOrderIdS = tempData.couponOrderId ? tempData.couponOrderId.slice(0, 4) + `******` + tempData.couponOrderId.slice(14) : '' if (tempData.productAttrs && tempData.skuAttrs) { diff --git a/pages/order/detail/index.ttml b/pages/order/detail/index.ttml index 5fc6c48..c672bae 100644 --- a/pages/order/detail/index.ttml +++ b/pages/order/detail/index.ttml @@ -183,6 +183,12 @@ 购买须知 有效期 • {{order.validStartDate}}至{{order.validEndDate}} + + + 售卖期 + • {{order.soldStartTime}}至{{order.soldEndTime}} + + 可用时间 • 商家营业时间内到店使用 • 周末不支持使用