fe / yoho-shop-manage · Commits

Go to a project

Authored by lzhy
Commit ca15307be552c7cfc4ecde78318489fb7f6b32d8 1 parent bee5453b

一件发货测试问题修复

Inline Side-by-side
Showing 11 changed files with 36 additions and 51 deletions
... ... @@ -12,13 +12,7 @@
<tr :key="index">
<td>{{ goods.productSku }}</td>
<td>
<img
:src="
'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
goods.productSku +
'&size=40x60'
"
/>
<img v-prod-img.sku="{ val: goods.productSku, size: '40x60' }" />
</td>
<td style="text-align: left">
<p>{{ goods.productName }}</p>
... ...
... ... @@ -19,13 +19,7 @@
<template v-for="(goods, gindex) in item.goodsList">
<tr :key="tindex + '_' + gindex">
<td>
<img
:src="
'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
goods.productSku +
'&size=40x60'
"
/>
<img v-prod-img.sku="{ val: goods.productSku, size: '40x60' }" />
</td>
<td style="text-align: left">
<p>{{ goods.prodcutName }}</p>
... ...
... ... @@ -19,7 +19,7 @@
<Row>
<i-col span="24">邮政编码：{{ orderInfo.zipCode > 0 ? orderInfo.zipCode : '' }}</i-col>
</Row>
<Row>
<Row v-if="isShowExpress">
<i-col span="24">
物流公司：
<template v-for="(item, index) in logisticsList">
... ... @@ -27,7 +27,7 @@
</template>
</i-col>
</Row>
<Row>
<Row v-if="isShowExpress">
<i-col span="24">运单号：{{ orderInfo.expressNumber > 0 ? orderInfo.expressNumber : '' }} </i-col>
</Row>
</div>
... ... @@ -38,7 +38,7 @@ import _ from 'lodash';
import LogisticsService from 'services/logistics/logistics-service';
export default {
name: 'OrderUserInfo',
props: ['orderInfo'],
props: ['orderInfo', 'isShowExpress'],
data() {
return {
logisticsList: [],
... ...
... ... @@ -3,10 +3,10 @@ export default {
orderStatus: {
20: '已付订金',
40: '待付尾款',
100: '已审核',
100: '待发货',
200: '备货中',
600: '已交寄',
700: '订单完成',
600: '已发货',
700: '交易完成',
900: '用户取消',
901: '客服取消',
906: '超时取消',
... ...
... ... @@ -2,7 +2,7 @@
<div>
<Row :gutter="16">
<i-col span="8">
<order-user-info :order-info="orderInfo"></order-user-info>
<order-user-info :order-info="orderInfo" :is-show-express="false"></order-user-info>
</i-col>
<i-col span="8">
<div class="ivu-card">
... ...
... ... @@ -15,7 +15,7 @@
</div>
</div>
<order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info>
<order-user-info :order-info="orderInfo"></order-user-info>
<order-user-info :order-info="orderInfo" :is-show-express="true"></order-user-info>
<div class="ivu-card">
<div class="ivu-card-head">
<p slot="title">商品信息</p>
... ...
... ... @@ -19,13 +19,7 @@
<template v-for="(goods, gindex) in item.goodsList">
<tr :key="tindex + '_' + gindex">
<td>
<img
:src="
'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
goods.productSku +
'&size=40x60'
"
/>
<img v-prod-img.sku="{ val: goods.productSku, size: '40x60' }" />
</td>
<td style="text-align: left">
<p>{{ goods.productName }}</p>
... ...
... ... @@ -17,13 +17,7 @@
<tr :key="index">
<td>{{ goods.productSku }}</td>
<td>
<img
:src="
'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
goods.productSku +
'&size=40x60'
"
/>
<img v-prod-img.sku="{ val: goods.productSku, size: '40x60' }" />
</td>
<td style="text-align: left">
<p>{{ goods.productName }}</p>
... ... @@ -38,12 +32,13 @@
<td>{{ goods.activityDiscount }}</td>
<td>{{ returnedReason[goods.returnedReason] }}</td>
</tr>
<tr v-if="goods.mark || goods.imperfectImage" :key="index + '_1'">
<tr v-if="goods.remark || goods.imperfectImage" :key="index + '_1'" class="returned-remark">
<td colspan="14">
<span v-if="goods.mark">买家备注：{{ goods.mark }}</span>
<span v-if="goods.remark">买家备注：{{ goods.remark }}</span>
<Row>
<template v-for="(img, imgIndex) in goods.imperfectImage">
<img :key="imgIndex" :src="img.imageUrl" />
<img :key="imgIndex" :src="img.imageUrl" />
</template>
</Row>
</td>
... ... @@ -108,6 +103,16 @@ table.order-detail {
border-right: 1px solid #cccccc;
}
}
tr.returned-remark {
td {
text-align: left;
img {
width: 60px;
margin-left: 10px;
margin-top: 10px;
}
}
}
}
}
</style>
... ...
... ... @@ -19,13 +19,7 @@
<template v-for="(goods, key) in item.returnedGoodsListBoArray">
<tr :key="index + '_' + key">
<td>
<img
:src="
'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
goods.productSku +
'&size=40x60'
"
/>
<img v-prod-img.sku="{ val: goods.productSku, size: '40x60' }" />
</td>
<td style="text-align: left">
<p>{{ goods.productName }}</p>
... ...
... ... @@ -11,7 +11,7 @@
</div>
</div>
<order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info>
<order-user-info :order-info="orderInfo"></order-user-info>
<order-user-info :order-info="orderInfo" :is-show-express="true"></order-user-info>
<div class="ivu-card">
<div class="ivu-card-head">
<p slot="title">商品信息</p>
... ...
... ... @@ -42,11 +42,15 @@
</div>
<div class="ivu-card">
<div class="ivu-card-body">
<p class="red">若您同意退货，待买家寄回后，将退款给买家，若有异议请与平台联系</p>
<p class="red">若您未响应申请，视作同意退货</p>
<p class="red">若您不同意退货可点击驳回，若买家向平台投诉，如核实是您的责任，将会影响店铺评分</p>
<p class="red">-若您同意退款，将直接退款给买家</p>
<p class="red">-若您逾期未响应，视作同意退款，系统将自动打款给买家</p>
<template v-if="returnedInfo.status === 0">
<p class="red">若您同意退货，待买家寄回后，将退款给买家，若有异议请与平台联系</p>
<p class="red">若您未响应申请，视作同意退货</p>
<p class="red">若您不同意退货可点击驳回，若买家向平台投诉，如核实是您的责任，将会影响店铺评分</p>
</template>
<template v-if="returnedInfo.status === 10">
<p class="red">-若您同意退款，将直接退款给买家</p>
<p class="red">-若您逾期未响应，视作同意退款，系统将自动打款给买家</p>
</template>
<br />
<template v-if="returnedInfo.status === 0">
<i-button type="info" @click="pass()">同意</i-button>
... ...