diff --git a/src/views/order/Detail.vue b/src/views/order/Detail.vue
index 0d26bd6..630795c 100644
--- a/src/views/order/Detail.vue
+++ b/src/views/order/Detail.vue
@@ -100,6 +100,9 @@
+
@@ -132,7 +135,7 @@
- 查看备注
+ 查看备注
{{ record.trade ? record.trade.out_trade_no : '-' }}
@@ -258,13 +261,13 @@
item.delivery_method == 20 ? '无需物流' : item.express.express_name
}}
-
+
{{ item.express_no ? '京东物流' : '--' }}{{ item.express_no ? '京东物流' : '--' }}
{{ item.express_no ? item.express_no : '--' }}
@@ -368,6 +371,7 @@
+
@@ -375,8 +379,8 @@
import { inArray } from '@/utils/util'
import * as Api from '@/api/order'
import { GoodsItem, UserItem } from '@/components/Table'
-import { DeliveryForm, ExtractForm, CancelForm, PrinterForm, PriceForm, RemarkForm } from './modules'
-import { Ueditor} from '@/components'
+import { DeliveryForm, ExtractForm, CancelForm, PrinterForm, PriceForm, RemarkForm, JingDong } from './modules'
+import { Ueditor } from '@/components'
import {
OrderTypeEnum,
DeliveryStatusEnum,
@@ -432,7 +436,8 @@ export default {
PrinterForm,
PriceForm,
RemarkForm,
- Ueditor
+ Ueditor,
+ JingDong,
},
data() {
return {
@@ -491,10 +496,10 @@ export default {
}
})
} else {
- if (this.containsLetterMix(record.express_no, 'http')) {
- record.isLink = true
+ if (this.containsLetterMix(this.record.express_no, 'http')) {
+ this.record.isLink = true
} else {
- record.isLink = false
+ this.record.isLink = false
}
}
// 初始化数据
@@ -581,6 +586,11 @@ export default {
const { record } = this
this.$refs.RemarkForm.show(record)
},
+ // 京东链接
+ onClickJongDongLink() {
+ const { record } = this
+ this.$refs.JingDong.show(record)
+ },
},
}
diff --git a/src/views/order/modules/JingDong.vue b/src/views/order/modules/JingDong.vue
new file mode 100644
index 0000000..4dc6d8c
--- /dev/null
+++ b/src/views/order/modules/JingDong.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/order/modules/index.js b/src/views/order/modules/index.js
index 3c6e115..25edbe2 100644
--- a/src/views/order/modules/index.js
+++ b/src/views/order/modules/index.js
@@ -4,5 +4,6 @@ import CancelForm from './CancelForm'
import PrinterForm from './PrinterForm'
import PriceForm from './PriceForm'
import RemarkForm from './RemarkForm'
+import JingDong from './JingDong'
-export { DeliveryForm, ExtractForm, CancelForm, PrinterForm, PriceForm, RemarkForm }
+export { DeliveryForm, ExtractForm, CancelForm, PrinterForm, PriceForm, RemarkForm,JingDong }