|
@@ -34,7 +34,7 @@
|
|
</el-col>
|
|
</el-col>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col v-if="active == 3">
|
|
<el-col v-if="active == 3">
|
|
- <el-col :span="24" style="text-align: center; margin: 15px 0; font-size: 18px">店铺{{ activit.customer.is_check || '暂无快递信息' }}</el-col>
|
|
|
|
|
|
+ <el-col :span="24" style="text-align: center; margin: 15px 0; font-size: 18px">店铺{{ getCheck() || '暂无快递信息' }}</el-col>
|
|
<el-col>
|
|
<el-col>
|
|
<el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
|
|
<el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
|
|
<el-form-item label="寄出运单号" prop="shop_transport_no">
|
|
<el-form-item label="寄出运单号" prop="shop_transport_no">
|
|
@@ -66,7 +66,7 @@
|
|
<el-col :span="24" style="text-align: center; margin-top: 15px">
|
|
<el-col :span="24" style="text-align: center; margin-top: 15px">
|
|
<el-button type="primary" @click="exam('-3')" style="margin: 10px 0">已换货</el-button>
|
|
<el-button type="primary" @click="exam('-3')" style="margin: 10px 0">已换货</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="24" style="text-align: center; margin: 15px 0; font-size: 18px">买家{{ activit.shop.is_check || '暂无快递信息' }}</el-col>
|
|
|
|
|
|
+ <el-col :span="24" style="text-align: center; margin: 15px 0; font-size: 18px">买家{{ getCheckOne() || '暂无快递信息' }}</el-col>
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<el-timeline :reverse="reverse">
|
|
<el-timeline :reverse="reverse">
|
|
<el-timeline-item v-for="(activity, index) in shopList" :key="index" :timestamp="activity.time" :color="activity.color">
|
|
<el-timeline-item v-for="(activity, index) in shopList" :key="index" :timestamp="activity.time" :color="activity.color">
|
|
@@ -121,6 +121,12 @@ export default {
|
|
this.loading = false;
|
|
this.loading = false;
|
|
},
|
|
},
|
|
handleSelect(value) {},
|
|
handleSelect(value) {},
|
|
|
|
+ getCheck() {
|
|
|
|
+ return _.get(this.activit, 'customer.is_check');
|
|
|
|
+ },
|
|
|
|
+ getCheckOne() {
|
|
|
|
+ return _.get(this.activit, 'shop.is_check');
|
|
|
|
+ },
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
...mapState(['user']),
|
|
...mapState(['user']),
|