From a6dc0901d97421d2d4ed551e0031dddc57e98490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Mon, 10 Jul 2023 16:18:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E6=94=B6=E8=B5=8B=E8=83=BD=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/interfaces/empower.js | 27 ++-
pages.json | 13 +-
pages/empower/info.vue | 3 +-
pages/empower/order.vue | 400 ++++++++++++++++++++++++++++++++
pages/synthesize/enableWork.vue | 361 +++++++++++++++++++++++++++-
pages/work/index.vue | 12 +-
pages/work/orders.vue | 2 +-
7 files changed, 791 insertions(+), 27 deletions(-)
create mode 100644 pages/empower/order.vue
diff --git a/apis/interfaces/empower.js b/apis/interfaces/empower.js
index e865261..15b2ce4 100644
--- a/apis/interfaces/empower.js
+++ b/apis/interfaces/empower.js
@@ -39,10 +39,35 @@ const buy = data => {
})
}
+// 订单列表初始化
+const orderInit = () => {
+ return request({
+ url : "empower/order/init",
+ })
+}
+
+// 订单列表
+const orderList = data => {
+ return request({
+ url : "empower/order/index",
+ data
+ })
+}
+
+// 取消订单
+const orderCancel = order => {
+ return request({
+ url : "empower/order/" + order + "/cancel",
+ })
+}
+
export {
lists,
info,
buyInit,
- buy
+ buy,
+ orderInit,
+ orderList,
+ orderCancel
}
diff --git a/pages.json b/pages.json
index fd4ae17..fadcccc 100644
--- a/pages.json
+++ b/pages.json
@@ -787,11 +787,20 @@
"navigationBarBackgroundColor": "#FFF"
}
}, {
- "path": "pages/empower/buy",
- "name": "EmpowerBuy",
+ "path": "pages/empower/buy",
+ "name": "EmpowerBuy",
"auth": true,
"style": {
"navigationBarTitleText": "报名",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#FFF"
+ }
+ }, {
+ "path": "pages/empower/order",
+ "name": "EmpowerOrder",
+ "auth": true,
+ "style": {
+ "navigationBarTitleText": "订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFF"
}
diff --git a/pages/empower/info.vue b/pages/empower/info.vue
index e716ff9..bdc90a2 100644
--- a/pages/empower/info.vue
+++ b/pages/empower/info.vue
@@ -31,7 +31,6 @@
@@ -133,6 +132,6 @@
z-index: 99;
background-color: white;
box-shadow: 0 0 10rpx 10rpx rgba(0, 0, 0, .04);
- .footer-btn{ background: $main-color; color: white; line-height: 100rpx; border-radius: 50rpx; flex: 1; text-align: center; font-weight: bold; font-size: 36rpx; margin-left: 50rpx; }
+ .footer-btn{ background: $main-color; color: white; line-height: 100rpx; border-radius: 50rpx; flex: 1; text-align: center; font-weight: bold; font-size: 36rpx; }
}
diff --git a/pages/empower/order.vue b/pages/empower/order.vue
new file mode 100644
index 0000000..c63040e
--- /dev/null
+++ b/pages/empower/order.vue
@@ -0,0 +1,400 @@
+
+
+
+
+
+
+
+
+ {{ statusArr[statusIndex].title }}
+
+
+
+
+
+
+
+ {{ empowerArr[empowerIndex].title }}
+
+
+
+
+
+
+
+
+
+
+
+ 客户
+ 个人
+ {{item.order_no}}
+
+ {{item.status_text}}
+
+
+
+
+ {{item.empower.title}}
+
+
+
+
+ ×{{item.items.count}}
+
+
+
+
+
+ {{citem.semester.subtitle}}({{citem.name}})
+ ¥{{citem.price}}
+
+
+
+
+ ¥{{item.price}}
+
+
+
+ {{item.paid_at}}
+
+
+
+
+ 取消
+ 支付
+ 报名信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 报名信息
+
+
+ {{item.name}}
+ {{item.mobile}}
+ {{item.semester.subtitle}}
+ {{item.status_text}}
+ {{item.semester.address}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/synthesize/enableWork.vue b/pages/synthesize/enableWork.vue
index 7ac9950..1d4f593 100644
--- a/pages/synthesize/enableWork.vue
+++ b/pages/synthesize/enableWork.vue
@@ -1,33 +1,372 @@
-
-
-
+
+ 统计数据
+
+
+
+ 待支付
+ {{orderAll.all}}人
+
+
+
+ 已支付
+ {{orderAll.all}}单
+
+
+
+ 已完成
+ {{orderAll.all}}单
+
+
+
+ 结算金额
+ {{orderAll.all}}万
+
+
+
+
+ 订单管理
+
+
+
+ {{orderEntrust.init}}
+ 全部订单
+
+
+
+ {{orderEntrust.init}}
+ 待支付
+
+
+
+ {{orderEntrust.init}}
+ 已支付
+
+
+
+ {{orderEntrust.init}}
+ 已完成
+
+
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 4a2db52..cec152c 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -90,8 +90,7 @@
去查看
-
-
+
增收赋能类
@@ -242,14 +241,7 @@
})
}
})
- },
-
- onToastTips(){
- uni.showToast({
- title: '即将开放,敬请期待',
- icon : 'none'
- })
- },
+ }
}
}
diff --git a/pages/work/orders.vue b/pages/work/orders.vue
index 63c9b60..9f7bb2c 100644
--- a/pages/work/orders.vue
+++ b/pages/work/orders.vue
@@ -111,7 +111,7 @@