|
@@ -75,44 +75,28 @@
|
|
|
<div class="info" v-if="status.value === 2 || status.value === 3 || status.value === 4">
|
|
|
<div class="info-title">物流信息</div>
|
|
|
<el-col :span="24" :offset="1">
|
|
|
- <div
|
|
|
- class="info-item-logistics"
|
|
|
- v-for="(item, index) in deliverList"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <div class="logistics-title">包裹{{ index + 1 }}</div>
|
|
|
+ <div class="info-item-logistics" >
|
|
|
<div class="info">
|
|
|
<el-col :span="5" :xs="{span: 24, offset: 0}">
|
|
|
- <div class="tit">配送方式:{{ item.companyName || item.deliveryFlowId ? "快递发货":"无需物流" }}</div>
|
|
|
+ <div class="tit">配送方式:{{ deliveryCompany.companyName || deliveryCompany.deliveryFlowId ? "快递发货":"无需物流" }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="5" :xs="{span: 24, offset: 0}">
|
|
|
- <div class="tit" v-if="item.companyName">快递公司:{{ item.companyName || "--" }}</div>
|
|
|
+ <div class="tit" v-if="deliveryCompany.companyName">快递公司:{{ deliveryCompany.companyName || "--" }}</div>
|
|
|
<div class="tit" v-else></div>
|
|
|
</el-col>
|
|
|
<el-col :span="5" :xs="{span: 24, offset: 0}">
|
|
|
- <div class="tit" v-if="item.deliveryFlowId">快递单号:{{ item.deliveryFlowId || "--" }}</div>
|
|
|
+ <div class="tit" v-if="info.deliveryFlowId">快递单号:{{ info.deliveryFlowId || "--" }}</div>
|
|
|
<div class="tit" v-else></div>
|
|
|
</el-col>
|
|
|
<el-col :span="7" :xs="{span: 24, offset: 0}">
|
|
|
- <div class="tit">发货时间:{{ parseTime(item.deliveryTime) || "--" }}</div>
|
|
|
+ <div class="tit">发货时间:{{ parseTime(info.deliveryTime) || "--" }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="2" :xs="{span: 24, offset: 0}">
|
|
|
- <div class="edit-express" @click="editExpress(item)" v-if="status.value === 2 || status.value === 4">修改</div>
|
|
|
+ <div class="edit-express" @click="editExpress(deliveryCompany)" v-if="status.value === 2 || status.value === 4">修改</div>
|
|
|
</el-col>
|
|
|
</div>
|
|
|
- <div class="goods">
|
|
|
- <div class="goods-item" v-for="(ele, ins) in item.items" :key="ins">
|
|
|
- <img :src="ele.picUrl" alt="" />
|
|
|
- <div class="info">
|
|
|
- <div>{{ ele.title || "--" }}</div>
|
|
|
- <div>{{ ele.properties || "--" }}</div>
|
|
|
- <div>{{ ele.goodsNum }}件</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
-
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -199,6 +183,8 @@ export default {
|
|
|
list: [],
|
|
|
// 物流信息性别
|
|
|
deliverList: [],
|
|
|
+ // 快递
|
|
|
+ deliveryCompany: {},
|
|
|
// 发货显示
|
|
|
goodsShow: false,
|
|
|
// 修改快递信息弹框
|
|
@@ -225,14 +211,15 @@ export default {
|
|
|
if (res.code == 0) {
|
|
|
this.info = res.data;
|
|
|
this.status = JSON.parse(res.data.status);
|
|
|
- res.data.deliverList &&
|
|
|
- res.data.deliverList.forEach((item) => {
|
|
|
- item.items.forEach((ele) => {
|
|
|
- let picUrlArr = ele.picUrl.split(",");
|
|
|
- ele.picUrl = publicFileGetUrl + picUrlArr[0];
|
|
|
- });
|
|
|
- });
|
|
|
- this.deliverList = res.data.deliverList;
|
|
|
+ // res.data.deliverList &&
|
|
|
+ // res.data.deliverList.forEach((item) => {
|
|
|
+ // item.items.forEach((ele) => {
|
|
|
+ // let picUrlArr = ele.picUrl.split(",");
|
|
|
+ // ele.picUrl = publicFileGetUrl + picUrlArr[0];
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // this.deliverList = res.data.deliverList;
|
|
|
+ this.deliveryCompany = res.data.deliveryCompany
|
|
|
res.data.items &&
|
|
|
res.data.items.forEach((item) => {
|
|
|
let picUrlArr = item.picUrl.split(",");
|