diff --git a/admin/src/views/order/index.vue b/admin/src/views/order/index.vue index 28161992..951fc448 100644 --- a/admin/src/views/order/index.vue +++ b/admin/src/views/order/index.vue @@ -436,7 +436,7 @@ export default { form: {}, rules:{ flowObj: [ - { required: true, message: '请选择活动区域', trigger: 'change' } + { required: true, message: '请选择流转对象', trigger: 'change' } ], } } diff --git a/admin/src/views/order/product.vue b/admin/src/views/order/product.vue index 7b7a3341..1998d9a4 100644 --- a/admin/src/views/order/product.vue +++ b/admin/src/views/order/product.vue @@ -3,14 +3,14 @@
- - + + + + 搜索 @@ -79,13 +79,17 @@ export default { limit: 10, product_name: '' }, - os_arr: { 1: '美团', 2: '快手', 3: '抖音' }, - form: {}, - rules:{ - flowObj: [ - { required: true, message: '请选择活动区域', trigger: 'change' } - ], - } + os_arr: [{ + value: '1', + label: '美团' + }, { + value: '2', + label: '快手' + }, { + value: '3', + label: '抖音' + }], + form: {} } }, created() { @@ -100,11 +104,14 @@ export default { methods: { getList() { this.$axios.get('/admin/index/productNameList', { params: this.listQuery }).then(response => { + console.log(response) + this.listLoading = false + console.log(this.listLoading) this.list = response.data.data this.total = response.data.total this.timetype_arr = response.ext.timetype this.oss = response.ext.oss - this.listLoading = false + }).catch(() => { }) }