From c89816be44d761f418a4329bccda6c345584bc61 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sun, 16 Sep 2018 17:04:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=91=E7=9A=84=E5=9B=BE=E6=A0=87=20?= =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E4=BF=AE=E6=94=B9]:=E6=88=91=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/che.png | Bin 0 -> 2238 bytes assets/img/ding.png | Bin 0 -> 1549 bytes assets/img/quans.png | Bin 0 -> 1672 bytes pages/order/index/index.wxml | 14 ++++----- pages/order/index/index.wxss | 57 +++++++++++++++++++++++------------ pages/user/index.wxml | 10 +++--- pages/user/index.wxss | 14 ++++++--- 7 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 assets/img/che.png create mode 100644 assets/img/ding.png create mode 100644 assets/img/quans.png diff --git a/assets/img/che.png b/assets/img/che.png new file mode 100644 index 0000000000000000000000000000000000000000..713203c4e2fbd217bc732a72afe6496fff09e508 GIT binary patch literal 2238 zcmaJ@X;>5I7LEwiuvm?cMBEsnP!N)kK%z+riU~`!0YVa`2-++|h>%Q7CMJMF6)h?v zAcBG*$Wn7tR07p28pB%Z2DXYwT@VF9RIaF1T)=js;=MoWoo8mgIp6cX?|IMp&X3s{ z5fffgafXAUU>+0)YlSKh6)1s3Ai$OjrC=l| zlq7995Bj4}lW{VB6dc9*hAxKW1fc~((8-ku8-?;;s#6NZ2_OuJK&ec@z&$zBfCFR_ z25vQl z0q-Gj0t5HKR1_xyU_vSopb&iVVjmI-pi&7WKMIvf@&?F0Br?$lxv6-PADu#_lNSRY zFC3ChC5fX)vVuS6LLvq(9)^{4B2lZ=612VqNF^nbXf&EdgG|OF2)sH;0Sk3_g?hn+ z0t-}&RWc*EU%&q-tmY>vL1HARhBPWMa&U1AEUA=qrV13okctmMi4$Fnh=*WE9S*$Oo*RER+~i-AKF2r`+3PG&KgK1_1(@+CfgBvR0lC8R(ai|mKA zE69&b4x&tOS&&#G2Nm!HSMq@yObVp2>L9Sh?pT-4)%WzdSVNi9?R#au|^-22P5J%q$%XD*!1tXA*exaQGY`L@Q_9m%h6y!iU-lvH!d zojOL+<)n_c=D~xmn4RCH0zBsKr`J#2n(H)HYZsU9!S{`Wh6+%J60sgXIoF+jvpUtJ zNlJ}yGi{uHXSDrGLuGRK&lMWo{0KLPa1n3LSRb87sT`}V$87DJdpf;(oM4~2)+R5o zyqZA0tD9N7yZS8c`;x(`n~mCm-cTC{gZ2F3rb*ebRFg1iZEUl#p>uoQ_?7b*?ooX2 zlxJeX7{wbaXwF?x-2rC(#X+l{oQmONB_0?-eBAKFFJ`WXVXiZr^&>Oq>WcgbQLuRCCBwS6Zw3ChT@fcYVm8Gz8PlG9*)v>_ zxk#Ad_!b)M9*u3xo~+`!nd%)5R#$HzZ_S8}cgf9MbT@NmRAI~P$usn_mPYR>wSjkX zNACk&htij}-l)s+?eNk&u7&L{)N%{97u~E0AWk=I*i%z~!1UF(C)2EJj5C{R+LReK zm-mb61dkp4v(DgO>0?rKE0@*hjlzI;fS|cAb0kI<>9y$rZ^g0SYex9!C*Hq~cU7)h zayuJKAG8u&DXYlWM<3|KxxCt!M?B_zdq>2=Huu&}*dU$DN!O1yR~2#pz?N$q9jw+; z&jYiXDhPfrYhOacy2eE#wq2;Yz#+T+pz&q;eB))qz_A>9s%`tEVsvOo{z#5vm3@@> zY)G&nxVKQ$rK@%M4|hn9+318L<_U&uvv>2=ySrm6*B?yo#>P79F)y83VBdVBPtTKr z-1Udqg^BviBe^x9Zr0;(enf@+dH1sGtK}mc#=o(J`PiIm^%p8dB{om}PyEH$nlEjt zNjmP3vdg+`#r+Of;%rlK*I01(H+rw8p1s}cQf^=W!9|g3sr`Rdv7f%*WK_G`Y+7XFrfZp*FCMH-JL?5H2Ns^n_#{r=~t=Djv{Orzz@ zq4}2CEU=2KN)FwecE#MD9qx5*SV`2u_>D)cp>d2-L-G$82GkTuG<8?o#r!2 zsWEXK%=Uu*6^-5{aDtvT2{xyD-CUndTiH9xdZMF`aKP^?+niC zKY6j;x%Ic&W^UEg$}o!K;Z(5Bm%2s;EY_%*_U?a{dSj>?-tbBk?Fl8G@$Kk4-LH?< zd+?8ZK`8oS<@KlcFeW4aRZ9N5*5Q+ttICv){x3XT%`t~7gVX_@F%^CfDYuWP*Jxe0 zaD9d%TIQik!(H_vr}^a8s^p{V*uOvToLg2z9V0fP`WE+`*z9Fvviwo7gTh$HmVdYP EZ(sYTiU0rr literal 0 HcmV?d00001 diff --git a/assets/img/ding.png b/assets/img/ding.png new file mode 100644 index 0000000000000000000000000000000000000000..d41daf771e75e97e2cf80d8bfb911a765a9cb9fe GIT binary patch literal 1549 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 literal 0 HcmV?d00001 diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 02eb240..b54d8a9 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -11,13 +11,13 @@ {{item.title}} - 待付款 + 等待付款 待退款 - 已取消 + 交易关闭 已退款 退款失败 - 免费领取 - 已付款 + 免费领取 + 付款成功 {{item.subTitle}} @@ -42,10 +42,10 @@ 去支付 - + + 待退款 diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index e3ad6d2..46cfb9c 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -29,16 +29,18 @@ } .logo { - width: 350rpx; - height: 184rpx; + display: block; + width: 180rpx; + height: 180rpx; border: 1px solid #f8f8f8; border-radius: 16rpx; overflow: hidden; } .logo image { - width: 100%; - height: 100%; + display: block; + width: 180rpx; + height: 180rpx; } .info view:nth-child(1) { @@ -64,13 +66,28 @@ text-overflow: ellipsis; */ } -.info view:nth-child(1) text:nth-child(2) { - color: #f96563; - font-size: 24rpx; - /* width: 340rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; */ +.info .sucess { + font-size: 28rpx; + color: #02c0ff; + letter-spacing: 0; + text-align: right; + line-height: 28px; +} + +.wait { + font-size: 28rpx; + color: #ff4949; + letter-spacing: 0; + text-align: right; + line-height: 28rpx; +} + +.close { + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: right; + line-height: 28rpx; } .info view:nth-child(2), .info view:nth-child(3) { @@ -121,16 +138,16 @@ height: 60rpx; line-height: 60rpx; text-align: center; - background: #00c0ff; color: #fff; float: right; - border-radius: 15rpx; font-size: 28rpx; + border: 2rpx solid #02c0ff; + border-radius: 30rpx; } .payment view:nth-child(2) text { - font-size: 28rpx; - color: #fff; + font-size: 30rpx; + color: #02C0FF; } .dingdan { @@ -144,13 +161,15 @@ letter-spacing: 0; text-align: center; } + .dingdan text:nth-of-type(2) { display: block; -font-size: 28rpx; -color: #999999; -letter-spacing: 0; -text-align: center; + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: center; } + .dingdan image { display: block; width: 300rpx; diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 366643b..c9bb8a3 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -16,13 +16,13 @@ - 我的订单 + 我的订单 查看全部 - 待付款 + 待付款 @@ -30,7 +30,7 @@ - 已完成 + 已完成 @@ -38,7 +38,7 @@ - 券包 + 券包 @@ -47,7 +47,7 @@ - 智能停车 + 智能停车 diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 9fe7c55..9797686 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,12 +1,16 @@ -.margin { - /* background: #f8f8f8; *//* height: 20rpx; */ +.icons{ + width: 40rpx; + margin-right: 20rpx; + vertical-align: middle; } - .user { background: #fff; min-height: 100vh; } - +.navigator-hover{ + opacity: 1!important; + background: #fff; +} .user-title { position: relative; box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); @@ -36,7 +40,7 @@ position: absolute; top: 39rpx; bottom: 0; - right: 26px; + right: 20px; width: 16rpx; height: 16rpx; border-radius: 50%;