From 34943462d7bfcb59db8dc4dac6c236952794ce17 Mon Sep 17 00:00:00 2001
From: LLL <15374889135@163.com>
Date: Fri, 13 Jun 2025 11:36:04 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/apiRoute.js | 33 +++
pages/coach/home/index.vue | 2 +-
pages/coach/job/add.vue | 30 +--
pages/coach/student/physical_examination.vue | 211 +++++++++++++------
4 files changed, 193 insertions(+), 83 deletions(-)
diff --git a/api/apiRoute.js b/api/apiRoute.js
index 8ed87fb..37bab48 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -143,6 +143,39 @@ export default {
//↓↓↓↓↓↓↓↓↓↓↓↓-----教练接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓
+
+
+
+
+
+ //添加作业
+ jlPublishJob(data = {}) {
+ let url = '/class/jlPublishJob/add'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //添加作业-学员列表
+ jlGetStudentList(data = {}) {
+ let url = '/class/jlGetStudentList/list'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //添加作业-获取课程列表
+ jlGetCoursesList(data = {}) {
+ let url = '/class/jlGetCoursesList/list'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //添加作业-获取班级列表
+ jlGetClassesList(data = {}) {
+ let url = '/class/jlGetClasses/list'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
//体测报告-详情
physicalTestInfo(data = {}) {
let url = '/class/physicalTest/info'
diff --git a/pages/coach/home/index.vue b/pages/coach/home/index.vue
index 799bc30..0b910eb 100644
--- a/pages/coach/home/index.vue
+++ b/pages/coach/home/index.vue
@@ -4,7 +4,7 @@
待办
- 发布作业
+ 发布作业
diff --git a/pages/coach/job/add.vue b/pages/coach/job/add.vue
index bff5e65..d15ea19 100644
--- a/pages/coach/job/add.vue
+++ b/pages/coach/job/add.vue
@@ -101,7 +101,7 @@
+
\ No newline at end of file
From 43c7301cbb3245633e531163f2b4d1aefea0bd03 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 13 Jun 2025 11:49:23 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat(market):=20=E6=88=91=E7=9A=84=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 添加搜索抽屉,支持用户名、手机号和时间范围筛选
- 优化搜索逻辑,重置筛选条件并更新数据列表
- 调整搜索框样式,增加点击事件以打开抽屉
---
pages/market/clue/index.vue | 165 +++++++++++++++++++++++++++++++-----
1 file changed, 145 insertions(+), 20 deletions(-)
diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue
index 2163f43..6732e86 100644
--- a/pages/market/clue/index.vue
+++ b/pages/market/clue/index.vue
@@ -11,12 +11,12 @@
@scrolltolower="loadMoreData_1"
style="height: 100vh;"
>
-
+
-
-
+
+ 用户名/手机号/时间范围
- 搜索
+ 搜索
@@ -79,10 +79,10 @@
>
-
-
+
+ 用户名/手机号/时间范围
- 搜索
+ 搜索
@@ -132,10 +132,54 @@
+
+
+
+
+
+ 筛选
+
+
+
+
+ 时间筛选
+
+
+
+
+
+
+
+
+ 姓名筛选
+
+
+
+
+
+
+
+
+ 电话筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -166,9 +210,6 @@ export default {
is_gh: '2',//1=资源分配,2=我的客户
},
-
-
-
//顶部Tab栏
values: [
{
@@ -191,6 +232,8 @@ export default {
total:10,//数据总条数
shared_by:'',//共享人ID|0=未分配
shared_at_str:'',//共享时间|开始时间(Y-m-d)-结束时间(Y-m-d)
+ phone_number:'',//客户资源表-手机号
+ name:'',//客户资源表-用户姓名
},
//数据列表
tableList_1:[],//表格数据
@@ -203,6 +246,8 @@ export default {
total:10,//数据总条数
shared_by:'0',//共享人ID|0=未分配
shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+ phone_number:'',//客户资源表-手机号
+ name:'',//客户资源表-用户姓名
},
//数据列表
tableList_2:[],//表格数据
@@ -220,6 +265,15 @@ export default {
//时间选择器相关
date_picker_show:false,//是否展示时间选择器
+ //抽屉搜索条件展示窗相关
+ showDrawer:false,//是否展示|false=否
+ showDrawerForm:{
+ shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+ phone_number:'',//客户资源表-手机号
+ name:'',//客户资源表-用户姓名
+ },
+
+
}
},
onLoad(options) {},
@@ -435,12 +489,25 @@ export default {
//切换tag列表
async segmented(param) {
this.segmented_type = param.id//1=我的客户,2=资源分配
+
+ //重置筛选抽屉中的表单数据
+ this.showDrawerForm.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+ this.showDrawerForm.phone_number = ''//客户资源表-手机号
+ this.showDrawerForm.name = ''//客户资源表-用户姓名
+
if(this.segmented_type == 1){
+ this.filteredData_1.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+ this.filteredData_1.phone_number = ''//客户资源表-手机号
+ this.filteredData_1.name = ''//客户资源表-用户姓名
+
//我的客户
//重置为第一页
await this.resetFilteredData_1()
await this.getList_1()
}else{
+ this.filteredData_2.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+ this.filteredData_2.phone_number = ''//客户资源表-手机号
+ this.filteredData_2.name = ''//客户资源表-用户姓名
//资源分配
//重置为第一页
await this.resetFilteredData_2()
@@ -557,14 +624,7 @@ export default {
changeDatePicker(e){
console.log('时间',e)
let shared_at_str = `${e.startDate.result} ~ ${e.endDate.result}`
-
- if (this.segmented_type == 1) {
- //我的客户
- this.filteredData_1.shared_at_str = shared_at_str
- } else {
- //资源分配
- this.filteredData_2.shared_at_str = shared_at_str
- }
+ this.showDrawerForm.shared_at_str = shared_at_str
this.cancelDatePicker()
},
//打开时间选择器
@@ -579,14 +639,30 @@ export default {
//检索数据
async searchData(){
if(this.segmented_type == 1){
+ this.filteredData_1.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+ this.filteredData_1.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号
+ this.filteredData_1.name = this.showDrawerForm.name//客户资源表-用户姓名
//我的客户
await this.resetFilteredData_1()
await this.getList_1()
}else{
+ this.filteredData_2.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
+ this.filteredData_2.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号
+ this.filteredData_2.name = this.showDrawerForm.name//客户资源表-用户姓名
//资源分配
await this.resetFilteredData_2()
await this.getList_2()
}
+ this.closeShowDrawer()
+ },
+
+ //打开抽屉筛选弹窗
+ openShowDrawer(){
+ this.showDrawer = true
+ },
+ //关闭抽屉筛选弹窗
+ closeShowDrawer(){
+ this.showDrawer = false
}
}
}
@@ -609,8 +685,13 @@ export default {
justify-content: center;
.input_box {
width: 75%;
- ::v-deep .fui-input__wrap{
- height: 100%;
+ .input_box_text{
+ height: 60rpx;
+ line-height: 60rpx;
+ background-color: #fff;
+ padding-left: 20rpx;
+ color: #cccccc;
+ font-size: 28rpx;
}
}
.button{
@@ -723,4 +804,48 @@ export default {
height: 50rpx;
background-color: #F59A23;
}
+
+ //抽屉搜索栏
+ .fui-scroll__view {
+ margin-top: 60rpx;
+ width: 520rpx;
+ flex: 1;
+ overflow: hidden;
+ .fui-title {
+ padding: 40rpx 32rpx;
+ padding-bottom: 20rpx;
+ box-sizing: border-box;
+ font-weight: bold;
+ }
+ .drawer_box{
+ border: 1px solid red;
+ .item{
+ display: flex;
+ flex-direction: column;
+ gap: 15rpx;
+ .title{}
+ .input_box {
+ border: 1px solid #292929;
+ width: 450rpx;
+ ::v-deep .fui-input__wrap{
+ padding: 10rpx !important;
+ height: 100%;
+ }
+ }
+ }
+ }
+ .fui-btn__box {
+ padding: 40rpx 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: 30rpx;
+ }
+ }
+
+
+
+
+
From bd8990299fe4c32e084a20311265cdc5702cfecc Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 13 Jun 2025 15:08:38 +0800
Subject: [PATCH 3/9] =?UTF-8?q?feat(market):=20=E4=BC=98=E5=8C=96=E7=BA=BF?=
=?UTF-8?q?=E7=B4=A2=E6=9D=A5=E6=BA=90=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修改线索添加和编辑页面的来源选择逻辑
- 当选择非线上来源时,自动设置来源渠道为线下
-调整表单字段显示逻辑,根据来源类型动态显示来源渠道字段
---
api/apiRoute.js | 24 +++
pages.json | 9 ++
pages/market/clue/clue_info.vue | 9 ++
pages/market/clue/order_list.vue | 262 +++++++++++++++++++++++++++++++
4 files changed, 304 insertions(+)
create mode 100644 pages/market/clue/order_list.vue
diff --git a/api/apiRoute.js b/api/apiRoute.js
index 1cdf8bd..081d694 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -413,6 +413,30 @@ export default {
})
},
+ //员工端(销售)-订单管理-列表
+ xs_orderTableList(data = {}) {
+ let url = '/orderTable'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+
+ //员工端(销售)-订单管理-详情
+ xs_orderTableInfo(data = {}) {
+ let url = '/orderTable/info'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+
+ //员工端(销售)-订单管理-添加
+ xs_orderTableAdd(data = {}) {
+ let url = '/orderTable/add'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
+
diff --git a/pages.json b/pages.json
index 1bc726a..7bec910 100644
--- a/pages.json
+++ b/pages.json
@@ -483,6 +483,15 @@
"navigationBarBackgroundColor": "#29d3b4",
"navigationBarTextStyle": "black"
}
+ },
+ {
+ "path": "pages/market/clue/order_list",
+ "style": {
+ "navigationBarTitleText": "订单列表",
+ "navigationStyle": "default",
+ "navigationBarBackgroundColor": "#29d3b4",
+ "navigationBarTextStyle": "black"
+ }
},
{
"path": "pages/market/clue/index",
diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue
index 78a09b7..e6be625 100644
--- a/pages/market/clue/clue_info.vue
+++ b/pages/market/clue/clue_info.vue
@@ -261,6 +261,7 @@
编辑详情
拨打电话
修改记录
+ 订单列表
@@ -374,6 +375,14 @@
})
},
+ //跳转页面-订单列表
+ openViewOrder() {
+ let resource_id = this.clientInfo.resource_id
+ this.$navigateTo({
+ url: `/pages/market/clue/order_list?resource_id=${resource_id}`
+ })
+ },
+
//跳转页面-转接跟进任务
openViewNewTask() {
this.$navigateTo({
diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue
new file mode 100644
index 0000000..5da2bd0
--- /dev/null
+++ b/pages/market/clue/order_list.vue
@@ -0,0 +1,262 @@
+
+
+
+
+
+
+
+
+ 企业合同
+ 下载合同
+
+
+
+ 合同名称:
+ {{v.title}}
+
+
+ 签署方:
+ {{v.signatory_a}}
+
+
+ 签署方:
+ {{v.signatory_b}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 96d6798bbec01806b59ea77a9703277ab70cda9b Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 13 Jun 2025 15:22:37 +0800
Subject: [PATCH 4/9] =?UTF-8?q?refactor(market):=20=E9=87=8D=E6=9E=84?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=B8=83?=
=?UTF-8?q?=E5=B1=80=E5=92=8C=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修改了订单列表页面的顶部标题为"订单状态"
- 移除了下载合同按钮
- 重新安排了订单信息的展示格式,包括客户姓名、付款类型、订单金额、课程、班级、人员和支付时间等字段
- 在 clue_info 页面中添加了 resource_id 字段
- 修改了 order_list 页面的 onLoad 方法,获取 resource_id 参数
- 更新了订单列表 API调用方式
---
pages/market/clue/clue_info.vue | 3 +-
pages/market/clue/order_list.vue | 57 ++++++++++++++++++++++++--------
2 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue
index e6be625..f91da5e 100644
--- a/pages/market/clue/clue_info.vue
+++ b/pages/market/clue/clue_info.vue
@@ -281,6 +281,7 @@
resource_sharing_id:'',//共享资源表id
clientInfo:{
id:'',//共享资源id
+ resource_id:'',//客户资源id
customerResource:{},//客户资源信息
sixSpeed:{},//六要素信息
},//共享资源详情
@@ -377,7 +378,7 @@
//跳转页面-订单列表
openViewOrder() {
- let resource_id = this.clientInfo.resource_id
+ let resource_id = this.clientInfo.resource_id//客户资源id
this.$navigateTo({
url: `/pages/market/clue/order_list?resource_id=${resource_id}`
})
diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue
index 5da2bd0..0ef299a 100644
--- a/pages/market/clue/order_list.vue
+++ b/pages/market/clue/order_list.vue
@@ -16,22 +16,47 @@
:key="k"
>
- 企业合同
- 下载合同
+ 订单状态
+
- 合同名称:
- {{v.title}}
+ 客户姓名:
+ {{ v.resource_id_name }}
+
- 签署方:
- {{v.signatory_a}}
+ 付款类型:
+
+ {{ v.payment_type === 'cash' ? '现金支付' : v.payment_type === 'scan_code' ? '扫码支付' : '订阅支付' }}
+
+
+
+ 订单金额:
+ ¥{{ v.order_amount }}
+
+
- 签署方:
- {{v.signatory_b}}
+ 课程:
+ {{ v.course_id_name }}
+
+
+ 班级:
+ {{ v.class_id_name }}
+
+
+
+ 人员:
+ {{ v.staff_id_name }}
+
+
+
+ 支付时间:
+ {{ v.payment_time }}
+
+
@@ -41,8 +66,8 @@
@@ -207,8 +255,9 @@
.list_box{
font-size: 30rpx;
- text-align: center;
- margin-top: 120rpx;
+ // text-align: center;
+ margin-left: 50rpx;
+ margin-top: 20rpx;
.ul{
padding: 0 20rpx;
display: flex;
From cc6c9c2e0a86ecca36a1b374bbbe29208fca3694 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 13 Jun 2025 17:44:25 +0800
Subject: [PATCH 7/9] =?UTF-8?q?feat(market):=20=E6=B7=BB=E5=8A=A0=E5=88=9B?=
=?UTF-8?q?=E5=BB=BA=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 apiRoute.js 中新增获取全部课程列表和班级列表的接口
- 在 clue_info.vue 中添加获取当前登录员工信息的方法,并在订单列表页面使用这些信息- 在 order_list.vue 中添加创建订单的弹窗和相关逻辑,包括选择付款类型、课程和班级
- 优化订单列表的展示,增加订单状态和金额的显示
---
api/apiRoute.js | 14 +
pages/market/clue/clue_info.vue | 27 +-
pages/market/clue/order_list.vue | 502 ++++++++++++++++++++++++++++++-
3 files changed, 527 insertions(+), 16 deletions(-)
diff --git a/api/apiRoute.js b/api/apiRoute.js
index 081d694..ef4992d 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -66,6 +66,20 @@ export default {
return res;
})
},
+ //公共端-获取全部课程列表
+ common_getCourseAll(data = {}) {
+ let url = '/common/getCourseAll'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //公共端-获取全部班级列表
+ common_getClassAll(data = {}) {
+ let url = '/common/getClassAll'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
//公共端-教师/销售端验证旧密码是否正确
common_personnelCheckOldPwd(data = {}) {
let url = '/personnel/checkOldPwd'
diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue
index f91da5e..bec3426 100644
--- a/pages/market/clue/clue_info.vue
+++ b/pages/market/clue/clue_info.vue
@@ -290,6 +290,9 @@
followList:[],
//通话记录列表
listCallUp:[],
+
+ //当前登录的员工信息
+ userInfo:{},
}
},
onLoad(options) {
@@ -301,10 +304,25 @@
methods: {
async init(){
await this.getInfo()//客户详情
- // this.getFollowList()//获取跟进记录
+ this.getUserInfo()//获取当前登录的员工信息
// this.getListCallUp()//获取通话记录
},
+ //获取当前登录的员工信息
+ async getUserInfo(){
+ let res = await apiRoute.getPersonnelInfo({})
+ if (res.code != 1) {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ return
+ }
+
+ this.userInfo = res.data
+ // console.log('员工',this.userInfo)
+ },
+
//获取客户详情
async getInfo(){
let data = {
@@ -379,8 +397,13 @@
//跳转页面-订单列表
openViewOrder() {
let resource_id = this.clientInfo.resource_id//客户资源id
+ let resource_name = this.clientInfo.customerResource.name || ''//客户资源id姓名
+
+ let staff_id = this.userInfo.id//员工id
+ let staff_id_name = this.userInfo.name || ''//员工姓名
+
this.$navigateTo({
- url: `/pages/market/clue/order_list?resource_id=${resource_id}`
+ url: `/pages/market/clue/order_list?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}`
})
},
diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue
index 0ef299a..8566f5f 100644
--- a/pages/market/clue/order_list.vue
+++ b/pages/market/clue/order_list.vue
@@ -8,7 +8,7 @@
scroll-y="true"
:lower-threshold="lowerThreshold"
@scrolltolower="loadMoreData"
- style="height: 90vh;"
+ style="height: 83vh;"
>
- 订单状态
+ 订单状态:{{v.order_status == 'pending' ? '待支付':'已支付' }}
客户姓名:
- {{ v.resource_id_name }}
+ {{ v.resource_id_name || ''}}
@@ -34,12 +34,12 @@
订单金额:
- ¥{{ v.order_amount }}
+ ¥{{ v.order_amount || ''}}
课程:
- {{ v.course_id_name }}
+ {{ v.course_id_name || ''}}
@@ -49,25 +49,177 @@
人员:
- {{ v.staff_id_name }}
+ {{ v.staff_id_name || ''}}
支付时间:
- {{ v.payment_time }}
+ {{ 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}`
})
},
From 28e8dbf9675641711f03945bc6bd04648ef5e915 Mon Sep 17 00:00:00 2001
From: LLL <15374889135@163.com>
Date: Fri, 13 Jun 2025 18:15:18 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/apiRoute.js | 8 +-
pages/coach/my/index.vue | 37 +++++---
pages/coach/my/info.vue | 77 ++++++++-------
pages/coach/my/update_pass.vue | 166 ++++++++++++++++++++++++++++-----
4 files changed, 221 insertions(+), 67 deletions(-)
diff --git a/api/apiRoute.js b/api/apiRoute.js
index 081d694..e6f80fe 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -147,7 +147,13 @@ export default {
-
+ //获取我的页面统计个数
+ getStatisticsInfo(data = {}) {
+ let url = '/class/Statistics/info'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
//添加作业
jlPublishJob(data = {}) {
let url = '/class/jlPublishJob/add'
diff --git a/pages/coach/my/index.vue b/pages/coach/my/index.vue
index 8a11a15..bee5fb6 100644
--- a/pages/coach/my/index.vue
+++ b/pages/coach/my/index.vue
@@ -30,24 +30,24 @@
- {{memberInfo.zsks}}
+ {{statisticsInfo.courseNum}}
总授课数/节
- {{memberInfo.zsbj}}
+ {{statisticsInfo.classNum}}
总授班级/个
- {{memberInfo.zfzxy}}
+ {{statisticsInfo.studentNum}}
总负责学员/名
月授课数
- 12
+ {{statisticsInfo.courseMonthNum}}
节,月负责学员
- 188
+ {{statisticsInfo.studentMonthNum}}
名
@@ -66,12 +66,12 @@
xxx场馆
-
+
+
即将到期
-
授课统计
@@ -83,8 +83,8 @@
-
-
+
+
我的消息
@@ -125,6 +125,7 @@ export default {
data() {
return {
memberInfo:{},
+ statisticsInfo: []
}
},
onLoad() {
@@ -135,6 +136,7 @@ export default {
methods: {
async init(){
this.getMemberInfo()
+ this.getStatistics()
},
//教练详情(个人信息详情)
@@ -149,6 +151,19 @@ export default {
}
this.memberInfo = res.data
},
+
+ //获取统计个数
+ async getStatistics() {
+ let res = await apiRoute.getStatisticsInfo({})
+ if (res.code != 1) {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ return
+ }
+ this.statisticsInfo = res.data
+ },
//打开到课率统计
openViewArrivalStatistics(){
@@ -164,10 +179,10 @@ export default {
})
},
- //打开授课统计
+ //我的消息
openViewSchoolingStatistics(){
this.$navigateTo({
- url: '/pages/coach/my/schooling_statistics'
+ url: '/pages/common/my_message'
})
},
diff --git a/pages/coach/my/info.vue b/pages/coach/my/info.vue
index 442951b..fefbe9c 100644
--- a/pages/coach/my/info.vue
+++ b/pages/coach/my/info.vue
@@ -8,7 +8,7 @@
修改头像
@@ -39,7 +39,8 @@
部门
-
+
+ {{formData.department_name_str || '暂无'}}
@@ -59,14 +60,14 @@
性别 *
-
+
@@ -122,6 +123,7 @@
@@ -104,4 +220,10 @@
color: #999999;
padding-left: 30rpx;
}
+
+ .btn_box{
+ display: flex;
+ flex-direction: column;
+ gap: 40rpx;
+ }
\ No newline at end of file