fe / yohobuywap-node · Commits

Go to a project

Authored by yyq
Commit 9061157ad04e71388e9dc83001caa03a664e1115 2 parents c197e53b 1e38675e

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

Inline Side-by-side
Showing 4 changed files with 53 additions and 29 deletions
... ... @@ -9,6 +9,7 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
const refundModel = require('../models/refund');
const notLoginCode = 400;
const notLoginTip = '抱歉，您暂未登录！';
const helpers = global.yoho.helpers;
const refund = {
refund(req, res) {
... ... @@ -97,6 +98,7 @@ const refund = {
let headerData = headerModel.setNav({
navTitle: '退货状态',
backUrl: helpers.urlFormat('/home/return'),
navBtn: false
});
... ... @@ -113,6 +115,7 @@ const refund = {
let headerData = headerModel.setNav({
navTitle: '换货状态',
backUrl: helpers.urlFormat('/home/return'),
navBtn: false
});
... ...
... ... @@ -26,15 +26,16 @@
</a>
</template>
</div>
<div v-else class="progress-todo">
<div v-else-if="detail.notice.title" class="progress-todo">
<template v-if="detail.notice">
<p>{{detail.notice.title}}</p>
<p class="phone">{{detail.notice.remark}}</p>
<p :class="{'status-notice': true, phone: (detail.delivery_tpye === '10' || type ==='refund') && detail.status == 10 }">{{detail.notice.remark}}</p>
</template>
</div>
<div v-if="(detail.delivery_tpye === '10' || type ==='refund') && detail.status == 10"
class="logistics">
<a :href="`/home/return/logistics?applyid=${applyid}&type=${type}`">填写商品寄回的快递信息</a>
<div v-if="(detail.delivery_tpye === '10' || type ==='refund') && detail.status == 10" class="padding-b-20">
<div class="logistics">
<a :href="`/home/return/logistics?applyid=${applyid}&type=${type}`">填写商品寄回的快递信息</a>
</div>
</div>
</div>
<div class="exchange-details">
... ... @@ -297,13 +298,21 @@
color: #444;
border-top: 1px solid #e0e0e0;
.phone {
.status-notice {
color: #b0b0b0;
background-color: #f0f0f0;
font-size: 20px;
}
.phone {
padding: 15px;
background-color: #f0f0f0;
}
}
.padding-b-20 {
padding-bottom: 20px;
}
.logistics-detail {
padding: 20px 30px;
border-top: 1px solid #e0e0e0;
... ...
<template>
<div class="return return-refund">
<product-list :list="list" :data="refundData" type="refund"></product-list>
<div v-if="refundData.return_amount_info" class="return-amount-info">
{{refundData.return_amount_info}}
</div>
<div v-else class="return-info-hide-margtin-30"></div>
<div class="return-amount">
<!-- TODO:退货信息优化为组件 -->
<div class="return-amount-title">
... ... @@ -26,10 +32,6 @@
<p>姓名：<span><input v-model="amount.alipay_name" type="text" placeholder="请填写收款人姓名"></span></p>
</div>
</div>
<div v-if="refundData.return_amount_info" class="return-amount-info">
{{refundData.return_amount_info}}
</div>
</div>
</template>
... ... @@ -47,7 +49,12 @@
page: 'refund',
list: [],
amount: {
return_amount_mode: 0
return_amount_mode: 0,
bank_name: '',
bank_card: '',
payee_name: '',
alipay_account: '',
alipay_name: ''
},
r: {},
refundData: {}
... ... @@ -72,6 +79,15 @@
}
});
if (this.amount.return_amount_mode === 2) {
this.amount.alipay_account = '';
this.amount.alipay_name = '';
} else if (this.amount.return_amount_mode === 3) {
this.amount.bank_name = '';
this.amount.bank_card = '';
this.amount.payee_name = '';
}
return {
order_code: qs.orderCode,
goods: JSON.stringify(goods),
... ... @@ -182,7 +198,6 @@
.return-refund {
.return-amount {
margin: 30px 0;
font-size: 32px;
background: #fff;
}
... ... @@ -209,12 +224,15 @@
}
.return-amount-info {
padding: 0 30px 30px;
padding: 20px 30px;
font-size: 24px;
line-height: 2.5;
color: #b0b0b0;
}
.return-info-hide-margtin-30 {
margin-top: 30px;
}
.return-amount-item {
p {
border-top: 1px solid #e0e0e0;
... ... @@ -223,7 +241,6 @@
input {
border: none;
color: #e0e0e0;
font-size: 26px;
}
}
... ...
... ... @@ -14,7 +14,7 @@
</div>
<div class="image-list clearfix">
<div class="image-item" v-for="(image, index) in imageListForShow" :key="index">
<span @click="deleteImage(image.index)" class="icon icon-close"></span>
<span @click="deleteImage(image.index)" class="icon iconfont icon-close">&#xe623</span>
<img :src="image.path | resize(100, 130)">
</div>
<upload v-show="imageListForShow.length < 4" class="image-item" :image-list="product.imageList" :bucket="bucket"></upload>
... ... @@ -84,13 +84,6 @@
border-top: 1px solid #f1f1f1;
border-bottom: 1px solid #f1f1f1;
&:after {
content: "";
display: block;
width: 100%;
height: 30px;
}
.select-reason {
padding: 0 30px;
width: 100%;
... ... @@ -118,7 +111,6 @@
.remark {
background: #fff;
padding: 20px 30px;
position: relative;
&:before {
... ... @@ -136,13 +128,13 @@
resize: none;
border: 1px solid #f1f1f1;
border-radius: 5px;
padding: 10px;
padding: 15px 20px;
}
}
.image-list {
padding: 30px;
padding-top: 5px;
padding-top: 0;
background: #fff;
.image-item {
... ... @@ -161,11 +153,14 @@
position: absolute;
right: -20px;
top: -20px;
font-size: 40px;
color: #fff;
background: #b0b0b0;
background-color: red;
border-radius: 100%;
z-index: 2;
width: 40px;
height: 40px;
font-size: 30px;
text-align: center;
}
img {
... ...