jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
张乐
2020-09-15 18:24:23 +08:00
parent 4b0051076f
commit 877169ca98
11 changed files with 23 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
admin/src/views/order/orderDetail.vue
View File

@@ -9,13 +9,14 @@
<div class="title">用户信息</div>
<div class="acea-row">
<div class="description-term">用户昵称：{{orderDatalist.user?orderDatalist.user.nickname:orderDatalist.realName}}</div>
<div class="description-term">收货人：{{orderDatalist.realName}}</div>
<div class="description-term">联系电话：{{orderDatalist.userPhone}}</div>
<div class="description-term" v-if="orderDatalist.statusStr.key !== 'toBeWrittenOff'">收货地址：{{orderDatalist.userAddress}}</div>
<div class="description-term">绑定电话：{{orderDatalist.user.phone}}</div>
</div>
<el-divider></el-divider>
<div class="title">收货信息</div>
<div class="title">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货信息': '收货信息'}}</div>
<div class="acea-row">
<div class="description-term">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货人': '收货人'}}：{{orderDatalist.realName}}</div>
<div class="description-term">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货电话': '收货电话'}}：{{orderDatalist.userPhone}}</div>
<div class="description-term" v-if="orderDatalist.statusStr.key !== 'toBeWrittenOff'">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货地址': '收货地址'}}：{{orderDatalist.userAddress}}</div>
<div class="description-term">订单编号：{{orderDatalist.orderId}}</div>
<div class="description-term">订单状态：{{orderDatalist.status | orderStatusFilter}}</div>
<div class="description-term">商品总数：{{orderDatalist.totalNum}}</div>
@@ -32,7 +33,13 @@
<div class="description-term" v-if="orderDatalist.shippingType === 2 && orderDatalist.statusStr.key === 'notShipped'">门店名称：{{orderDatalist.storeName}}</div>
<div class="description-term" v-if="orderDatalist.shippingType === 2 && orderDatalist.statusStr.key === 'notShipped'">核销码：{{orderDatalist.user_phone}}</div>
<div class="description-term">商家备注：{{orderDatalist.remark}}</div>
<div class="description-term" v-if="orderDatalist.statusStr.key === 'toBeWrittenOff'">提货码：{{orderDatalist.verifyCode}}</div>
<template v-if="orderDatalist.statusStr.key === 'toBeWrittenOff' && orderDatalist.systemStore">
<div class="description-term">提货码：{{orderDatalist.verifyCode}}</div>
<div class="description-term">门店名称：{{orderDatalist.systemStore.name}}</div>
<div class="description-term">门店电话：{{orderDatalist.systemStore.phone}}</div>
<div class="description-term">门店地址：{{orderDatalist.systemStore.address + orderDatalist.systemStore.detailedAddress}}</div>
</template>
</div>
<template v-if="orderDatalist.deliveryType === 'express'">
<el-divider></el-divider>