diff --git a/app.json b/app.json index 4c71304..fb7e48d 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "pages": [ - "pages/spellDetail/index", "pages/index/index", + "pages/spellDetail/index", "pages/spellGroup/mySpellGroup/index", "pages/spellGroup/spellGroup", "pages/complete/index", diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js index 7d9a25d..0f92eb8 100644 --- a/pages/spellDetail/index.js +++ b/pages/spellDetail/index.js @@ -2,6 +2,7 @@ var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); +const {spellStatus} = require("../../utils/spell"); Page({ /** @@ -11,15 +12,103 @@ Page({ tuanzhang: imgurl.tuanzhang.url, spellBg: imgurl.spellBg.url, position: imgurl.position.url, + paramData:null, + data:null, + clock: "00", + day: "00", + hour: "00", + min: "00", + sec: "00", + spellStatusList: spellStatus }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + console.log(this.data.spellStatusList,7777777) + this.setData({ + paramData:options + }) + this.getDetail(options) + }, + /** + * 拼团状态字段转换 + */ + changeSatus(status){ + console.log(spellStatus,8888888) + return spellStatus.filter(item=>item.value==status)[0].name; + }, + // 时间格式化输出,如11:03 25:19 每1s都会调用一次 + dateformat(micro_second) { + // 总秒数 + var second = Math.floor(micro_second / 1000); + // 天数 + var day = Math.floor(second / 3600 / 24) < 10 ? "0" + Math.floor(second / 3600 / 24) : Math.floor(second / 3600 / 24); + // 小时 + var hr = Math.floor(second / 3600 % 24) < 10 ? "0" + Math.floor(second / 3600 % 24) : Math.floor(second / 3600 % 24); + // 分钟 + var min = Math.floor(second / 60 % 60) < 10 ? "0" + Math.floor(second / 60 % 60) : Math.floor(second / 60 % 60); + // 秒 + var sec = Math.floor(second % 60) < 10 ? "0" + Math.floor(second % 60) : Math.floor(second % 60); + + // return day + "天" + hr + "小时" + min + "分钟" + sec + "秒"; + return { + a1: day, + b1: hr, + c1: min, + d1: sec + } + }, + countdown(end_time) { + let that = this; + var EndTime = end_time; + var NowTime = new Date().getTime(); + var total_micro_second = EndTime - NowTime || []; + // 渲染倒计时时钟 + let obj = that.dateformat(total_micro_second); + if (total_micro_second > 0) { + that.setData({ + clock: obj, + day: obj.a1, + hour: obj.b1, + min: obj.c1, + sec: obj.d1, + }) + } else { + that.setData({ + clock: "00", + day: "00", + hour: "00", + min: "00", + sec: "00", + }) + } + setTimeout(function () { + total_micro_second -= 1000; + that.countdown(end_time); + }, 1000) + }, + getDetail(){ + let that = this; + Http.get({ + url: config.api.queryOrderGroupStatus, + data: { + orderId: this.data.paramData.orderId, + couponId: this.data.paramData.couponId, + id: this.data.paramData.orderGroupId + } + }).then(res => { + console.log(res,555555555) + let data=res.data; + data.status=that.changeSatus(data.status); + that.countdown(data.expiredDate); + data.salePrice = (data.salePrice/100).toFixed(2) + that.setData({ + data:res.data + }) + }); }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/spellDetail/index.wxml b/pages/spellDetail/index.wxml index 1e151d0..3a1ed1d 100644 --- a/pages/spellDetail/index.wxml +++ b/pages/spellDetail/index.wxml @@ -2,13 +2,13 @@ - 拼团中 + {{data.status}} 结束 - 09 + {{sec}} : - 59 + {{min}} : - 23 + {{hour}} 剩余 @@ -37,25 +37,40 @@ - 广场地址:北京市朝阳区东三环中路123号 + 广场地址:{{data.addr}} - + - 100元拼团券 - 是打发士大夫撒旦 + {{data.title}} + {{data.subTitle}} + {{data.salePrice}}元 拼团价 - 19.00元 - + + + {{data.salePrice}} + 实付款 + + + + + 订单编号: + {{paramData.orderId}} + + + 团单编号: + {{data.orderGroupId}} + + + + - - diff --git a/pages/spellDetail/index.wxss b/pages/spellDetail/index.wxss index a83fc9f..900adf6 100644 --- a/pages/spellDetail/index.wxss +++ b/pages/spellDetail/index.wxss @@ -116,7 +116,7 @@ page { } .status-bottom{ width: 100%; - height: 72rpx; + height: auto; overflow: hidden; } .position-icon{ @@ -147,6 +147,7 @@ page { width: 100%; height: auto; overflow: hidden; + padding-bottom: 12rpx; } .detail-top01{ float: left; @@ -179,4 +180,98 @@ page { } .detail-top03{ float: left; + padding-top: 170rpx; + width: 230rpx; +} +.detail-p-name{ + float: right; + font-size:26rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(134,134,134,1); + line-height:44rpx; +} +.detail-p-price{ + float: right; + font-size:26rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(51,51,51,1); +} +.detail-bottom{ + border-top: 1rpx solid #F9F9F9; + width: 100%; + overflow: hidden; + height: 86rpx; +} +.b-unit{ + float: right; + font-size:24rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(237,63,46,1); + margin-top: 36rpx; +} +.b-price{ + float: right; + font-size:40rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(237,63,46,1); + margin-top: 18rpx; +} +.b-name{ + float: right; + font-size:26rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(51,51,51,1); + margin-right: 6rpx; + margin-top: 34rpx; +} +.order{ + width: 690rpx; + padding:10rpx 28rpx; + margin: 30rpx auto 0; + box-sizing: border-box; + background:rgba(255,255,255,1); + border-radius:15rpx; +} +.order-list{ + height: 55rpx; +} +.order-title{ + line-height: 55rpx; + float: left; + font-size:26rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(51,51,51,1); +} +.order-text{ + float: right; + text-align: right; + line-height: 55rpx; + font-size:26rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(134,134,134,1); +} +.user-motto { + border: 0; + width:650rpx; + height:85rpx; + background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); + box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32); + border-radius:43rpx; + font-size:36rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(254,254,254,1); + line-height: 85rpx; + margin-top: 200rpx; +} + +.user-motto::after { + border: none; } \ No newline at end of file diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 8a395ed..5f6e0de 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -140,7 +140,7 @@ Page({ }) .then(res => { wx.navigateTo({ - url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}` + url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}&orderGroupId=${res.data.orderGroupId}` }); }) .catch(err => { diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index 79be6de..e5c4cdc 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -12,6 +12,7 @@ Page({ mybargain: false, list: [], lists: [], + myLists:[], page: 1, // 设置加载的第几次,默认是第一次 pageSize: 10, //返回数据的个数 searchLoadingComplete: false, //“没有数据”的变量,默认false,隐藏 diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml index 45fb23b..84b977d 100644 --- a/pages/spellGroup/spellGroup.wxml +++ b/pages/spellGroup/spellGroup.wxml @@ -26,6 +26,27 @@ 已拼27 + + + + + + {{item.title}} + {{item.subTitle}} + {{item.pressLimitNum+'人团'}} + + + {{item.salePriceStr}} + + + {{item.priceStr}} + + + + 去拼团 + 已拼27 + + 拼团商品 diff --git a/utils/spell.js b/utils/spell.js new file mode 100644 index 0000000..7030b58 --- /dev/null +++ b/utils/spell.js @@ -0,0 +1,21 @@ +const spellStatus=[ + { + name:'拼团中', + value:10 + }, + { + name: '拼团成功', + value: 11 + }, + { + name: '拼团已过期', + value: 12 + }, + { + name: '拼团失败', + value: 13 + } +] +module.exports={ + spellStatus +} \ No newline at end of file