fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit b7b420b0a2fde0577432ab49f74462a5d43338e5 2 parents b3108cb8 8415d84c

Merge branch 'feature/refund' of git.yoho.cn:fe/yohobuywap-node into feature/refund

Inline Side-by-side
Showing 1 changed file with 43 additions and 20 deletions
... ... @@ -45,6 +45,8 @@
<div class="goods-info">
<div class="img-box">
<img :src="goods.goods_image | resize(100, 130)">
<label v-if="goods.goods_type === 'gift'" class="gift">赠品</label>
<label class="price-gift" v-if="goods.goods_type === 'price_gift'">加价购</label>
</div>
<div class="goods-detail">
<p class="name">{{goods.product_name}}</p>
... ... @@ -81,16 +83,16 @@
<p v-if="detail.return_coupon_amount" class="info">优惠券: &yen;{{detail.return_coupon_amount}}</p>
</div>
<div class="exchange-type">
<span class="amount-info" v-if="detail.return_amount_info">{{detail.return_amount_info}}</span>
<span href="" class="primary">退款方式<span class="right">{{detail.return_amount_mode_name}}</span>
</span>
<div class="amount-modeinfo" v-if="detail.return_amount_mode_info && detail.return_amount_mode_info.length">
<p v-if="detail.return_amount_mode_info[0].bank_name">银行 <span>{{detail.return_amount_mode_info[0].bank_name}}</span></p>
<p v-if="detail.return_amount_mode_info[0].bank_card">卡号 <span>{{detail.return_amount_mode_info[0].bank_card}}</span></p>
<p v-if="detail.return_amount_mode_info[0].payee_name">姓名 <span>{{detail.return_amount_mode_info[0].payee_name}}</span></p>
<p v-if="detail.return_amount_mode_info[0].alipay_account">账号 <span>{{detail.return_amount_mode_info[0].alipay_account}}</span></p>
<p v-if="detail.return_amount_mode_info[0].alipay_name">姓名 <span>{{detail.return_amount_mode_info[0].alipay_name}}</span></p>
<p v-if="detail.return_amount_mode_info[0].bank_name">银行：<span>{{detail.return_amount_mode_info[0].bank_name}}</span></p>
<p v-if="detail.return_amount_mode_info[0].bank_card">卡号：<span>{{detail.return_amount_mode_info[0].bank_card}}</span></p>
<p v-if="detail.return_amount_mode_info[0].payee_name">姓名：<span>{{detail.return_amount_mode_info[0].payee_name}}</span></p>
<p v-if="detail.return_amount_mode_info[0].alipay_account">账号：<span>{{detail.return_amount_mode_info[0].alipay_account}}</span></p>
<p v-if="detail.return_amount_mode_info[0].alipay_name">姓名：<span>{{detail.return_amount_mode_info[0].alipay_name}}</span></p>
</div>
<span class="amount-info" v-if="detail.return_amount_info">{{detail.return_amount_info}}</span>
</div>
</div>
<div class="exchange-express" v-else>
... ... @@ -222,6 +224,7 @@
.exchange-progress {
background-color: #fff;
padding-bottom: 20px;
li {
position: relative;
... ... @@ -230,7 +233,7 @@
.progress-desc {
padding: 30px 0;
border-bottom: 1px solid #eee;
border-bottom: 1px solid #e0e0e0;
color: #b0b0b0;
}
... ... @@ -251,12 +254,16 @@
content: "";
position: absolute;
left: 8px;
top: 0;
top: -50%;
width: 1px;
height: 100%;
background: #b0b0b0;
}
&:first-child:after {
width: 0;
}
&.passed {
.progress-desc {
color: #000;
... ... @@ -265,6 +272,10 @@
&:before {
background: #000;
}
&:after {
background: #000;
}
}
p:first-of-type {
... ... @@ -286,6 +297,7 @@
text-align: center;
font-size: 28px;
color: #444;
border-top: 1px solid #e0e0e0;
.phone {
color: #b0b0b0;
... ... @@ -372,8 +384,8 @@
.goods-info {
display: flex;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
padding: 20px 30px;
&:last-child {
... ... @@ -397,6 +409,14 @@
background: rgba(0, 0, 0, 0.2);
color: white;
text-align: center;
&.price-gift {
background-color: #eb76aa;
}
&.gift {
background-color: #86bf4a;
}
}
img {
... ... @@ -449,8 +469,8 @@
font-size: 28px;
blockquote {
margin-top: 20px;
color: #b0b0b0;
color: #444;
font-size: 24px;
}
.p-reason {
... ... @@ -507,24 +527,22 @@
.exchange-type {
position: relative;
font-size: 34px;
border-top: 1px solid #eee;
border-top: 1px solid #e0e0e0;
color: #444;
padding: 20px 30px;
background-color: #fff;
.amount-info {
color: #b0b0b0;
background: #f6f6f6;
display: block;
font-size: 26px;
margin: 0 -30px;
padding-left: 30px;
height: 44px;
line-height: 44px;
font-size: 24px;
padding: 20px 30px;
}
.primary {
display: block;
padding: 20px 30px;
border-top: 1px solid #e0e0e0;
.right {
float: right;
... ... @@ -532,6 +550,11 @@
color: 28px;
}
}
.amount-modeinfo p {
border-top: 1px solid #e0e0e0;
padding: 20px 30px;
}
}
.exchange-order {
... ... @@ -545,7 +568,7 @@
bottom: 0;
z-index: 10;
padding: 30px 20px;
border-top: 1px solid #eee;
border-top: 1px solid #e0e0e0;
text-align: right;
background: #fff;
... ...