diff --git a/app.json b/app.json index 887a9ba..760cfca 100644 --- a/app.json +++ b/app.json @@ -1,8 +1,8 @@ { "pages": [ - "pages/spellTimeout/index", "pages/index/index", "pages/spellDetail/index", + "pages/spellTimeout/index", "pages/spellGroup/mySpellGroup/index", "pages/spellGroup/spellGroup", "pages/complete/index", diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js index 0f92eb8..675fc10 100644 --- a/pages/spellDetail/index.js +++ b/pages/spellDetail/index.js @@ -101,7 +101,7 @@ Page({ }).then(res => { console.log(res,555555555) let data=res.data; - data.status=that.changeSatus(data.status); + data.statustext=that.changeSatus(data.status); that.countdown(data.expiredDate); data.salePrice = (data.salePrice/100).toFixed(2) that.setData({ diff --git a/pages/spellDetail/index.wxml b/pages/spellDetail/index.wxml index 3a1ed1d..0632fe1 100644 --- a/pages/spellDetail/index.wxml +++ b/pages/spellDetail/index.wxml @@ -1,8 +1,9 @@ + - {{data.status}} + {{data.statustext}} 结束 {{sec}} : @@ -40,6 +41,8 @@ 广场地址:{{data.addr}} + + @@ -60,6 +63,53 @@ 实付款 + + + + + 好友的拼团已完成 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 广场地址:北京市朝阳区东三环中路123号 + + + + 订单编号: diff --git a/pages/spellDetail/index.wxss b/pages/spellDetail/index.wxss index 900adf6..7fa4689 100644 --- a/pages/spellDetail/index.wxss +++ b/pages/spellDetail/index.wxss @@ -274,4 +274,21 @@ page { .user-motto::after { border: none; +} +.button button:nth-of-type(1){ + width:520rpx; + height:95rpx; + margin: 30rpx auto 38rpx; + background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); + border-radius:47rpx; + color: #fff; +} +.button button:nth-of-type(2){ + width:520rpx; + height:95rpx; + background:rgba(255,255,255,1); + border:1rpx solid rgba(190,190,190,1); + border-radius:47rpx; + color:#333333; + margin-bottom: 50rpx; } \ No newline at end of file