|
|
@@ -116,14 +116,15 @@
|
|
|
</el-col>
|
|
|
</el-col>
|
|
|
<el-col :span="9" class="one" v-if="transport.shop_transport_no">
|
|
|
- <el-col :span="24">{{ transport.shop_transport_name || '暂无快递信息' }}: {{ transport.shop_transport_no || '暂无快递信息' }}</el-col>
|
|
|
+ <el-col :span="24">{{ activit.is_check || '暂无快递信息' }}</el-col>
|
|
|
+ <el-col :span="24">{{ transport.shop_transport_name || '暂无快递信息' }}: {{ activit.no || '暂无快递信息' }}</el-col>
|
|
|
<el-col :span="24">
|
|
|
<p>订单编号:{{ form.id }}</p>
|
|
|
<p>收货地址：{{ address.province }} , {{ address.city }} , {{ address.area }} , {{ address.address }}</p>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-timeline :reverse="reverse">
|
|
|
- <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.ftime" :color="activity.color">
|
|
|
+ <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.time" :color="activity.color">
|
|
|
{{ activity.context }}
|
|
|
</el-timeline-item>
|
|
|
</el-timeline>
|
|
|
@@ -199,8 +200,7 @@ export default {
|
|
|
this.$set(this, `transport`, res.data.transport);
|
|
|
res = await this.sotFetch(this.id);
|
|
|
if (this.$checkRes(res)) {
|
|
|
- console.log(res);
|
|
|
- let activities = res.data.data;
|
|
|
+ let activities = res.data.list;
|
|
|
activities[0].color = '#0bbd87';
|
|
|
this.$set(this, `activities`, activities);
|
|
|
this.$set(this, `activit`, res.data);
|
