|
@@ -77,7 +77,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-col :span="6">寄出快递类型</el-col>
|
|
|
- <el-col :span="18" class="other">{{ transport.shop_transport_name || '暂无快递类型' }}</el-col>
|
|
|
+ <el-col :span="18" class="other">{{ transport.shop_transport_name || '暂无快递信息' }}</el-col>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
|
|
@@ -116,15 +116,15 @@
|
|
|
</el-col>
|
|
|
</el-col>
|
|
|
<el-col :span="9" class="one" v-if="transport.shop_transport_no">
|
|
|
- <el-col :span="24">中通快递: 75527648947663</el-col>
|
|
|
+ <el-col :span="24">{{ transport.shop_transport_name || '暂无快递信息' }}: {{ transport.shop_transport_no || '暂无快递信息' }}</el-col>
|
|
|
<el-col :span="24">
|
|
|
- <p>订单编号: 20010930-4075-527648947663</p>
|
|
|
- <p>收货地址:吉林省长春市朝阳区南湖中街</p>
|
|
|
+ <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.timestamp" :color="activity.color">
|
|
|
- {{ activity.content }}
|
|
|
+ <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.ftime" :color="activity.color">
|
|
|
+ {{ activity.context }}
|
|
|
</el-timeline-item>
|
|
|
</el-timeline>
|
|
|
</el-col>
|
|
@@ -140,6 +140,7 @@ const moment = require('moment');
|
|
|
import { mapState, mapGetters, createNamespacedHelpers } from 'vuex';
|
|
|
const { mapActions } = createNamespacedHelpers('orderDetail');
|
|
|
const { mapActions: dictData } = createNamespacedHelpers('dictData');
|
|
|
+const { mapActions: sot } = createNamespacedHelpers('sot');
|
|
|
|
|
|
export default {
|
|
|
name: 'form-1',
|
|
@@ -162,6 +163,7 @@ export default {
|
|
|
// 物流
|
|
|
reverse: false,
|
|
|
activities: [],
|
|
|
+ activit: {},
|
|
|
// 订单状态
|
|
|
order_processList: [],
|
|
|
// 快递类型
|
|
@@ -175,6 +177,7 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
...dictData({ dictQuery: 'query' }),
|
|
|
+ ...sot({ sotFetch: 'fetch' }),
|
|
|
...mapActions(['query', 'fetch', 'create', 'update']),
|
|
|
// 查询
|
|
|
async search() {
|
|
@@ -185,41 +188,25 @@ export default {
|
|
|
// 地址
|
|
|
this.$set(this, `address`, res.data.address);
|
|
|
this.$set(this, `shop`, res.data.shop);
|
|
|
- if (res.data.transport) {
|
|
|
- let type = this.shop_transport_typeList.find((i) => i.value == res.data.transport.shop_transport_type);
|
|
|
- if (type) res.data.transport.shop_transport_name = type.label;
|
|
|
- this.$set(this, `transport`, res.data.transport);
|
|
|
- }
|
|
|
// 商品
|
|
|
this.$set(this, `list`, res.data.goods);
|
|
|
// 应付金额
|
|
|
this.$set(this, `total_detail`, res.data.total_detail);
|
|
|
this.$set(this, `pay`, res.data.order.pay);
|
|
|
+ if (res.data.transport) {
|
|
|
+ let type = this.shop_transport_typeList.find((i) => i.value == res.data.transport.shop_transport_type);
|
|
|
+ if (type) res.data.transport.shop_transport_name = type.label;
|
|
|
+ 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;
|
|
|
+ activities[0].color = '#0bbd87';
|
|
|
+ this.$set(this, `activities`, activities);
|
|
|
+ this.$set(this, `activit`, res.data);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- let activities = [
|
|
|
- {
|
|
|
- content: '【广州市】快件离开【广州夏茅】已发往【长春中转】',
|
|
|
- timestamp: '2018-04-15',
|
|
|
- },
|
|
|
- {
|
|
|
- content: '【广州市】【广州夏茅】(020-79479549)的快递员(111111111)已揽收',
|
|
|
- timestamp: '2018-04-15',
|
|
|
- },
|
|
|
- {
|
|
|
- content: '订单已确认,正等待中通快递揽收',
|
|
|
- timestamp: '2018-04-13',
|
|
|
- },
|
|
|
- {
|
|
|
- content: '订单确认,商家配货中',
|
|
|
- timestamp: '2018-04-11',
|
|
|
- },
|
|
|
- {
|
|
|
- content: '您已提交订单,请等待系统确认',
|
|
|
- timestamp: '2018-04-11',
|
|
|
- },
|
|
|
- ];
|
|
|
- activities[0].color = '#0bbd87';
|
|
|
- this.$set(this, `activities`, activities);
|
|
|
},
|
|
|
// 提交
|
|
|
async onSubmit() {
|
|
@@ -277,7 +264,6 @@ export default {
|
|
|
<style lang="less" scoped>
|
|
|
.main {
|
|
|
.one {
|
|
|
- font-size: 20px;
|
|
|
margin: 10px 0 0 5%;
|
|
|
padding: 5px;
|
|
|
.add {
|
|
@@ -287,7 +273,7 @@ export default {
|
|
|
}
|
|
|
.shop {
|
|
|
padding: 4px 0;
|
|
|
- font-size: 22px;
|
|
|
+ font-size: 18px;
|
|
|
border-bottom: 1px solid #ccc;
|
|
|
}
|
|
|
.goods {
|
|
@@ -310,7 +296,7 @@ export default {
|
|
|
|
|
|
/deep/.el-timeline {
|
|
|
margin: 20px 0 0 0;
|
|
|
- font-size: 20px;
|
|
|
+ font-size: 16px;
|
|
|
}
|
|
|
/deep/.el-timeline-item__node:nth-child(1) {
|
|
|
background-color: green;
|