fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit 19305948b100e780f1cbdd9f56e87d76a1e2dcfb 2 parents 86e4cfa0 e3a7bd97

Merge branch 'develop' into release/1.0

Inline Side-by-side
Showing 5 changed files with 115 additions and 99 deletions
... ... @@ -151,7 +151,10 @@ const getBrandShopGoodsData = params => {
return shopApi.getBrandInfoByDomain({
domain: params.domain
}).then(result => {
return _getGoodsList(Object.assign(params, {shopId: result.data.shop_id}));
if (result.data && result.data.shop_id) {
Object.assign(params, {shopId: result.data.shop_id});
}
return _getGoodsList(params);
});
}
};
... ...
... ... @@ -133,7 +133,6 @@
.exchange-details {
margin-top: 20px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
h2 {
height: 88px;
... ... @@ -151,7 +150,6 @@
}
.exchange-product {
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
.goods-info {
... ... @@ -260,7 +258,6 @@
position: relative;
padding-top: 20px;
margin-bottom: 20px;
border-top: 1px solid #eee;
word-wrap: break-word;
p:first-of-type {
... ... @@ -289,7 +286,6 @@
line-height: 88px;
font-size: 34px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
.amount-modeinfo {
span {
... ... @@ -302,10 +298,15 @@
background: #f6f6f6;
display: block;
font-size: 26px;
margin: 0 -30px;
padding-left: 30px;
height: 44px;
line-height: 44px;
}
.primary {
display: block;
border-bottom: 1px solid #eee;
.right {
float: right;
... ...
... ... @@ -120,6 +120,8 @@
}
} else if (result.code !== 500) {
tip(result.message);
} else {
tip('数据获取失败');
}
}).fail(() => {
tip('网络错误');
... ...
<template>
<div class="status-desc">
<p>{{detail.statusName}}</p>
<p>申请时间: {{detail.createTime}}</p>
</div>
<div class="exchange-progress">
<ul>
<li v-for="status in detail.statusList"
class="{{ status.act ==='Y' ? 'passed' : ''}}">
<div class="progress-desc">
<p>{{status.name}}</p>
</div>
</li>
</ul>
<div v-if="detail.status == 20"
class="logistics-detail">
<template v-if="detail.notice">
<a href="/me/logistic?order_code={{sourceOrderCode}}&type=refund">
<h2>{{detail.notice.title}}</h2>
<p>物流公司: {{detail.notice.expressCompany}}<br>快递单号: {{detail.notice.expressNumber}}</p>
<span class="right"><span class="icon icon-right"></span></span>
</a>
</template>
</div>
<div v-else class="progress-todo">
<template v-if="detail.notice">
<p>{{detail.notice.title}}</p>
<p class="phone">{{detail.notice.remark}}</p>
</template>
</div>
<div v-if="(detail.deliveryTpye === '10' || type ==='refund') && detail.status == 10"
class="logistics">
<a href="/me/return/logistics?applyid={{applyid}}">填写商品寄回的快递信息</a>
<template v-if="show">
<div class="status-desc">
<p>{{detail.statusName}}</p>
<p>申请时间: {{detail.createTime}}</p>
</div>
</div>
<div class="exchange-details">
<h2 v-if="type ==='refund'">退货详情 <i>RETURN DETAILS</i></h2>
<h2 v-else>换货详情 <i>EXCHANGE DETAILS</i></h2>
<div class="exchange-product-wrapper">
<div class="exchange-product" v-for="goods in detail.goodsList">
<div class="goods-info">
<div class="img-box">
<img :src="goods.goodsImage | resize 49 65">
<div class="exchange-progress">
<ul>
<li v-for="status in detail.statusList"
class="{{ status.act ==='Y' ? 'passed' : ''}}">
<div class="progress-desc">
<p>{{status.name}}</p>
</div>
<div class="goods-detail">
<p class="name">{{goods.productName}}</p>
<p class="size">
<span v-if="goods.colorName">颜色: {{goods.colorName}}</span>
<span v-if="goods.sizeName">尺码: {{goods.sizeName}}</span>
</p>
</li>
</ul>
<div v-if="detail.status == 20"
class="logistics-detail">
<template v-if="detail.notice">
<a href="/me/logistic?order_code={{sourceOrderCode}}&type=refund">
<h2>{{detail.notice.title}}</h2>
<p>物流公司: {{detail.notice.expressCompany}}<br>快递单号: {{detail.notice.expressNumber}}</p>
<span class="right"><span class="icon icon-right"></span></span>
</a>
</template>
</div>
<div v-else class="progress-todo">
<template v-if="detail.notice">
<p>{{detail.notice.title}}</p>
<p class="phone">{{detail.notice.remark}}</p>
</template>
</div>
<div v-if="(detail.deliveryTpye === '10' || type ==='refund') && detail.status == 10"
class="logistics">
<a href="/me/return/logistics?applyid={{applyid}}">填写商品寄回的快递信息</a>
</div>
</div>
<div class="exchange-details">
<h2 v-if="type ==='refund'">退货详情 <i>RETURN DETAILS</i></h2>
<h2 v-else>换货详情 <i>EXCHANGE DETAILS</i></h2>
<div class="exchange-product-wrapper">
<div class="exchange-product" v-for="goods in detail.goodsList">
<div class="goods-info">
<div class="img-box">
<img :src="goods.goodsImage | resize 49 65">
</div>
<div class="goods-detail">
<p class="name">{{goods.productName}}</p>
<p class="size">
<span v-if="goods.colorName">颜色: {{goods.colorName}}</span>
<span v-if="goods.sizeName">尺码: {{goods.sizeName}}</span>
</p>
</div>
<div class="goods-price">
<p>&yen; {{goods.salesPrice}}</p>
<p>×1</p>
</div>
</div>
<div class="goods-price">
<p>&yen; {{goods.salesPrice}}</p>
<p>×1</p>
<div class="exchange-reason">
<p v-if="goods.newColorName || goods.newSizeName">换货颜色尺码: {{goods.newColorName}} {{goods.newSizeName}}</p>
<p v-if="goods.reasonName">换货原因: {{goods.reasonName}}</p>
<blockquote v-if="goods.remark">{{goods.remark}}</blockquote>
<ul v-if="goods.evidenceImages.length > 0" class="exchange-img">
<li v-for="image in goods.evidenceImages">
<img :src="image | resize 154 154">
</li>
</ul>
</div>
</div>
<div class="exchange-reason">
<p v-if="goods.newColorName || goods.newSizeName">换货颜色尺码: {{goods.newColorName}} {{goods.newSizeName}}</p>
<p v-if="goods.reasonName">换货原因: {{goods.reasonName}}</p>
<blockquote v-if="goods.remark">{{goods.remark}}</blockquote>
<ul v-if="goods.evidenceImages.length > 0" class="exchange-img">
<li v-for="image in goods.evidenceImages">
<img :src="image | resize 154 154">
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="exchange-express" v-if="type ==='refund'">
<div class="exchange-address" v-if="detail.returnAmount">
<p>退款金额: &yen;{{detail.returnAmount}}</p>
<p>(现金:&yen;{{detail.returnAmountTotal}} - YOHO币:{{detail.returnYohoCoin}} - 优惠券:{{detail.returnCouponAmount}})</p>
<div class="exchange-express" v-if="type ==='refund'">
<div class="exchange-address" v-if="detail.returnAmount">
<p>退款金额: &yen;{{detail.returnAmount}}</p>
<p>(现金:&yen;{{detail.returnAmountTotal}} - YOHO币:{{detail.returnYohoCoin}} - 优惠券:{{detail.returnCouponAmount}})</p>
</div>
<div class="exchange-type">
<span href="" class="primary">退款方式<span class="right">{{detail.returnAmountModeName}}</span>
</span>
<div class="amount-modeinfo" v-if="detail.returnAmountModeInfo && detail.returnAmountModeInfo.length">
<p v-if="detail.returnAmountModeInfo[0].bankName">银行 <span>{{detail.returnAmountModeInfo[0].bankName}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].bankCard">卡号 <span>{{detail.returnAmountModeInfo[0].bankCard}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].payeeName">姓名 <span>{{detail.returnAmountModeInfo[0].payeeName}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].alipayAccount">账号 <span>{{detail.returnAmountModeInfo[0].alipayAccount}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].alipayName">姓名 <span>{{detail.returnAmountModeInfo[0].alipayName}}</span></p>
</div>
<span class="amount-info" v-if="detail.returnAmountInfo">{{detail.returnAmountInfo}}</span>
</div>
</div>
<div class="exchange-type">
<span href="" class="primary">退款方式<span class="right">{{detail.returnAmountModeName}}</span>
</span>
<div class="amount-modeinfo" v-if="detail.returnAmountModeInfo && detail.returnAmountModeInfo.length">
<p v-if="detail.returnAmountModeInfo[0].bankName">银行 <span>{{detail.returnAmountModeInfo[0].bankName}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].bankCard">卡号 <span>{{detail.returnAmountModeInfo[0].bankCard}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].payeeName">姓名 <span>{{detail.returnAmountModeInfo[0].payeeName}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].alipayAccount">账号 <span>{{detail.returnAmountModeInfo[0].alipayAccount}}</span></p>
<p v-if="detail.returnAmountModeInfo[0].alipayName">姓名 <span>{{detail.returnAmountModeInfo[0].alipayName}}</span></p>
<div class="exchange-express" v-else>
<div class="exchange-address">
<p><span>{{detail.consigneeName}}</span><span>{{detail.mobile}}</span></p>
<p>{{detail.province}}&nbsp;{{detail.city}}&nbsp;{{detail.county}} <br>{{detail.address}}</p>
</div>
<div class="exchange-type">
<span class="primary">换货方式<span class="right">{{detail.deliveryTpyeName}}</span></span>
</div>
<span class="amount-info" v-if="detail.returnAmountInfo">{{detail.returnAmountInfo}}</span>
</div>
</div>
<div class="exchange-express" v-else>
<div class="exchange-address">
<p><span>{{detail.consigneeName}}</span><span>{{detail.mobile}}</span></p>
<p>{{detail.province}}&nbsp;{{detail.city}}&nbsp;{{detail.county}} <br>{{detail.address}}</p>
<div class="exchange-order">
<a class="primary" href="/me/order/detail?orderCode={{sourceOrderCode}}">原订单详情
<span class="right"><span class="icon icon-right"></span></span>
</a>
</div>
<div class="exchange-type">
<span class="primary">换货方式<span class="right">{{detail.deliveryTpyeName}}</span></span>
<div v-if="detail.canCancel ==='Y'" class="exchange-options">
<button @click="cancel">取消申请</button>
</div>
</div>
<div class="exchange-order">
<a class="primary" href="/me/order/detail?orderCode={{sourceOrderCode}}">原订单详情
<span class="right"><span class="icon icon-right"></span></span>
</a>
</div>
<div v-if="detail.canCancel ==='Y'" class="exchange-options">
<button @click="cancel">取消申请</button>
</div>
</template>
</template>
<script>
... ... @@ -117,6 +119,7 @@
data() {
return {
id: '',
show: false,
sourceOrderCode: '',
detail: {}
};
... ... @@ -161,7 +164,8 @@
type: this.type
}
}).then(res => {
if (res.data) {
if (res.code === 200) {
this.show = true;
this.detail = res.data;
if (!this.detail.goodsList) {
return;
... ... @@ -174,8 +178,14 @@
// return util.getImgHost(p) + '?imageView2/2/w/154/h/154';
// })
});
} else if (result.code !== 500) {
tip(result.message);
} else {
tip('数据获取失败');
}
});
}).fail(() => {
tip('网络错误');
});;
}
};
</script>
... ...
<template>
<div v-if="shopInfo.isBlkShop" class="brand-top-box" v-lazy:background-image="shopInfo.shopBg | resize 750 478">
<div class="brand-bottom">
<img v-if="shopInfo.shopLogo" v-lazy="shopInfo.shopLogo | resize 80 80" alt="{{ shopInfo.shopName }}">
<img v-if="shopInfo.shopLogo" v-lazy="shopInfo.shopLogo | resize 120 80" alt="{{ shopInfo.shopName }}">
<div v-else class="brand-title">{{ shopInfo.shopName }}</div>
<hr>
<div v-show="showMore" transition="brand-intro" v-bind:class="{ 'brand-short': !showMore }">{{ shopInfo.shopIntro }}</div>
... ...