diff --git a/src/api/order/index.js b/src/api/order/index.js new file mode 100644 index 0000000..1e7e8b8 --- /dev/null +++ b/src/api/order/index.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +export function index(params){ + return request({ + method:'get', + url:'/api/admin/order/index', + params + }) +} + +export function getList(params){ + return request({ + method:'get', + url:'/api/admin/order/get-list', + params + }) +} + +export function itemPreAction(params){ + return request({ + method:'get', + url:'/api/admin/order/item-pre-action', + params + }) +} + +export function itemAction(data){ + return request({ + method:'post', + url:'/api/admin/order/item-action', + data + }) +} + +export function getMerchantsByProductType(params){ + return request({ + method:'get', + url:'/api/admin/order/get-merchants-by-product-type', + params + }) +} + +export function getMerchantsByOrderItem(params){ + return request({ + method:'get', + url:'/api/admin/order/get-merchants-by-order-item', + params + }) +} + +export function getAssignableProducts(params){ + return request({ + method:'get', + url:'/api/admin/order/get-assignable-products', + params + }) +} + +export function getItemLogs(params){ + return request({ + method:'get', + url:'/api/admin/order/get-item-logs', + params + }) +} diff --git a/src/api/order/order.js b/src/api/order/order.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue index 8758d9f..97f43bb 100644 --- a/src/components/XyDialog/index.vue +++ b/src/components/XyDialog/index.vue @@ -220,6 +220,7 @@ export default { } } .el-form-item{ + flex-shrink: 0; flex-basis: 50%; } .el-form-item__error{ diff --git a/src/components/XySelectors/index.vue b/src/components/XySelectors/index.vue index 44e0ae5..7c20ec2 100644 --- a/src/components/XySelectors/index.vue +++ b/src/components/XySelectors/index.vue @@ -1,6 +1,10 @@ + + diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue index 575564a..29fdbfb 100644 --- a/src/views/order/orderList.vue +++ b/src/views/order/orderList.vue @@ -3,34 +3,75 @@
-
- - - - - - - - +
+ + + + +
- + diff --git a/src/views/productService/components/addStrategy.vue b/src/views/productService/components/addStrategy.vue index 0554a24..6e2e140 100644 --- a/src/views/productService/components/addStrategy.vue +++ b/src/views/productService/components/addStrategy.vue @@ -27,7 +27,7 @@ *栏目:
- +
@@ -101,7 +101,7 @@ *标签:
- +
@@ -135,10 +135,10 @@ export default { subheading:'', strategyTypeId:'', state:true, - content:'', coverPicture:'', sortNumber:0, - label:'' + label:'', + content:'', }, rules:{ title:[ @@ -202,6 +202,9 @@ export default {