From 754d4b07a5ef7957e51243ef6441f7e92426a81c Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 23 May 2025 11:17:12 +0800
Subject: [PATCH 01/14] =?UTF-8?q?feat(market):=20=E9=87=8D=E6=9E=84=20firm?=
=?UTF-8?q?=5Finfo=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 重新设计页面布局，使用 scroll-view 实现滚动加载
- 添加校区信息获取功能- 优化数据展示逻辑，支持多条目展示
-调整样式，增加列表项间隔和边框
---
api/apiRoute.js | 8 ++
pages/market/my/firm_info.vue | 173 ++++++++++++++++++++--------------
2 files changed, 108 insertions(+), 73 deletions(-)
diff --git a/api/apiRoute.js b/api/apiRoute.js
index f483e37..1addf2f 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -67,6 +67,13 @@ export default {
return res;
})
},
+ //公共端-教师/销售端验证旧密码是否正确
+ common_getPersonnelCampus(data = {}) {
+ let url = '/campus/getPersonnelCampus'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
@@ -228,6 +235,7 @@ export default {
+
//↑↑↑↑↑↑↑↑↑↑↑↑-----销售接口相关-----↑↑↑↑↑↑↑↑↑↑↑
diff --git a/pages/market/my/firm_info.vue b/pages/market/my/firm_info.vue
index a76543a..9ae30c5 100644
--- a/pages/market/my/firm_info.vue
+++ b/pages/market/my/firm_info.vue
@@ -3,63 +3,67 @@
-
-
-
-
- 基本信息
-
-
-
- 企业名称
- {{dataInfo.enterprise_name}}
-
-
-
- 企业简称
- {{dataInfo.enterprise_abbreviation}}
+
+
+
+
+
+
+
+ 基本信息
+
+
+ 企业名称
+ {{v.campus_name}}
+
+
+
+ 企业地址
+ {{v.campus_address}}
+
+
+
+ 企业介绍
+
+
+
+
-
- 企业电话
- {{dataInfo.phone}}
-
-
- 所属行业
- {{dataInfo.profession}}
-
-
- 企业网址
- {{dataInfo.website}}
-
-
- 成立时间
- {{dataInfo.establishment_time}}
-
-
- 企业介绍
-
-
-
-
@@ -147,6 +182,17 @@ import apiRoute from '@/api/apiRoute.js';
}
}
.section_3{
+ padding: 20rpx 22rpx;
+ .html{
+ color: #fff;
+ }
+ .map_box{
+ color: #fff;
+ display: flex;
+ justify-content: center;
+ }
+ }
+ .section_4{
padding: 20rpx 22rpx;
padding-bottom: 250rpx;
.html{
diff --git a/static/icon-img/ding_wei.png b/static/icon-img/ding_wei.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee8da7185f2215fb3833bd362cfa69c89e47b14d
GIT binary patch
literal 1196
zcmV;d1XKHoP)Px(W=TXrRCr#^T5VF>Fc6hIkm(^x8h#Z{(QuN&NeU-{n-ER`{Hh0fhz<~|NW>ZA
zv9xbjE4luanOI*>@4elXY)ysde)VN#-riPC)BG^TtekTzW9`cSHpaAJ3eL6G+VHz`
z?(X#Y^`^qqj4d^YUv$%TKb>=HW9?cnPP+qT^Zn`NO3)r^q7J}*;l^A-Gr(SItuZ$x
zfKUbCak=>AbQeB`M;!%rPK&27dU
zq)l7r+*PhwW&tqc;(O4tB_RgjKUn-81lM&Jr+?ly5-N!R2%7J@-+}?dj&)skXATZp
zui=m*_-B_V2*ak>6GQ+!EEj(99}@?ju;`|_LQQKIN_|8*2fE)g;pFM%nDKsil??zh
z)QNY-Pj1IFZ?F*9yIkRd0|E;G4)rCInVL8=v0?+x0^s53@D_>nT8ke70yEFK&B^oY
z8Oj140L#UDqDMT;2~gej|1*-Umg5C50QX0S=hoV5V#4I$K79JBaNzbKo3qAjs45Wk
z1n1lZnjpadAoO=#cNUAssFvR+beSr8pp9U#5C?#ue@gcp^V~5kX=c!7G|e#*b|Ca^8AmY{(0|G)
z#VN*M0Hi*U!-A**QuHrT3m^-LO_&6alLP@tS>9~
zpF@B4kr?9YsRRTlXWP^XFXAVt`?E4Z?x6&gg@u#g?RMQ*`_1?5Pl>5xZB$06`-=eZ
zjlhYh+}iAc2XCLyF$dqAY?&`
z@mc>#cRvdNMnuS39MzZ#xj=jBmH7VxFOUxwX(@4j6%Xh;;e;ve)l1_3cn+*uU}^!3
zD=Y2wlebXFfY|`dI7XMcKcIF4
z`9CM=nd)DS0kx8&+_0w}1;!ng42v3JuRH*yKATlEKGj4hnj6TzBaGUBrtuXAzz?8l
zh}y=1Am^Y1)mL!_NTpCB
z<`>TdQ>e3~P=Wf@JfI(lQ!Le>esus)Dde8H7Z-1Nx}o?+B@nBT!aJ-unlSqcm
Date: Tue, 27 May 2025 15:05:43 +0800
Subject: [PATCH 03/14] =?UTF-8?q?feat(common):=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E8=AF=B7=E5=81=87=E3=80=81=E6=89=93=E5=8D=A1=E3=80=81=E7=AD=BE?=
=?UTF-8?q?=E9=80=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 添加了请假、打卡、签退相关的 API 接口
- 实现了请假、打卡、签退的前端逻辑和界面
- 增加了用户信息获取和校区选择功能
- 优化了考勤列表的展示方式
---
api/apiRoute.js | 14 +
pages/common/my_attendance.vue | 495 ++++++++++++++++++++++++---------
2 files changed, 382 insertions(+), 127 deletions(-)
diff --git a/api/apiRoute.js b/api/apiRoute.js
index 1addf2f..76f946b 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -38,6 +38,20 @@ export default {
return res;
})
},
+ //教师/销售端请假/打卡/签退-编辑
+ common_attendanceEdit(data = {}) {
+ let url = '/attendance/edit'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
+ //教师/销售端请假/打卡/签退-列表
+ common_attendanceIndex(data = {}) {
+ let url = '/attendance/index'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
//获取字典数据
common_Dictionary(data = {}) {
let url = '/common/getDictionary'
diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue
index fe56e8d..25468fd 100644
--- a/pages/common/my_attendance.vue
+++ b/pages/common/my_attendance.vue
@@ -3,7 +3,7 @@
-
-
-
+
-
+
- {{v.courses.name}}
+ 普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
-
+ {{v.status_name}}
- {{v.add_time}} - {{v.end_time}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{v.courses.name}}
- {{v.status == 1 ? '考勤正常':'请假'}}
-
+ 校区：{{v.campus_id_name}}
- {{v.add_time}} - {{v.end_time}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{v.courses.name}}
- {{v.status == 1 ? '考勤正常':'请假'}}
-
+ 备注：{{v.remarks || ''}}
- {{v.add_time}} - {{v.end_time}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
+ {{v.attendance_date}} {{v.check_in_time}}
+ -
+ {{v.attendance_date}} {{v.check_out_time}}
- {{v.add_time}} - {{v.end_time}}
@@ -136,7 +54,7 @@
普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
+ {{v.status_name}}
+
+
+ 校区：{{v.campus_id_name}}
+
+
+ 备注：{{v.remarks || ''}}
+
+
+ {{v.attendance_date}} {{v.check_in_time}}
+ -
+ {{v.attendance_date}} {{v.check_out_time}}
- {{v.add_time}} - {{v.end_time}}
-
普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
+ {{v.status_name}}
+
+
+ 校区：{{v.campus_id_name}}
+
+
+ 备注：{{v.remarks || ''}}
+
+
+ {{v.attendance_date}} {{v.check_in_time}}
+ -
+ {{v.attendance_date}} {{v.check_out_time}}
- {{v.add_time}} - {{v.end_time}}
@@ -192,19 +129,100 @@
-
+
- 请假
+
+ 打卡
+
+
+ 请假
+
+
+ 签退
-
-
+
+
+ {{signIn_title}}
+ {{signIn_content}}
+
+
+
+
+
+
+ {{ (formData.campus_id) ? formData.campus_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From bdcc9560a0c934d3b5249212471f111afe1bdd90 Mon Sep 17 00:00:00 2001
From: LLL <15374889135@163.com>
Date: Thu, 29 May 2025 11:56:16 +0800
Subject: [PATCH 13/14] =?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 | 14 ++
pages.json | 19 ++-
pages/coach/my/exam_results.vue | 47 +++++++
pages/coach/my/gotake_exam.vue | 185 +++++++++++++++++++++++++
pages/coach/my/teaching_management.vue | 12 +-
5 files changed, 272 insertions(+), 5 deletions(-)
create mode 100644 pages/coach/my/exam_results.vue
create mode 100644 pages/coach/my/gotake_exam.vue
diff --git a/api/apiRoute.js b/api/apiRoute.js
index 76f946b..d1869d8 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -152,6 +152,20 @@ export default {
return res;
})
},
+ //获取试卷
+ getTeachingTestPaper(data = {}) {
+ let url = '/teachingResearch/teachingTestPaper'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //提交试卷
+ submitTestPaper(data = {}) {
+ let url = '/teachingResearch/submitTestPaper'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
//↑↑↑↑↑↑↑↑↑↑↑↑-----教练接口相关-----↑↑↑↑↑↑↑↑↑↑↑↑
diff --git a/pages.json b/pages.json
index 29bbcd4..e4795b8 100644
--- a/pages.json
+++ b/pages.json
@@ -400,7 +400,24 @@
"navigationBarTextStyle": "black"
}
},
-
+ {
+ "path": "pages/coach/my/gotake_exam",
+ "style": {
+ "navigationBarTitleText": "考试",
+ "navigationStyle": "default",
+ "navigationBarBackgroundColor": "#171717",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "pages/coach/my/exam_results",
+ "style": {
+ "navigationBarTitleText": "考试结果",
+ "navigationStyle": "default",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ },
diff --git a/pages/coach/my/exam_results.vue b/pages/coach/my/exam_results.vue
new file mode 100644
index 0000000..1e1083c
--- /dev/null
+++ b/pages/coach/my/exam_results.vue
@@ -0,0 +1,47 @@
+
+
+
+ 答对{{success}},答错{{error}}
+
+
+ 总共得分{{num}}
+
+
+ 返回列表
+
+
+
+
+
+
+
diff --git a/pages/coach/my/gotake_exam.vue b/pages/coach/my/gotake_exam.vue
new file mode 100644
index 0000000..e675ceb
--- /dev/null
+++ b/pages/coach/my/gotake_exam.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+ {{index + 1}}
+ {{item.question_content}}?
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+ {{item_option.option}}. {{item_option.option_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 上一题
+ 下一题
+
+
+ 提交试卷
+
+
+
+
+
+
+
diff --git a/pages/coach/my/teaching_management.vue b/pages/coach/my/teaching_management.vue
index c93c413..7b1d912 100644
--- a/pages/coach/my/teaching_management.vue
+++ b/pages/coach/my/teaching_management.vue
@@ -2,15 +2,15 @@
-
-
+
+
{{item.title}}
{{getTableType(item.table_type)}}
{{item.create_time}}
- 去考试
+ 去考试
加载中...
@@ -104,7 +104,6 @@
return this.tableTypeName[text]
},
info(id) {
- console.log(id)
uni.navigateTo({
url: '/pages/coach/my/teaching_management_info?id=' + id
})
@@ -126,6 +125,11 @@
this.loading = false
}
})
+ },
+ goTake(id,zid) {
+ uni.navigateTo({
+ url: '/pages/coach/my/gotake_exam?id=' + id + '&zid=' + zid
+ })
}
}
}
From 57a54d14c8c8e5b8b27b82f4f9d5cfa51bdac9f7 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 29 May 2025 12:06:03 +0800
Subject: [PATCH 14/14] =?UTF-8?q?feat(im=5Fchat=5Finfo):=20=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=9B=BE=E7=89=87=E6=B6=88=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 新增 AQUplodeImage 组件用于上传图片
- 在聊天界面添加发送图片的功能
- 实现图片消息的展示和预览
-优化聊天界面布局和样式
---
components/AQ/AQUplodeImage.vue | 56 +++++++++
pages/common/im_chat_info.vue | 208 ++++++++++++++++++++++++++------
2 files changed, 228 insertions(+), 36 deletions(-)
create mode 100644 components/AQ/AQUplodeImage.vue
diff --git a/components/AQ/AQUplodeImage.vue b/components/AQ/AQUplodeImage.vue
new file mode 100644
index 0000000..7d67ef8
--- /dev/null
+++ b/components/AQ/AQUplodeImage.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
diff --git a/pages/common/im_chat_info.vue b/pages/common/im_chat_info.vue
index ae88c48..33c8918 100644
--- a/pages/common/im_chat_info.vue
+++ b/pages/common/im_chat_info.vue
@@ -15,16 +15,25 @@
{{v.created_at}}
-
- {{v.content}}
+
+
+ {{v.content}}
+
+
+
+
-
- {{v.content}}
+
+ {{v.content}}
+
+
+
+
@@ -36,27 +45,66 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 相册
+
+
+
+
+
+
+
+
@@ -369,13 +452,20 @@ export default {
word-wrap: break-word; /* 允许长单词或 URL 换行 */
word-break: break-all; /* 强制所有字符换行 */
.text_box{}
+ .img_box {
+ .chat_img {
+ width: 200rpx;
+ height: 200rpx;
+ border-radius: 16rpx;
+ }
+ }
}
.left_item{
- background-color: #f4f6f9;
+ //background-color: #f4f6f9;
color: #343434;
}
.right_item{
- background-color: #1684fc;
+ //background-color: #1684fc;
color: #fff;
}
}
@@ -390,12 +480,12 @@ export default {
position: fixed;
bottom: 0;
- padding: 50rpx 50rpx;
+ padding: 50rpx 30rpx;
display: flex;
justify-content:space-between;
align-items: center;
+ gap: 20rpx;
.left_box{
- width: 70%;
.input{
background-color: #f4f6f9;
height: 88rpx;
@@ -403,22 +493,28 @@ export default {
font-size: 28rpx;
border-radius: 32rpx;
- width: 532rpx;
+ width: 480rpx;
color: #292929;
font-size: 28rpx;
}
}
.right_box{
- border-radius: 50%;
- background-color: #a2cefe;
- width: 88rpx;
- height: 88rpx;
+ width: 100%;
display: flex;
- justify-content: center;
+ justify-content: space-between;
align-items: center;
- .send_img{
- width: 36rpx;
- height: 36rpx;
+ .img_box{
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 50%;
+ background-color: #a2cefe;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .send_img{
+ width: 36rpx;
+ height: 36rpx;
+ }
}
}
@@ -428,4 +524,44 @@ export default {
color: #999999;
padding-left: 30rpx;
}
+
+
+ /* 更多选项相关 自定义内容区样式需自行控制 */
+ .more_section{
+ .fui-scroll__wrap {
+ padding-top: 30rpx;
+ position: relative;
+ }
+ .fui-title {
+ font-size: 30rpx;
+ font-weight: bold;
+ text-align: center;
+ padding-bottom: 24rpx;
+ }
+ .fui-icon__close {
+ position: absolute;
+ top: 24rpx;
+ left: 24rpx;
+ }
+ .fui-scroll__view {
+ width: 100%;
+ height: 350rpx;
+ }
+
+ .ul{
+ padding: 10rpx 40rpx;
+ display: flex;
+ .li{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .icon_box{
+ }
+ .title{
+ font-size: 28rpx;
+ text-align: center;
+ }
+ }
+ }
+ }
\ No newline at end of file