Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
commit
3df17ed33f
|
@ -52,7 +52,7 @@
|
||||||
<div class="hover-color" @click="goodsDetail(goods.skuId, goods.goodsId)">{{ goods.name }}</div>
|
<div class="hover-color" @click="goodsDetail(goods.skuId, goods.goodsId)">{{ goods.name }}</div>
|
||||||
<div class="mt_10">
|
<div class="mt_10">
|
||||||
<span class="global_color">{{ goods.goodsPrice | unitPrice("¥") }} </span>x {{ goods.num }}
|
<span class="global_color">{{ goods.goodsPrice | unitPrice("¥") }} </span>x {{ goods.num }}
|
||||||
<span style="margin-left: 10px;color: #ff9900;">{{refundPriceList(goods.isRefund)}} {{ goods.refundPrice | unitPrice("¥") }}</span>
|
<span style="margin-left: 10px;color: #ff9900;">{{refundPriceList(goods.isRefund)}}</span>
|
||||||
</div>
|
</div>
|
||||||
<Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:190px;margin-right:10px">评价</Button>
|
<Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:190px;margin-right:10px">评价</Button>
|
||||||
<Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small" style="position:relative;top:-22px;left:190px">投诉</Button>
|
<Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small" style="position:relative;top:-22px;left:190px">投诉</Button>
|
||||||
|
@ -162,11 +162,11 @@ export default {
|
||||||
case 'PART_REFUND':
|
case 'PART_REFUND':
|
||||||
return "部分退款";
|
return "部分退款";
|
||||||
case 'NO_REFUND':
|
case 'NO_REFUND':
|
||||||
return "未退款";
|
return "";
|
||||||
case 'REFUNDING':
|
case 'REFUNDING':
|
||||||
return "退款中";
|
return "退款中";
|
||||||
default:
|
default:
|
||||||
return "未退款";
|
return "";
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
goodsDetail (skuId, goodsId) {
|
goodsDetail (skuId, goodsId) {
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
size="small"
|
size="small"
|
||||||
>取消订单</Button
|
>取消订单</Button
|
||||||
>
|
>
|
||||||
|
<Button v-if="order.allowOperationVO.showLogistics || orderPackage.length > 0 || logistics" type="info" @click="logisticsList()" size="small">查看物流</Button>
|
||||||
</Card>
|
</Card>
|
||||||
<p class="verificationCode" v-if="order.order.verificationCode">
|
<p class="verificationCode" v-if="order.order.verificationCode">
|
||||||
核验码:<span>{{ order.order.verificationCode }}</span>
|
核验码:<span>{{ order.order.verificationCode }}</span>
|
||||||
|
@ -72,9 +73,6 @@
|
||||||
<p>支付方式:{{ order.paymentMethodValue }}</p>
|
<p>支付方式:{{ order.paymentMethodValue }}</p>
|
||||||
<p>付款状态:{{ order.payStatusValue }}</p>
|
<p>付款状态:{{ order.payStatusValue }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="order.allowOperationVO.showLogistics || orderPackage.length > 0 || logistics">
|
|
||||||
<Button type="info" @click="logisticsList()" size="small">查看物流</Button>
|
|
||||||
</div>
|
|
||||||
<div class="order-card" v-if="!order.order.verificationCode">
|
<div class="order-card" v-if="!order.order.verificationCode">
|
||||||
<h3>配送信息</h3>
|
<h3>配送信息</h3>
|
||||||
<p>配送方式:{{ order.deliveryMethodValue }}</p>
|
<p>配送方式:{{ order.deliveryMethodValue }}</p>
|
||||||
|
|
Loading…
Reference in New Issue