Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4
Showing
6 changed files
with
11 additions
and
7 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | .block { | 4 | .block { |
5 | position: relative; | 5 | position: relative; |
6 | background: #fff; | 6 | background: #fff; |
7 | - padding: 20px 30px; | 7 | + padding: 36px 30px 24px; |
8 | 8 | ||
9 | .iconfont { | 9 | .iconfont { |
10 | position: absolute; | 10 | position: absolute; |
@@ -106,9 +106,12 @@ | @@ -106,9 +106,12 @@ | ||
106 | .sub-content .sub-title { | 106 | .sub-content .sub-title { |
107 | display: block; | 107 | display: block; |
108 | color: #000; | 108 | color: #000; |
109 | - font-size: 26px; | 109 | + font-size: 28px; |
110 | + padding-bottom: 14px; | ||
111 | + } | ||
112 | + .sub-content .sub-status{ | ||
113 | + padding-bottom: 14px; | ||
110 | } | 114 | } |
111 | - | ||
112 | .goods { | 115 | .goods { |
113 | padding: 0; | 116 | padding: 0; |
114 | margin-top: 20px; | 117 | margin-top: 20px; |
@@ -136,11 +139,12 @@ | @@ -136,11 +139,12 @@ | ||
136 | padding: 0.5rem 0.75rem; | 139 | padding: 0.5rem 0.75rem; |
137 | height:1.5rem; | 140 | height:1.5rem; |
138 | line-height:1.5rem; | 141 | line-height:1.5rem; |
142 | + font-size:0.7rem ; | ||
139 | .bg-dollar{ | 143 | .bg-dollar{ |
140 | display: inline-block; | 144 | display: inline-block; |
141 | width: 0.6rem; | 145 | width: 0.6rem; |
142 | height: 0.6rem; | 146 | height: 0.6rem; |
143 | - background: url('../img/me/yoho-coin/dollar.png?1452827495') center center; | 147 | + background: url('/me/yoho-coin/dollar.png') center center; |
144 | background-size: 100% 100%; | 148 | background-size: 100% 100%; |
145 | vertical-align: middle; | 149 | vertical-align: middle; |
146 | } | 150 | } |
@@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
23 | 23 | ||
24 | <p class="beside-icon sub-content"> | 24 | <p class="beside-icon sub-content"> |
25 | <span class="sub-title">订单编号:{{orderNum}}</span> | 25 | <span class="sub-title">订单编号:{{orderNum}}</span> |
26 | - <span >{{orderStatus}}</span> | 26 | + <span class="sub-status">{{orderStatus}}</span> |
27 | <span>下单时间:{{orderTime}}</span> | 27 | <span>下单时间:{{orderTime}}</span> |
28 | </p> | 28 | </p> |
29 | </div> | 29 | </div> |
-
Please register or login to post a comment