From cdc4e5a70e24eddd874097dfece112af066ff6ca Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 13 Jun 2025 17:56:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(common):=20=E5=90=88=E5=90=8C=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=94=B9=E4=B8=BA=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修改页面名称为订单列表
- 添加订单管理相关接口和功能
- 实现订单列表展示、订单详情查看- 新增创建订单功能，包括付款类型、课程、班级等选择
- 优化页面样式和布局，适应订单列表展示需求
---
api/apiRoute.js | 22 ++
pages.json | 2 +-
pages/common/contract_list.vue | 689 ++++++++++++++++++++++++++++-----
pages/student/my/my.vue | 17 +-
4 files changed, 632 insertions(+), 98 deletions(-)
diff --git a/api/apiRoute.js b/api/apiRoute.js
index ef4992d..bc5b8d2 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -651,6 +651,28 @@ export default {
})
},
+ //学生端-订单管理-列表
+ xy_orderTableList(data = {}) {
+ let url = '/xy/orderTable'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //学生端-订单管理-详情
+ xy_orderTableInfo(data = {}) {
+ let url = '/xy/orderTable/info'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+
+ //学生端-订单管理-添加
+ xy_orderTableAdd(data = {}) {
+ let url = '/xy/orderTable/add'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
diff --git a/pages.json b/pages.json
index 7bec910..b8379c2 100644
--- a/pages.json
+++ b/pages.json
@@ -207,7 +207,7 @@
{
"path" : "pages/common/contract_list",
"style": {
- "navigationBarTitleText": "合同列表",
+ "navigationBarTitleText": "订单列表",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#292929",
"navigationBarTextStyle": "white"
diff --git a/pages/common/contract_list.vue b/pages/common/contract_list.vue
index b20a320..6f8c762 100644
--- a/pages/common/contract_list.vue
+++ b/pages/common/contract_list.vue
@@ -1,4 +1,4 @@
-
+
@@ -8,7 +8,7 @@
scroll-y="true"
:lower-threshold="lowerThreshold"
@scrolltolower="loadMoreData"
- style="height: 90vh;"
+ style="height: 83vh;"
>
- 企业合同
- 下载合同
+ 订单状态：{{v.order_status == 'pending' ? '待支付':'已支付' }}
+
- 合同名称：
- {{v.title}}
+ 客户姓名：
+ {{ v.resource_id_name || ''}}
+
+
+ 付款类型：
+
+ {{ v.payment_type === 'cash' ? '现金支付' : v.payment_type === 'scan_code' ? '扫码支付' : '订阅支付' }}
+
+
+
+
+ 订单金额：
+ ￥{{ v.order_amount || ''}}
+
+
+
+ 课程：
+ {{ v.course_id_name || ''}}
+
+
+
+ 班级：
+ {{ v.class_id_name }}
+
+
- 签署方：
- {{v.signatory_a}}
+ 人员：
+ {{ v.staff_id_name || ''}}
+
- 签署方：
- {{v.signatory_b}}
+ 支付时间：
+ {{ v.payment_time || '' }}
+
+
+
+
+
+
+
+ 创建订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.payment_type) ? formData.payment_type_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.course_id) ? formData.course_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.class_id) ? formData.class_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/student/my/my.vue b/pages/student/my/my.vue
index 445fb23..3bc4909 100644
--- a/pages/student/my/my.vue
+++ b/pages/student/my/my.vue
@@ -56,7 +56,7 @@
-
+
我的订单
@@ -147,10 +147,19 @@
})
},
- //跳转页面-合同列表
- openViewContractList(item) {
+ //跳转页面-订单列表
+ openViewOrder() {
+ let resource_id = this.member_info.id//客户资源id
+ let resource_name = this.member_info.name || ''//客户资源id姓名
+
+ // let staff_id = this.userInfo.id//员工id
+ // let staff_id_name = this.userInfo.name || ''//员工姓名
+
+ let staff_id = ''//员工id
+ let staff_id_name = ''//员工姓名
+
this.$navigateTo({
- url: `/pages/common/contract_list`
+ url: `/pages/common/contract_list?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}`
})
},