From 4657ec005debd5333d5d9ca979566f0d006b1e67 Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Tue, 2 Mar 2021 14:54:15 +0800
Subject: [PATCH] change style
---
.hbuilderx/launch.json | 11 +
.../reservation_order/reservation_order.vue | 104 ++--
src/components/timing_order/timing_order.vue | 134 +++++
src/pages.json | 14 +-
src/pages/index/index.vue | 53 +-
src/pages/order_list/order_list.vue | 13 +-
src/static/images/icon/x_close.png | Bin 0 -> 425 bytes
.../reservation_people/reservation_people.vue | 546 +++++++++++++++++++++
.../order/reservation_site/reservation_site.vue | 261 ++++++++++
.../reservation_details/reservation_details.vue | 32 ++
.../timing_details/timing_details.vue | 285 +++++++++++
.../device/pages/order_manage/order_manage.vue | 110 ++++-
.../device/static/images/order/tab_0_0.png | Bin 0 -> 878 bytes
.../device/static/images/order/tab_0_1.png | Bin 0 -> 1386 bytes
.../device/static/images/order/tab_0_10.png | Bin 0 -> 1790 bytes
.../device/static/images/order/tab_0_11.png | Bin 0 -> 1484 bytes
.../device/static/images/order/tab_0_2.png | Bin 0 -> 1833 bytes
.../device/static/images/order/tab_0_3.png | Bin 0 -> 1423 bytes
.../device/static/images/order/tab_0_4.png | Bin 0 -> 2743 bytes
.../device/static/images/order/tab_0_5.png | Bin 0 -> 856 bytes
.../device/static/images/order/tab_0_6.png | Bin 0 -> 1577 bytes
.../device/static/images/order/tab_0_7.png | Bin 0 -> 709 bytes
.../device/static/images/order/tab_0_8.png | Bin 0 -> 2319 bytes
.../device/static/images/order/tab_0_9.png | Bin 0 -> 1651 bytes
.../device/static/images/order/tab_1_0.png | Bin 0 -> 2296 bytes
src/subpackage/device/static/images/scan_code.png | Bin 0 -> 553 bytes
26 files changed, 1497 insertions(+), 66 deletions(-)
create mode 100644 .hbuilderx/launch.json
create mode 100644 src/components/timing_order/timing_order.vue
create mode 100644 src/static/images/icon/x_close.png
create mode 100644 src/subpackage/device/components/order/reservation_people/reservation_people.vue
create mode 100644 src/subpackage/device/components/order/reservation_site/reservation_site.vue
create mode 100644 src/subpackage/device/pages/order_details/reservation_details/reservation_details.vue
create mode 100644 src/subpackage/device/pages/order_details/timing_details/timing_details.vue
create mode 100644 src/subpackage/device/static/images/order/tab_0_0.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_1.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_10.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_11.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_2.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_3.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_4.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_5.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_6.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_7.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_8.png
create mode 100644 src/subpackage/device/static/images/order/tab_0_9.png
create mode 100644 src/subpackage/device/static/images/order/tab_1_0.png
create mode 100644 src/subpackage/device/static/images/scan_code.png
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..501e01c
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+ "version": "0.0",
+ "configurations": [{
+ "type": "uniCloud",
+ "default": {
+ "launchtype": "remote"
+ }
+ }
+ ]
+}
diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue
index 275b1bb..8fb776d 100644
--- a/src/components/reservation_order/reservation_order.vue
+++ b/src/components/reservation_order/reservation_order.vue
@@ -1,8 +1,8 @@
-
+
@@ -12,49 +12,77 @@
- 用户昵称:
+ 预订项目:
- {{orderInfo.nickname || '-'}}
-
-
-
- 支付时间:
-
- {{orderInfo.pay_time || '-'}}
-
-
-
- 预定日期:
-
- {{orderInfo.date || '-'}}
-
-
-
- 预定场次:
-
- {{e.venue_name}} {{e.duration}}
+ {{ orderInfo.venue_type_name || '-'}}
+
+
+
+ 预订场数:
+
+ {{ '-'}}
+
+
+
+
+ 预订时间:
+
+ {{orderInfo.date || '-'}}等
+
+
+
+
+
+
+ 数量:
+
+ {{ '-'}}
+
+
+
+ 类型:
+
+ {{ '-'}}
+
+
+
+
+ 有效期至:
+
+ {{ '-'}}
+
+
+
+
+ 使用日期:
+
+ {{ '-'}}
+
+
+
-
-
- 支付方式:{{zh_pay_type(orderInfo.pay_type)}}
- 共{{orderInfo.sessions.length || '-'}}场次 合计:¥{{orderInfo.amount || '0'}}
-
- 实付款 ¥{{orderInfo.pay_amount || '0'}}(折扣{{orderInfo.discount_amount || '0'}})
-
- 核销方式:{{zh_verify_type(orderInfo.verify_type)}} {{orderInfo.verify_time || '-'}}
- 退款时间:{{orderInfo.refund_time || '-'}}
+ 实付款 ¥{{orderInfo.pay_amount || '0'}}
+
+
@@ -127,6 +161,9 @@ export default {
.rh-active{
color: $themeColor;
}
+ .rh-red{
+ color: #EA5061;
+ }
}
.ro-section{
padding-bottom: 20upx;
@@ -179,6 +216,7 @@ export default {
color: #9c9c9f;
.rt-txt{
color: #1A1A1A;
+ margin-left: 10rpx;
}
}
}
diff --git a/src/components/timing_order/timing_order.vue b/src/components/timing_order/timing_order.vue
new file mode 100644
index 0000000..0fc55f0
--- /dev/null
+++ b/src/components/timing_order/timing_order.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+ 订单编号:
+
+ {{orderInfo.order_no || '-'}}
+
+
+
+
+
+ 项目:
+
+ {{'羽毛球(1号馆)' || '-'}}
+
+
+
+ 时长:
+
+ {{ '1小时58分46秒' || '-'}}
+
+
+
+
+ 实付款 ¥{{orderInfo.pay_amount || '0'}}
+
+
+
+
+
+
+
diff --git a/src/pages.json b/src/pages.json
index 47f829f..66ca532 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -184,7 +184,7 @@
}
}
- ],
+ ],
"subpackages": [
{
"root": "subpackage/device",
@@ -248,6 +248,18 @@
"style" : {
"navigationBarTitleText": "售货柜管理"
}
+ },
+ {
+ "path": "pages/order_details/reservation_details/reservation_details",
+ "style" : {
+ "navigationBarTitleText": "预约订单详情"
+ }
+ },
+ {
+ "path": "pages/order_details/timing_details/timing_details",
+ "style" : {
+ "navigationBarTitleText": "计时订单详情"
+ }
}
]
}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index a72b954..b5cb39d 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -79,30 +79,36 @@
serverKey: 1002 // 后端对应权限编号
},
{
- id: 2,
- name: '经营分析',
- path: '',
- serverKey: 1003 // 后端对应权限编号
- },
- {
id: 3,
- name: '场馆订单',
- path: '/pages/order_list/order_list',
- serverKey: 1004 // 后端对应权限编号
- },
- {
- id: 4,
- name: '会员卡订单',
- path: '/pages/order_list/order_list',
- serverKey: 1005 // 后端对应权限编号
- },
- {
- id: 5,
- name: '积分订单',
- // path: '/pages/order_list/order_list',
- path: '',
- serverKey: 1006 // 后端对应权限编号
+ name: '订单管理',
+ path: '/subpackage/device/pages/order_manage/order_manage',
+ serverKey: 1011 // 后端对应权限编号
},
+ // {
+ // id: 2,
+ // name: '经营分析',
+ // path: '',
+ // serverKey: 1003 // 后端对应权限编号
+ // },
+ // {
+ // id: 3,
+ // name: '场馆订单',
+ // path: '/pages/order_list/order_list',
+ // serverKey: 1004 // 后端对应权限编号
+ // },
+ // {
+ // id: 4,
+ // name: '会员卡订单',
+ // path: '/pages/order_list/order_list',
+ // serverKey: 1005 // 后端对应权限编号
+ // },
+ // {
+ // id: 5,
+ // name: '积分订单',
+ // // path: '/pages/order_list/order_list',
+ // path: '',
+ // serverKey: 1006 // 后端对应权限编号
+ // },
{
id: 6,
name: '员工管理',
@@ -185,6 +191,7 @@
let _permission = indexData.permission || {};
if(!app.isLogin())return this.showAuthor();
if(!tabInfo.path)return util.showNone('暂未开放!');
+ if(tabInfo.id == 3)return util.routeTo(tabInfo.path,'nT');
if(!_permission[tabInfo.serverKey])return util.showNone('暂无权限,请联系管理员开启!')
if(this.isOrderTab(tabInfo.id))return util.routeTo(tabInfo.path + `?order_type=${tabInfo.id}`,'nT');
util.routeTo(tabInfo.path,'nT');
@@ -192,7 +199,7 @@
isOrderTab(ID){
return ID == 3 || ID == 4 || ID == 5
},
- getIndexInfo(){
+ getIndexInfo(){
servers.get({
url: API.calc,
data: {},
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 6dfa18c..cc270f5 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -1,7 +1,7 @@