From 13ccfca5678c8530371df896963f5039f484704a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Sat, 3 Aug 2019 17:17:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2ui=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/joinFrDpell/index.js | 1 + pages/joinFrDpell/index.wxml | 38 ++++++------ pages/joinFrDpell/index.wxss | 86 ++++++++++++-------------- pages/spellGroup/mySpellGroup/index.js | 3 +- 4 files changed, 62 insertions(+), 66 deletions(-) diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index 634396c..4d4e6ba 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -14,6 +14,7 @@ Page({ teljpgUrl: imgurl.teljpg.url, wmhome: imgurl.wmhome.url, orderGroupFail: imgurl.orderGroupFail.url, + homeSelectedO: imgurl.homeSelectedO.url, couponChannelId: '', couponId: '', data: [], diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml index ebabedd..6982f2c 100644 --- a/pages/joinFrDpell/index.wxml +++ b/pages/joinFrDpell/index.wxml @@ -45,31 +45,31 @@ 购买须知: {{data.remark}} - -
- - + + - - - - - {{data.salePrice}} - - - 参加拼团 - +
- - diff --git a/pages/joinFrDpell/index.wxss b/pages/joinFrDpell/index.wxss index b719aa1..0548019 100644 --- a/pages/joinFrDpell/index.wxss +++ b/pages/joinFrDpell/index.wxss @@ -13,6 +13,14 @@ height: auto; overflow: hidden; } +.edit-right{ + float: right; + width: 268rpx; + height: 96rpx; + line-height: 46rpx; + background:linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%); + border-radius:32rpx; +} .content{ position: relative; width: 100%; @@ -138,33 +146,10 @@ color:rgba(51,51,51,1); line-height:50rpx; } -.edit{ - position: fixed; - width: 690rpx; - bottom: 20rpx; - left: 30rpx; -} -.edit-left{ - float: left; - width: 269rpx; - height: 95rpx; - background:rgba(255,169,2,1); - box-shadow:0px 8rpx 8rpx 1rpx rgba(255,169,2,0.32); - border-radius:48rpx; -} -.edit-right{ - float: right; - width: 269rpx; - height: 95rpx; - line-height: 46rpx; - background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%); - box-shadow:0px 8rpx 8rpx 1rpx rgba(246,93,51,0.32); - border-radius:48rpx; -} .edit-left-top{ height: 46rpx; - line-height: 46rpx; text-align: center; + line-height:65rpx; } .price{ display: inline; @@ -173,27 +158,31 @@ font-family:PingFang-SC-Medium; font-weight:500; color:rgba(254,254,254,1); - margin-top: 6rpx; } .price-unit{ display: inline; font-size:27rpx; line-height: 27rpx; - margin-top: 11rpx; font-family:PingFang-SC-Medium; font-weight:500; color:rgba(254,254,254,1); } + .edit-left-bottom{ text-align: center; font-size:30rpx; line-height: 40rpx; - height: 40rpx; font-family:PingFang-SC-Medium; font-weight:500; color:rgba(254,254,254,1); } - +.edit-left{ + float: left; + width: 268rpx; + height: 96rpx; + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + border-radius:32rpx; +} .edit-right-top{ line-height: 32rpx; text-align: center; @@ -210,8 +199,6 @@ display: inline; font-size:27rpx; line-height: 27rpx; - margin-top: 11rpx; - font-family:PingFang-SC-Medium; font-weight:500; color:rgba(254,254,254,1); } @@ -219,7 +206,6 @@ text-align: center; font-size:30rpx; line-height: 40rpx; - font-family:PingFang-SC-Medium; font-weight:500; color:rgba(254,254,254,1); } @@ -318,6 +304,7 @@ color:rgba(51,51,51,1); line-height: 44rpx; } +button::after{ border: none; } .j-time{ display: inline; font-size:26rpx; @@ -328,24 +315,24 @@ } .goback { float:left; - width:122rpx!important; - height:95rpx; - background:rgba(255,255,255,1); - line-height:95rpx; - border:1rpx solid rgba(227,227,227,1); - /* box-shadow:0px 8px 8px 1px rgba(189,189,189,0.32); */ - border-radius:48rpx; + width:132rpx!important; + height:96rpx; + background:#fff!important; + line-height:96rpx; + border-radius:32rpx; margin-right:25rpx; + border: 0!important; + box-sizing: border-box; } .goback image{ - position:absolute; - width:60rpx; - left:0; - right:0; - top:0; + position: absolute; + width:52rpx; + height: 50rpx; + left: 0; + right: 0; + top: 0; bottom:0; - margin:auto; - height: 80rpx; + margin:10rpx auto; } .rest { font-size: 24rpx; @@ -377,7 +364,14 @@ color: #919191; letter-spacing: 0; } - +.edit{ + position:fixed; + bottom:0; + left:0; + right:0; + padding:20rpx 22rpx; + /* background:#fff; */ +} .times { display: inline-block; color: #ff4949; diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 8b3a39d..6bb20e9 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -497,7 +497,8 @@ Page({ /** * 发起支付 */ - orderFunc(orderGroupId) { + orderFunc() { + let orderGroupId = this.data.orderGroupId; let data = { couponChannelId: this.data.data.id, couponId: this.data.data.couponId, From 587ddcc6772566fc4a4eb43db054dec5d358e1c2 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 3 Aug 2019 17:18:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bargain/bargain.wxss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index 8cf9919..0175070 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -456,7 +456,7 @@ progress{ .no-data{ width: 690rpx; padding-top: 174rpx; - height: calc(100vh - 160rpx); + height: calc(100vh - 300rpx); background: #fff; margin: 0 auto; border-radius:15rpx;