From b7c894d092fccf9ce611847b7e9c1ae1528a9c6d Mon Sep 17 00:00:00 2001 From: hurui Date: Fri, 19 Jul 2019 19:08:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=85=91=E6=8D=A2=E7=A0=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [我的砍价][修改][样式] --- pages/bargain/bargain.js | 3 +++ pages/bargain/bargain.wxml | 14 +++++++---- pages/bargain/bargain.wxss | 44 +++++++++++++++++++++++++++-------- pages/coupon/detail/index.js | 4 ++-- pages/edit/edit.js | 2 ++ pages/edit/edit.wxml | 7 ++++-- pages/edit/edit.wxss | 21 ++++++++++++----- pages/order/detail/index.js | 2 +- pages/order/detail/index.wxml | 2 +- pages/order/detail/index.wxss | 7 +++--- pages/orderquanma/index.wxml | 2 +- pages/orderquanma/index.wxss | 2 +- utils/imgurl.js | 16 +++++++++++-- 13 files changed, 92 insertions(+), 34 deletions(-) diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index f36a07d..f340a66 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -6,6 +6,9 @@ Page({ * 页面的初始数据 */ data: { + orangeImg: imgurl.orange.url, + blueImg: imgurl.blue.url, + grayImg: imgurl.gray.url, bannerUrl: imgurl.banner.url, loadingUrl: imgurl.loading.url, bargaincancel: imgurl.bargaincancel.url, diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index 9594102..2d0b08d 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -13,7 +13,7 @@ bindload=""> {{item.title}} - {{item.subTitle}} + 可砍至¥{{item.salePriceStr}}原价{{item.priceStr}} 发起砍价 @@ -26,11 +26,15 @@ + 进行中 + 已完成 + 已失效 + {{item.title}} - {{item.subTitle}} - 已砍至¥ {{item.salePrice/100}}原价{{item.priceStr}} + + 已砍至¥ {{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}}原价{{item.price/100}} 已砍价到底价:{{item.salePrice/100}}元 @@ -55,8 +59,8 @@ - - 还差5人即享最低 + + 还差{{item.pressLimitNum-item.pressCurrentNum}}人即享最低 已至底价 diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index 5c774a9..bc23fcd 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -15,7 +15,9 @@ page{ height: 142rpx!important; border-radius: 10rpx; overflow: hidden; - margin-top:10rpx; + margin-top:10rpx; + word-wrap: break-word; + word-break: break-all; } .listitem .icon{ width: 140rpx; @@ -41,7 +43,7 @@ page{ text-overflow: ellipsis; overflow: hidden; font-weight: bold; - margin-top: 10rpx; + /* margin-top: 10rpx; */ } .ri .txt02 { @@ -53,7 +55,7 @@ page{ color: rgba(140, 140, 140, 1); } .ri .txt03 { - margin-left: 10rpx; + /* margin-left: 10rpx; */ display: inline-block!important; font-size:24rpx; text-decoration:line-through; @@ -61,16 +63,36 @@ page{ } .ri .txt04 { width: 100%; - font-size:30rpx; + font-size:26rpx; color:rgba(253,131,45,1); line-height:44rpx; - margin-top: 20rpx; + height: 50rpx; + /* margin-top: 10rpx; */ } +.frImg{ + height: 78rpx; + width: 78rpx; + position: absolute; + right: 0; + top: 0; +} +.frImg text{ + transform: rotate(45deg); + color: #FFFFFF; + font-size: 18rpx; + position: absolute; + right: 0; + top: 18rpx; +} .money{ - display: inline-block!important; - font-size:50rpx; - font-weight:500; - color:rgba(253,131,45,1); + display: inline-block!important; + font-size:40rpx; + font-weight:500; + color:rgba(253,131,45,1); + width:150rpx; + overflow:hidden; + white-space: nowrap; + text-overflow: ellipsis; } .listitem{ position: relative; @@ -89,17 +111,19 @@ page{ .pt_progress{ padding:0,16rpx; line-height: 56rpx; + height: 56rpx; color: #FD782D; } .msg{ float: right; font-size: 28rpx; + margin-top: 8rpx; } progress{ display:inline-block; border-radius:60rpx; overflow:hidden; - width: 436rpx; + width: 380rpx; } .botton{ position: absolute; diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 167e68e..8f281d3 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -914,8 +914,8 @@ Page({ if (that.data.dispressEndDate){ wx.showModal({ title: '提示', - content: "您有未支付砍价订单,请先进行支付", - confirmText:"去支付", + content: "您有未支付订单,请到“我的-我的砍价”进行支付", + confirmText:"我的砍价", success: function (res) { if (res.confirm) { wx.navigateTo({ diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 6b19a74..587a6ba 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -1,12 +1,14 @@ const util = require("../../utils/util.js"); const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); +const imgurl = require("../../utils/imgurl"); Page({ /** * 页面的初始数据 */ data: { + chevronUrl: imgurl.chevron.url, date: '1988-03-12', flag: 1, flagsex: 0, diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index 01b17d7..68d8fc8 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -10,6 +10,7 @@ {{date}} + 性别 @@ -19,10 +20,12 @@ - + 住址 {{address}} 请选择地址 + - + + \ No newline at end of file diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss index 40b2abf..063d81e 100644 --- a/pages/edit/edit.wxss +++ b/pages/edit/edit.wxss @@ -1,3 +1,12 @@ +.rArrow{ + position: absolute; + right: 26rpx; + height:20rpx; + width: 20rpx; + margin: auto; + bottom: 30rpx; +} + input { width:600rpx; display: inline-block; @@ -31,6 +40,7 @@ input { display: inline-block; font-size: 32rpx; color: #999; + width: 620rpx; } radio { @@ -51,14 +61,13 @@ radio { margin-right: 20rpx; } .btn{ - width: 400rpx; + width: 456rpx; color: #fff; - margin-top: 60rpx; - height: 86rpx; - line-height: 86rpx; + margin-top: 466rpx; + height: 92rpx; + line-height: 92rpx; text-align: center; - border-radius:60rpx; - background: #00c0ff; + border-radius:32rpx; font-size: 32rpx; } .active{ diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 3aad712..84e8d96 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -10,7 +10,7 @@ Page({ data: { succUrl: imgurl.succ.url, spcodeUrl: imgurl.spcode.url, - rDetailUrl: imgurl.rDetail.url, + chevronUrl: imgurl.chevron.url, teljpgUrl: imgurl.teljpg.url, newUrl: imgurl.new1.url, weixinTitle: imgurl.weixinTitle.url, diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 631d6de..e252ece 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -68,7 +68,7 @@ - +