diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue new file mode 100644 index 0000000..e112bb8 --- /dev/null +++ b/src/components/organize_order/organize_order.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/js/api.js b/src/js/api.js index a4ee16d..0041706 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -27,6 +27,9 @@ export const API = { integralOrder: `${ORIGIN}/admin/shop/order/list`, // 积分商城订单 integralOrderSend: `${ORIGIN}/admin/shop/order/ship`, // 积分商城订单-发货 + organizeOrderList: `${ORIGIN}/assistant/gaPlayTogetherOrder/list`, // 约玩订单列表 + amountIssued: `${ORIGIN}/assistant/gaPlayTogetherOrder/amountIssued`, // 发放金额 + // 营业额统计 turnoverBrand: `${ORIGIN}/admin/assistant/turnover/brand/calc`, // 营业额记录-品牌 diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index 843ef90..210ac63 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -36,6 +36,7 @@ + @@ -88,6 +89,8 @@ import integral_order from '../../components/integral_order/integral_order'; import membership_order from '../../components/membership_order/membership_order'; import timing_order from '../../components/timing_order/timing_order.vue' + import organize_order from '../../components/organize_order/organize_order.vue' + import util from '../../utils/util'; import { servers } from '../../js/server'; import { API } from '../../js/api'; @@ -116,6 +119,13 @@ {id:1, name:'已完成'}, {id:4, name:'已退款'}, ] + const orgClassify = [ // 约玩tab 全部/计费中/已完成/已退款 [空字符/0/1/4] + {id:'', name:'全部'}, + // {id:0, name:'待使用'}, + // {id:1, name:'已使用'}, + // {id:2, name:'已失效'}, + // {id:3, name:'已退款'}, + ] export default { components: { // 'reservation-order': order.reservation, @@ -123,6 +133,7 @@ 'membership-order': membership_order, 'integral-order': integral_order, 'timing-order': timing_order, + 'organize-order': organize_order, }, computed:{ classifyArr(){ @@ -131,6 +142,7 @@ if(orderType == 4)return memClassify; if(orderType == 5)return intClassify; if(orderType == 1)return timClassify; + if(orderType == 10)return orgClassify; return []; }, titleName(){ @@ -139,6 +151,7 @@ if(orderType == 4)return '会员卡订单'; if(orderType == 5)return '积分商城订单'; if(orderType == 1)return '计时订单'; + if(orderType == 10)return '约玩订单'; return '订单' }, ...mapState(['brandInfo']), @@ -202,7 +215,10 @@ end: defaultTime.end, orderType: _type }) + }, + onUnload() { + }, methods: { // 获取默认时间 // 3->预约,4->会员,5->积分,1->计时 @@ -310,6 +326,7 @@ if(type == 4)return API.membershipOrder; if(type == 5)return API.integralOrder; if(type == 1)return API.timeOrder; + if(type == 10)return API.organizeOrderList; }, getOrderList({ begin='', @@ -327,18 +344,20 @@ }){ let { brandInfo } = this; util.showLoad(); + let postData = { + begin, + end, + status, + brand_id: brandInfo.brand.id, + stadium_id, + page, + page_size, + order_type, + } + if(this.orderType == "10")postData['type'] = "Main" servers.get({ url: this.getApiUrl(orderType), - data: { - begin, - end, - status, - brand_id: brandInfo.brand.id, - stadium_id, - page, - page_size, - order_type, - }, + data: postData, failMsg: '加载失败！' }) .then(res=>{ diff --git a/src/pages/order_search/order_search.vue b/src/pages/order_search/order_search.vue index 9b651c7..0ff3e3a 100644 --- a/src/pages/order_search/order_search.vue +++ b/src/pages/order_search/order_search.vue @@ -18,6 +18,7 @@ + @@ -29,6 +30,8 @@ import reservation_order from '../../components/reservation_order/reservation_or import integral_order from '../../components/integral_order/integral_order'; import membership_order from '../../components/membership_order/membership_order'; import timing_order from '../../components/timing_order/timing_order.vue' +import organize_order from '../../components/organize_order/organize_order.vue' + import { API } from '../../js/api'; import { servers } from '../../js/server'; import util from '../../utils/util'; @@ -40,6 +43,7 @@ export default { 'membership-order': membership_order, 'integral-order': integral_order, 'timing-order': timing_order, + 'organize-order': organize_order, }, computed: { ...mapState(['brandInfo']), @@ -91,6 +95,7 @@ export default { if(type == 4)return API.membershipOrder; if(type == 5)return API.integralOrder; if(type == 1)return API.timeOrder; + if(type == 10)return API.organizeOrderList; }, getOrderList({ key = "", diff --git a/src/subpackage/device/components/order/organize_detail/organize_detail.vue b/src/subpackage/device/components/order/organize_detail/organize_detail.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue index af7458e..d9fed51 100644 --- a/src/subpackage/device/pages/order_details/order_details.vue +++ b/src/subpackage/device/pages/order_details/order_details.vue @@ -29,6 +29,7 @@ if(optionsQuery.order_type == 3)return '预约订单详情'; //PM: 2021/4/19 已做 if(optionsQuery.order_type == 4)return '储值卡订单详情'; if(optionsQuery.order_type == 5)return '积分商城订单详情'; + if(optionsQuery.order_type == 10)return '约玩订单详情'; return '订单详情' }, ...mapState(['brandInfo']), diff --git a/src/subpackage/device/pages/order_manage/order_manage.vue b/src/subpackage/device/pages/order_manage/order_manage.vue index a56b9e0..7d933ec 100644 --- a/src/subpackage/device/pages/order_manage/order_manage.vue +++ b/src/subpackage/device/pages/order_manage/order_manage.vue @@ -44,7 +44,8 @@ const tabList = [ { id: 10, name: "约玩订单", - path: '', + path: '/pages/order_list/order_list', + // path: '', }, { id: 4, @@ -112,7 +113,7 @@ export default { util.routeTo(tabInfo.path,'nT'); }, isOrderTab(ID){ - return ID == 3 || ID == 4 || ID == 5 || ID == 1 + return ID == 3 || ID == 4 || ID == 5 || ID == 1 || ID == 10 }, } }