diff --git a/src/js/api.js b/src/js/api.js index 05dec09..e01de78 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,6 +1,6 @@ -// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 // export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 -export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 +// export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 export const API = { diff --git a/src/pages.json b/src/pages.json index 72db8c9..88af8ec 100644 --- a/src/pages.json +++ b/src/pages.json @@ -390,15 +390,33 @@ "root": "subpackage/order", "pages": [ { + "path": "pages/events/member_info/member_info", + "style" : { + "navigationBarTitleText": "查看成员" + } + }, + { + "path": "pages/events/member_list/member_list", + "style" : { + "navigationBarTitleText": "查看成员" + } + }, + { + "path": "pages/events/detail/detail", + "style" : { + "navigationBarTitleText": "赛事订单列表" + } + }, + { "path": "pages/value_card/detail/detail", "style" : { "navigationBarTitleText": "储值卡详情" } }, { - "path": "pages/display_cabinets/detail/detail", + "path": "pages/devices/detail/detail", "style" : { - "navigationBarTitleText": "售货柜订单详情" + "navigationBarTitleText": "订单详情" } }, { diff --git a/src/subpackage/order/components/p_line/p_line.vue b/src/subpackage/order/components/p_line/p_line.vue new file mode 100644 index 0000000..5df4ef4 --- /dev/null +++ b/src/subpackage/order/components/p_line/p_line.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/display_cabinets/detail/detail.vue b/src/subpackage/order/pages/devices/detail/detail.vue similarity index 78% rename from src/subpackage/order/pages/display_cabinets/detail/detail.vue rename to src/subpackage/order/pages/devices/detail/detail.vue index c6a0ae9..f0bf994 100644 --- a/src/subpackage/order/pages/display_cabinets/detail/detail.vue +++ b/src/subpackage/order/pages/devices/detail/detail.vue @@ -1,7 +1,7 @@ @@ -38,12 +42,14 @@ import server from '../../../js/server'; import a_line from '../../../../../components/order_list/a_line/a_line.vue'; import header from '../../../components/header/header.vue'; import s_line from '../../../components/s_line/s_line.vue'; +import p_line from '../../../components/p_line/p_line.vue'; import util from '../../../../../utils/util'; export default { components: { 'a-line': a_line, 'o-header': header, 's-line': s_line, + 'p-line': p_line, }, } diff --git a/src/subpackage/order/pages/events/detail/detail.vue b/src/subpackage/order/pages/events/detail/detail.vue new file mode 100644 index 0000000..e523fa9 --- /dev/null +++ b/src/subpackage/order/pages/events/detail/detail.vue @@ -0,0 +1,177 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/events/member_info/member_info.vue b/src/subpackage/order/pages/events/member_info/member_info.vue new file mode 100644 index 0000000..18699f2 --- /dev/null +++ b/src/subpackage/order/pages/events/member_info/member_info.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/events/member_list/member_list.vue b/src/subpackage/order/pages/events/member_list/member_list.vue new file mode 100644 index 0000000..ffd9ae8 --- /dev/null +++ b/src/subpackage/order/pages/events/member_list/member_list.vue @@ -0,0 +1,95 @@ + + + + + \ No newline at end of file