From c05136f0849e5c463db81c43386ada9db3bd1340 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 21 Mar 2025 10:51:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?refactor(coach/market):=E9=87=8D=E6=9E=84?=
=?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 移除原有的冗余代码
- 使用 $util.loginOut() 方法统一处理登录退出逻辑
- 提高代码复用性和可维护性
---
pages/coach/my/set_up.vue | 9 ++-------
pages/market/my/set_up.vue | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/pages/coach/my/set_up.vue b/pages/coach/my/set_up.vue
index 6132536..69519e9 100644
--- a/pages/coach/my/set_up.vue
+++ b/pages/coach/my/set_up.vue
@@ -22,13 +22,8 @@
},
methods: {
//退出登陆
- logOut(){
- //清空用户缓存数据
- uni.removeStorageSync('userInfo');
- //跳转登陆页面
- uni.navigateTo({
- url: '/pages/student/login/login'
- })
+ loginOut(){
+ this.$util.loginOut()
},
privacy_agreement(type){
diff --git a/pages/market/my/set_up.vue b/pages/market/my/set_up.vue
index 1849ad5..1b860c6 100644
--- a/pages/market/my/set_up.vue
+++ b/pages/market/my/set_up.vue
@@ -22,13 +22,8 @@
},
methods: {
//退出登陆
- logOut(){
- //清空用户缓存数据
- uni.removeStorageSync('userInfo');
- //跳转登陆页面
- uni.navigateTo({
- url: '/pages/student/login/login'
- })
+ loginOut(){
+ this.$util.loginOut()
},
privacy_agreement(type){
From b03e484fa4076a0b17dce2333f013a3aad2498da Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 21 Mar 2025 10:54:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=AD=A3=E9=80=80?=
=?UTF-8?q?=E5=87=BA=E8=B4=A6=E5=8F=B7=E5=8A=9F=E8=83=BD=E7=9A=84=E4=BA=8B?=
=?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 coach 和 market 模块的设置页面中，将退出账号按钮的事件处理方法从 logOut() 修改为 loginOut()
- 此修改统一了退出功能的事件命名，提高了代码的一致性和可维护性
---
pages/coach/my/set_up.vue | 2 +-
pages/market/my/set_up.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/coach/my/set_up.vue b/pages/coach/my/set_up.vue
index 69519e9..0785c35 100644
--- a/pages/coach/my/set_up.vue
+++ b/pages/coach/my/set_up.vue
@@ -8,7 +8,7 @@
清空缓存
- 退出账号
+ 退出账号
diff --git a/pages/market/my/set_up.vue b/pages/market/my/set_up.vue
index 1b860c6..9a63516 100644
--- a/pages/market/my/set_up.vue
+++ b/pages/market/my/set_up.vue
@@ -8,7 +8,7 @@
清空缓存
- 退出账号
+ 退出账号
From 3280468f76d1158ad72e50bf54583035d7ca4d5d Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 21 Mar 2025 11:55:02 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/member.js | 11 ++
pages/student/timetable/list.vue | 243 +++++++++++++++++++++++-------
static/icon-img/loading_white.png | Bin 0 -> 2615 bytes
3 files changed, 199 insertions(+), 55 deletions(-)
create mode 100644 static/icon-img/loading_white.png
diff --git a/api/member.js b/api/member.js
index 394169d..5c18387 100644
--- a/api/member.js
+++ b/api/member.js
@@ -29,10 +29,21 @@ export default {
return res;
})
},
+ //登陆
login(data) {
let url = '/login'
return http.get(url,data).then(res => {
return res;
})
},
+
+ //获取学员课程列表
+ courseList(data) {
+ let url = '/member/course_list'
+ return http.get(url,data).then(res => {
+ return res;
+ })
+ },
+
+
}
\ No newline at end of file
diff --git a/pages/student/timetable/list.vue b/pages/student/timetable/list.vue
index 0fa96d9..c0b5886 100644
--- a/pages/student/timetable/list.vue
+++ b/pages/student/timetable/list.vue
@@ -1,65 +1,130 @@
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
- 当前场馆
-
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
- XXX体育馆
- 南山区科苑路15号科兴科学园
- 距您1km
-
-
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+ XXX体育馆
+ 南山区科苑路15号科兴科学园
+ 距您1km
+
+ 当前场馆
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/icon-img/loading_white.png b/static/icon-img/loading_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb7c43126511f2a4bdfd6fde094f478ec8774f8e
GIT binary patch
literal 2615
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
Z{{!6D+p&q(8R`H4002ovPDHLkV1kTo
Date: Fri, 21 Mar 2025 18:05:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/student/timetable/index.vue | 299 ++++++++++++++++--------------
1 file changed, 163 insertions(+), 136 deletions(-)
diff --git a/pages/student/timetable/index.vue b/pages/student/timetable/index.vue
index a7f4002..f959b70 100644
--- a/pages/student/timetable/index.vue
+++ b/pages/student/timetable/index.vue
@@ -9,47 +9,19 @@
-
- 周日
- 14
-
-
-
- 周一
- 14
-
-
-
- 周二
- 14
-
-
-
- 周日
- 今
-
-
-
- 周一
- 14
-
-
-
- 周二
- 14
-
-
-
- 周二
- 14
-
+
+ {{v.name}}
+
+ {{today == v.date ? '今':v.today}}
+
+
- XXX体育场馆
+ {{venuesInfo.name}}
更多
@@ -57,49 +29,15 @@
-
+
-
-
-
- 班级：少年班
- 时间：2020-05-25 15:30 - 17:30
- 课室：302室
-
- 课程：篮球少儿课
-
-
-
- 上课中
-
-
-
-
-
- 已签到学生 (15/34)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
-
-
-
+
班级：少年班
@@ -140,7 +78,10 @@
-
+
+
+
+
@@ -149,7 +90,7 @@