Showing
4 changed files
with
22 additions
and
7 deletions
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | h2 { | 13 | h2 { |
| 14 | font-size: 32px; | 14 | font-size: 32px; |
| 15 | text-align: center; | 15 | text-align: center; |
| 16 | - margin-top: 50px; | 16 | + margin-top: 80px; |
| 17 | margin-bottom: 0; | 17 | margin-bottom: 0; |
| 18 | } | 18 | } |
| 19 | 19 | ||
| @@ -40,11 +40,15 @@ | @@ -40,11 +40,15 @@ | ||
| 40 | height: 100%; | 40 | height: 100%; |
| 41 | display: inline-block; | 41 | display: inline-block; |
| 42 | text-align: center; | 42 | text-align: center; |
| 43 | - color: $blue; | 43 | + color: #4a90e2; |
| 44 | font-size: 30px; | 44 | font-size: 30px; |
| 45 | line-height: 88px; | 45 | line-height: 88px; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | + a.modal-button:first-of-type { | ||
| 49 | + color: #b0b0b0; | ||
| 50 | + } | ||
| 51 | + | ||
| 48 | :not(:first-child) { | 52 | :not(:first-child) { |
| 49 | border-left: 1px solid #e0e0e0; | 53 | border-left: 1px solid #e0e0e0; |
| 50 | } | 54 | } |
| @@ -91,7 +91,7 @@ | @@ -91,7 +91,7 @@ | ||
| 91 | padding-left: 25px; | 91 | padding-left: 25px; |
| 92 | border-radius: 20px; | 92 | border-radius: 20px; |
| 93 | font-size: 26px; | 93 | font-size: 26px; |
| 94 | - color: #b0b0b0; | 94 | + color: #444; |
| 95 | background: #eee; | 95 | background: #eee; |
| 96 | border: none; | 96 | border: none; |
| 97 | } | 97 | } |
| @@ -99,11 +99,13 @@ | @@ -99,11 +99,13 @@ | ||
| 99 | input::-webkit-input-placeholder { | 99 | input::-webkit-input-placeholder { |
| 100 | /* WebKit browsers */ | 100 | /* WebKit browsers */ |
| 101 | text-align: center; | 101 | text-align: center; |
| 102 | + color: #b0b0b0; | ||
| 102 | } | 103 | } |
| 103 | 104 | ||
| 104 | input:-ms-input-placeholder { | 105 | input:-ms-input-placeholder { |
| 105 | /* Internet Explorer 10+ */ | 106 | /* Internet Explorer 10+ */ |
| 106 | text-align: center; | 107 | text-align: center; |
| 108 | + color: #b0b0b0; | ||
| 107 | } | 109 | } |
| 108 | } | 110 | } |
| 109 | 111 |
| @@ -13,7 +13,6 @@ $white: #fff; | @@ -13,7 +13,6 @@ $white: #fff; | ||
| 13 | .order-item { | 13 | .order-item { |
| 14 | background: $white; | 14 | background: $white; |
| 15 | margin-top: 20px; | 15 | margin-top: 20px; |
| 16 | - border-top: 1px solid #eee; | ||
| 17 | border-bottom: 1px solid #eee; | 16 | border-bottom: 1px solid #eee; |
| 18 | 17 | ||
| 19 | &:first-child { | 18 | &:first-child { |
| @@ -157,6 +156,11 @@ $white: #fff; | @@ -157,6 +156,11 @@ $white: #fff; | ||
| 157 | border: 0 none; | 156 | border: 0 none; |
| 158 | background: $white; | 157 | background: $white; |
| 159 | font-size: 28px; | 158 | font-size: 28px; |
| 159 | + float: left; | ||
| 160 | + | ||
| 161 | + &.leftpad { | ||
| 162 | + padding-right: 42px; | ||
| 163 | + } | ||
| 160 | } | 164 | } |
| 161 | 165 | ||
| 162 | button { | 166 | button { |
| @@ -169,6 +173,7 @@ $white: #fff; | @@ -169,6 +173,7 @@ $white: #fff; | ||
| 169 | border: 0 none; | 173 | border: 0 none; |
| 170 | background: $white; | 174 | background: $white; |
| 171 | font-size: 28px; | 175 | font-size: 28px; |
| 176 | + float: left; | ||
| 172 | 177 | ||
| 173 | &.black { | 178 | &.black { |
| 174 | width: 192px; | 179 | width: 192px; |
| @@ -182,12 +187,16 @@ $white: #fff; | @@ -182,12 +187,16 @@ $white: #fff; | ||
| 182 | } | 187 | } |
| 183 | 188 | ||
| 184 | &.normal { | 189 | &.normal { |
| 185 | - width: 188px; | 190 | + width: 192px; |
| 186 | padding: 0; | 191 | padding: 0; |
| 187 | border: 1px solid $black; | 192 | border: 1px solid $black; |
| 188 | color: $black; | 193 | color: $black; |
| 189 | } | 194 | } |
| 190 | 195 | ||
| 196 | + &.leftpad { | ||
| 197 | + padding-right: 42px; | ||
| 198 | + } | ||
| 199 | + | ||
| 191 | &:focus { | 200 | &:focus { |
| 192 | outline: none; | 201 | outline: none; |
| 193 | } | 202 | } |
| @@ -34,11 +34,11 @@ | @@ -34,11 +34,11 @@ | ||
| 34 | <div class="options"> | 34 | <div class="options"> |
| 35 | <button v-if="order.isCancel === 'Y'" @click="deleteOrder(order,index)" class="normal">删除订单</button> | 35 | <button v-if="order.isCancel === 'Y'" @click="deleteOrder(order,index)" class="normal">删除订单</button> |
| 36 | <template v-else> | 36 | <template v-else> |
| 37 | - <button v-if="order.status == 0" @click="cancelOrder(order.orderCode)">取消订单</button> | 37 | + <button v-if="order.status == 0" @click="cancelOrder(order.orderCode)" class="leftpad">取消订单</button> |
| 38 | <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 | 38 | <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 |
| 39 | <span v-count-down v-bind:left-time="order.payLefttime" v-bind:callback="autoCancel(order.orderCode)"></span> | 39 | <span v-count-down v-bind:left-time="order.payLefttime" v-bind:callback="autoCancel(order.orderCode)"></span> |
| 40 | </button> | 40 | </button> |
| 41 | - <a v-if="order.status == 4 || order.status == 5 " | 41 | + <a v-if="order.status == 4 || order.status == 5 " class="leftpad" |
| 42 | href="/me/logistic?order_code={{order.orderCode}}">查看物流</a> | 42 | href="/me/logistic?order_code={{order.orderCode}}">查看物流</a> |
| 43 | <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button> | 43 | <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button> |
| 44 | <button v-if="order.status == 6" @click="deleteOrder(order,index)" class="normal">删除订单</button> | 44 | <button v-if="order.status == 6" @click="deleteOrder(order,index)" class="normal">删除订单</button> |
-
Please register or login to post a comment