diff --git a/config/config.js b/config/config.js index 471ef0a..ec73d1c 100755 --- a/config/config.js +++ b/config/config.js @@ -2,8 +2,8 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var appId = extConfig.appId; var config = { // url: "https://ciformall.youlane.cn/C/api", - url:"https://c.malls.iformall.com/C/api", - // url:'https://ctest.malls.iformall.com/C/api', + // url:"https://c.malls.iformall.com/C/api", + url:'https://ctest.malls.iformall.com/C/api', // url:'http://10.100.33.68:7000/C/api', // url: 'http://202.165.179.86:4000/C/api', api: { @@ -203,7 +203,7 @@ var config = { }, weapp: { - AppId: "wx30caec1cc16c4634" + AppId: "wx649b3be73c1afe47" }, ErrorCode: { diff --git a/pages/cardListDetail/cardListDetail.js b/pages/cardListDetail/cardListDetail.js index 9ed624a..fbd544e 100644 --- a/pages/cardListDetail/cardListDetail.js +++ b/pages/cardListDetail/cardListDetail.js @@ -234,15 +234,6 @@ Page({ that.countdown(res.data.endTime); //当前时间与优惠券下架时间做计算 var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); - if (util.timechuo(endTime).indexOf('-') == 0) { - that.setData({ - endtime: "活动已结束", - }); - } else { - that.setData({ - endtime: util.timechuo(endTime) - }); - } } wx.hideLoading(); that.setData({ diff --git a/pages/cardListDetail/cardListDetail.wxml b/pages/cardListDetail/cardListDetail.wxml index 967030a..c734129 100644 --- a/pages/cardListDetail/cardListDetail.wxml +++ b/pages/cardListDetail/cardListDetail.wxml @@ -1,5 +1,4 @@ - - - - - 距结束还剩 : - - - {{day}}天 - {{hour}}: - {{min}}: - {{sec}} - - - {{day}}天 - {{hour}}: - {{min}}: - {{sec}} - - {{data.title}} {{data.subTitle}} diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index cdbc7db..eded453 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -17,13 +17,11 @@ 距结束还剩 : - {{day}}{{hour}}: {{min}}: {{sec}} - {{day}}{{hour}}: {{min}}: {{sec}} diff --git a/project.config.json b/project.config.json index 9f2f1d1..2970aaf 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx30caec1cc16c4634", + "appid": "wx649b3be73c1afe47", "projectname": "C", "isGameTourist": false, "condition": { diff --git a/utils/util.js b/utils/util.js index 22eafea..742b373 100644 --- a/utils/util.js +++ b/utils/util.js @@ -92,7 +92,7 @@ function timechuo(startTime) { var minute = Math.floor(runTime / 60); var runTime = runTime % 60; var second = runTime; - return (day+"天"+hour+"小时"+minute+"分钟") + return (hour+"小时"+minute+"分钟") }