Authored by 沈志敏

fix bug

... ... @@ -13,7 +13,7 @@
h2 {
font-size: 32px;
text-align: center;
margin-top: 50px;
margin-top: 80px;
margin-bottom: 0;
}
... ... @@ -40,11 +40,15 @@
height: 100%;
display: inline-block;
text-align: center;
color: $blue;
color: #4a90e2;
font-size: 30px;
line-height: 88px;
}
a.modal-button:first-of-type {
color: #b0b0b0;
}
:not(:first-child) {
border-left: 1px solid #e0e0e0;
}
... ...
... ... @@ -91,7 +91,7 @@
padding-left: 25px;
border-radius: 20px;
font-size: 26px;
color: #b0b0b0;
color: #444;
background: #eee;
border: none;
}
... ... @@ -99,11 +99,13 @@
input::-webkit-input-placeholder {
/* WebKit browsers */
text-align: center;
color: #b0b0b0;
}
input:-ms-input-placeholder {
/* Internet Explorer 10+ */
text-align: center;
color: #b0b0b0;
}
}
... ...
... ... @@ -13,7 +13,6 @@ $white: #fff;
.order-item {
background: $white;
margin-top: 20px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
&:first-child {
... ... @@ -157,6 +156,11 @@ $white: #fff;
border: 0 none;
background: $white;
font-size: 28px;
float: left;
&.leftpad {
padding-right: 42px;
}
}
button {
... ... @@ -169,6 +173,7 @@ $white: #fff;
border: 0 none;
background: $white;
font-size: 28px;
float: left;
&.black {
width: 192px;
... ... @@ -182,12 +187,16 @@ $white: #fff;
}
&.normal {
width: 188px;
width: 192px;
padding: 0;
border: 1px solid $black;
color: $black;
}
&.leftpad {
padding-right: 42px;
}
&:focus {
outline: none;
}
... ...
... ... @@ -34,11 +34,11 @@
<div class="options">
<button v-if="order.isCancel === 'Y'" @click="deleteOrder(order,index)" class="normal">删除订单</button>
<template v-else>
<button v-if="order.status == 0" @click="cancelOrder(order.orderCode)">取消订单</button>
<button v-if="order.status == 0" @click="cancelOrder(order.orderCode)" class="leftpad">取消订单</button>
<button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付
<span v-count-down v-bind:left-time="order.payLefttime" v-bind:callback="autoCancel(order.orderCode)"></span>
</button>
<a v-if="order.status == 4 || order.status == 5 "
<a v-if="order.status == 4 || order.status == 5 " class="leftpad"
href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>
<button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button>
<button v-if="order.status == 6" @click="deleteOrder(order,index)" class="normal">删除订单</button>
... ...