From 904b1aa83abfdf2aa54a978fbc8ced8159665fdd Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 29 May 2025 14:46:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?style(im=5Fchat=5Finfo):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整了消息列表中左右消息框的样式 - 统一了消息类型为文本时的背景颜色- 优化了代码结构，提高了可读性 --- pages/common/im_chat_info.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pages/common/im_chat_info.vue b/pages/common/im_chat_info.vue index 33c8918..12d034b 100644 --- a/pages/common/im_chat_info.vue +++ b/pages/common/im_chat_info.vue @@ -15,7 +15,7 @@ {{v.created_at}} - + {{v.content}} @@ -28,7 +28,7 @@ - + {{v.content}} @@ -40,6 +40,7 @@ + From 34b2f2ddd484e6825bce9dc8bb5246addafb0b4e Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 29 May 2025 15:47:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?style(common):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E5=92=8C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -调整聊天列表高度，从80vh 改为 78vh - 修改页面上下内边距，从 32rpx 和 150rpx 改为 120rpx - 调整底部输入框区域样式，将左右内边距统一设置为 30rpx，底部内边距设置为 50rpx --- pages/common/im_chat_info.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/common/im_chat_info.vue b/pages/common/im_chat_info.vue index 12d034b..c302319 100644 --- a/pages/common/im_chat_info.vue +++ b/pages/common/im_chat_info.vue @@ -8,7 +8,7 @@ scroll-y="true" :scroll-top="scrollTop" :lower-threshold="lowerThreshold" - style="height: 80vh;" + style="height: 78vh;" > @@ -417,8 +417,8 @@ export default { min-height: 100vh; background: #292929 100%; padding: 0 0rpx; - padding-top: 32rpx; - padding-bottom: 150rpx; + padding-top: 120rpx; + padding-bottom: 120rpx; font-size: 28rpx; display: flex; flex-direction: column; @@ -481,7 +481,8 @@ export default { position: fixed; bottom: 0; - padding: 50rpx 30rpx; + padding: 30rpx; + padding-bottom: 50rpx; display: flex; justify-content:space-between; align-items: center; From b62967248e7aa0e4565c120399d256776b1d7bf5 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 29 May 2025 16:10:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix(coach):=20=E4=BF=AE=E5=A4=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=9A=82=E6=97=A0=E6=9B=B4=E5=A4=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=20-=20=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E6=9A=82=E6=97=A0=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8F=90=E9=AB=98?= =?UTF-8?q?=E4=BA=86=E4=BB=A3=E7=A0=81=E7=9A=84=E5=87=86=E7=A1=AE=E6=80=A7?= =?UTF-8?q?=E5=92=8C=E5=8F=AF=E9=9D=A0=E6=80=A7=20-=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BA=86=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E7=9A=84=E5=86=99?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BA=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E5=8F=AF=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coach/class/info.vue | 2 +- pages/coach/class/list.vue | 2 +- pages/coach/course/list.vue | 2 +- pages/coach/job/list.vue | 2 +- pages/coach/my/arrival_statistics.vue | 2 +- pages/coach/my/my_attendance.vue | 2 +- pages/coach/student/info.vue | 2 +- pages/common/my_attendance.vue | 2 +- pages/common/sys_msg_list.vue | 2 +- pages/market/clue/edit_clues_log.vue | 2 +- pages/market/my/signed_client_list.vue | 2 +- pages/student/index/job_list.vue | 2 +- pages/student/index/physical_examination.vue | 2 +- pages/student/my/lesson_consumption.vue | 2 +- pages/student/timetable/index.vue | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pages/coach/class/info.vue b/pages/coach/class/info.vue index 5b4bdb8..b98df59 100644 --- a/pages/coach/class/info.vue +++ b/pages/coach/class/info.vue @@ -276,7 +276,7 @@ export default { } //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/class/list.vue b/pages/coach/class/list.vue index 2a5a6fb..bad9243 100644 --- a/pages/coach/class/list.vue +++ b/pages/coach/class/list.vue @@ -116,7 +116,7 @@ export default { console.log(111,(this.filteredData.page * this.filteredData.limit) ,(this.filteredData.total)) //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/course/list.vue b/pages/coach/course/list.vue index 4c61483..9e76d06 100644 --- a/pages/coach/course/list.vue +++ b/pages/coach/course/list.vue @@ -328,7 +328,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/job/list.vue b/pages/coach/job/list.vue index dfd5d73..8f31169 100644 --- a/pages/coach/job/list.vue +++ b/pages/coach/job/list.vue @@ -96,7 +96,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/my/arrival_statistics.vue b/pages/coach/my/arrival_statistics.vue index a582a8c..9c903f1 100644 --- a/pages/coach/my/arrival_statistics.vue +++ b/pages/coach/my/arrival_statistics.vue @@ -114,7 +114,7 @@ export default { } //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/my/my_attendance.vue b/pages/coach/my/my_attendance.vue index 84511c4..b892593 100644 --- a/pages/coach/my/my_attendance.vue +++ b/pages/coach/my/my_attendance.vue @@ -355,7 +355,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/student/info.vue b/pages/coach/student/info.vue index c2171bd..904152f 100644 --- a/pages/coach/student/info.vue +++ b/pages/coach/student/info.vue @@ -239,7 +239,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue index 8e79839..7b36c0e 100644 --- a/pages/common/my_attendance.vue +++ b/pages/common/my_attendance.vue @@ -469,7 +469,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/common/sys_msg_list.vue b/pages/common/sys_msg_list.vue index 10e61ad..8e24630 100644 --- a/pages/common/sys_msg_list.vue +++ b/pages/common/sys_msg_list.vue @@ -98,7 +98,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/market/clue/edit_clues_log.vue b/pages/market/clue/edit_clues_log.vue index 0dc0d53..76f1f00 100644 --- a/pages/market/clue/edit_clues_log.vue +++ b/pages/market/clue/edit_clues_log.vue @@ -227,7 +227,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/market/my/signed_client_list.vue b/pages/market/my/signed_client_list.vue index e98dca9..5972794 100644 --- a/pages/market/my/signed_client_list.vue +++ b/pages/market/my/signed_client_list.vue @@ -113,7 +113,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/index/job_list.vue b/pages/student/index/job_list.vue index 86b52f9..08b9009 100644 --- a/pages/student/index/job_list.vue +++ b/pages/student/index/job_list.vue @@ -104,7 +104,7 @@ import memberApi from '@/api/member.js'; let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/index/physical_examination.vue b/pages/student/index/physical_examination.vue index ed96bc3..2dfd81c 100644 --- a/pages/student/index/physical_examination.vue +++ b/pages/student/index/physical_examination.vue @@ -102,7 +102,7 @@ import memberApi from '@/api/member.js'; let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/my/lesson_consumption.vue b/pages/student/my/lesson_consumption.vue index 6fc2ea2..6dca018 100644 --- a/pages/student/my/lesson_consumption.vue +++ b/pages/student/my/lesson_consumption.vue @@ -92,7 +92,7 @@ import memberApi from '@/api/member.js'; let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/timetable/index.vue b/pages/student/timetable/index.vue index 12cd2ca..a01020a 100644 --- a/pages/student/timetable/index.vue +++ b/pages/student/timetable/index.vue @@ -232,7 +232,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', From 3fee42de3c4d24931f5d595845571ea882c08514 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 29 May 2025 16:18:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(market):=20=E9=99=90=E5=88=B6=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E6=89=8D=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=90=AF=20IM=20=E5=AF=B9=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在客户列表中，只有当客户是 member 表中的注册用户时，才显示消息图标 -通过添加 v-if 指令来控制消息图标的显示，提高了用户体验 --- pages/market/clue/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue index 162e1b8..2f25661 100644 --- a/pages/market/clue/index.vue +++ b/pages/market/clue/index.vue @@ -59,8 +59,9 @@ + - + From 6080ada235062bd1b21ef9792784e764ae4d9445 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 29 May 2025 17:50:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat(market):=20=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E8=AE=BF=E5=92=8C=E4=BA=8C=E8=AE=BF=E6=83=85=E5=86=B5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在编辑线索页面的六要素信息中添加了一访情况和二访情况字段 - 新增了 first_visit_status 和 second_visit_status 字段用于记录一访和二访情况 - 调整了表单布局，将客户初步意向度和客户状态字段移至六要素信息上方 - 修改了日期选择器的类型，从 type="5"改为 type="3" --- pages/market/clue/edit_clues.vue | 137 +++++++++++++++++++++---------- 1 file changed, 94 insertions(+), 43 deletions(-) diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue index 663475b..54a399a 100644 --- a/pages/market/clue/edit_clues.vue +++ b/pages/market/clue/edit_clues.vue @@ -233,44 +233,7 @@ > - - - - - {{ (formData.initial_intent) ? picker_config.initial_intent.text : '点击选择' }} - - - - - - - - {{ (formData.status) ? picker_config.status.text : '点击选择' }} - - - + @@ -287,6 +250,44 @@ 六要素信息 + + + + + {{ (formData.initial_intent) ? picker_config.initial_intent.text : '点击选择' }} + + + + + + + + {{ (formData.status) ? picker_config.status.text : '点击选择' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -416,7 +462,7 @@ - + Date: Thu, 29 May 2025 18:14:09 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix(market):=20=E4=BF=AE=E6=94=B9=E7=BA=BF?= =?UTF-8?q?=E7=B4=A2=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E9=80=89=E6=8B=A9=E5=99=A8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -将日期选择器类型从 5 改为 3，以适应特定的日期格式需求 -移除了跟进时间后的 ':00' 后缀，简化了时间处理逻辑 --- pages/market/clue/add_clues.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/market/clue/add_clues.vue b/pages/market/clue/add_clues.vue index 7eeb4e4..fd32e7e 100644 --- a/pages/market/clue/add_clues.vue +++ b/pages/market/clue/add_clues.vue @@ -416,7 +416,7 @@ - +