diff --git a/manifest.json b/manifest.json
index 36d7ad9..fb89421 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "ykt-wxapp",
- "appid" : "__UNI__06F5B0E",
+ "appid" : "__UNI__705E300",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@@ -54,7 +54,8 @@
"setting" : {
"urlCheck" : false
},
- "usingComponents" : true
+ "usingComponents" : true,
+ "lazyCodeLoading" : "requiredComponents"
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/pages.json b/pages.json
index c2a03ed..2b93809 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,7 @@
{
"pages": [
{
- "path": "pages/message/message",
+ "path": "pages/home/message-home",
"style": {
"navigationBarTitleText": "消息"
}
@@ -13,27 +13,15 @@
}
},
{
- "path": "pages/message/common-phrases",
+ "path": "pages/home/work-home",
"style": {
- "navigationBarTitleText": "常用语"
+ "navigationBarTitleText": "工作台"
}
},
{
- "path": "pages/message/article-list",
+ "path": "pages/home/case-home",
"style": {
- "navigationBarTitleText": "宣教文章"
- }
- },
- {
- "path": "pages/message/article-detail",
- "style": {
- "navigationBarTitleText": "宣教文章"
- }
- },
- {
- "path": "pages/message/survey-list",
- "style": {
- "navigationBarTitleText": "问卷列表"
+ "navigationBarTitleText": "病例"
}
},
{
@@ -42,127 +30,6 @@
"navigationBarTitleText": "预览"
}
},
- {
- "path": "pages/message/index",
- "style": {
- "navigationBarTitleText": "聊天",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/case/search",
- "style": {
- "navigationBarTitleText": "搜索患者"
- }
- },
- {
- "path": "pages/case/group-manage",
- "style": {
- "navigationBarTitleText": "分组管理"
- }
- },
- {
- "path": "pages/case/batch-transfer",
- "style": {
- "navigationBarTitleText": "转移客户给其他团队"
- }
- },
- {
- "path": "pages/case/batch-share",
- "style": {
- "navigationBarTitleText": "共享客户"
- }
- },
- {
- "path": "pages/case/patient-invite",
- "style": {
- "navigationBarTitleText": "邀请患者"
- }
- },
- {
- "path": "pages/case/patient-create",
- "style": {
- "navigationBarTitleText": "新增患者"
- }
- },
- {
- "path": "pages/case/patient-inner-info",
- "style": {
- "navigationBarTitleText": "内部信息"
- }
- },
- {
- "path": "pages/case/archive-detail",
- "style": {
- "navigationBarTitleText": "档案详情"
- }
- },
- {
- "path": "pages/case/archive-edit",
- "style": {
- "navigationBarTitleText": "档案编辑"
- }
- },
- {
- "path": "pages/case/visit-record-detail",
- "style": {
- "navigationBarTitleText": "健康档案"
- }
- },
- {
- "path": "pages/case/visit-record-view",
- "style": {
- "navigationBarTitleText": "病历详情"
- }
- },
- {
- "path": "pages/case/medical-case-form",
- "style": {
- "navigationBarTitleText": "添加病历"
- }
- },
- {
- "path": "pages/case/service-record-detail",
- "style": {
- "navigationBarTitleText": "服务记录"
- }
- },
- {
- "path": "pages/case/followup-detail",
- "style": {
- "navigationBarTitleText": "回访详情"
- }
- },
- {
- "path": "pages/case/new-followup",
- "style": {
- "navigationBarTitleText": "新增回访"
- }
- },
- {
- "path": "pages/case/new-followup-record",
- "style": {
- "navigationBarTitleText": "回访记录"
- }
- },
- {
- "path": "pages/case/plan-list",
- "style": {
- "navigationBarTitleText": "回访计划"
- }
- },
- {
- "path": "pages/case/plan-preview",
- "style": {
- "navigationBarTitleText": "回访计划详情"
- }
- },
- {
- "path": "pages/case/plan-execute",
- "style": {
- "navigationBarTitleText": "执行回访计划"
- }
- },
{
"path": "pages/library/diagnosis-list",
"style": {
@@ -181,83 +48,251 @@
"navigationBarTitleText": "阳性发现"
}
},
- {
- "path": "pages/work/work",
- "style": {
- "navigationBarTitleText": "工作台"
- }
- },
- {
- "path": "pages/case/case",
- "style": {
- "navigationBarTitleText": "病例"
- }
- },
- {
- "path": "pages/work/profile",
- "style": {
- "navigationBarTitleText": "完善个人信息"
- }
- },
- {
- "path": "pages/work/department-select",
- "style": {
- "navigationBarTitleText": "选择科室"
- }
- },
- {
- "path": "pages/work/verify/assistant",
- "style": {
- "navigationBarTitleText": "上传证照"
- }
- },
- {
- "path": "pages/work/verify/doctor",
- "style": {
- "navigationBarTitleText": "上传证照"
- }
- },
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "授权登录"
}
+ }
+ ],
+ "subPackages": [
+ {
+ "root": "pages/message",
+ "pages": [
+ {
+ "path": "message",
+ "style": {
+ "navigationBarTitleText": "消息"
+ }
+ },
+ {
+ "path": "common-phrases",
+ "style": {
+ "navigationBarTitleText": "常用语"
+ }
+ },
+ {
+ "path": "article-list",
+ "style": {
+ "navigationBarTitleText": "宣教文章"
+ }
+ },
+ {
+ "path": "article-detail",
+ "style": {
+ "navigationBarTitleText": "宣教文章"
+ }
+ },
+ {
+ "path": "survey-list",
+ "style": {
+ "navigationBarTitleText": "问卷列表"
+ }
+ },
+ {
+ "path": "index",
+ "style": {
+ "navigationBarTitleText": "聊天",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
},
{
- "path": "pages/work/team/invite/invite-patient",
- "style": {
- "navigationBarTitleText": "邀请患者"
- }
+ "root": "pages/work",
+ "pages": [
+ {
+ "path": "work",
+ "style": {
+ "navigationBarTitleText": "工作台"
+ }
+ },
+ {
+ "path": "profile",
+ "style": {
+ "navigationBarTitleText": "完善个人信息"
+ }
+ },
+ {
+ "path": "department-select",
+ "style": {
+ "navigationBarTitleText": "选择科室"
+ }
+ },
+ {
+ "path": "verify/assistant",
+ "style": {
+ "navigationBarTitleText": "上传证照"
+ }
+ },
+ {
+ "path": "verify/doctor",
+ "style": {
+ "navigationBarTitleText": "上传证照"
+ }
+ },
+ {
+ "path": "team/invite/invite-patient",
+ "style": {
+ "navigationBarTitleText": "邀请患者"
+ }
+ },
+ {
+ "path": "team/invite/invite-teammate",
+ "style": {
+ "navigationBarTitleText": "邀请成员"
+ }
+ },
+ {
+ "path": "team/list/team-list",
+ "style": {
+ "navigationBarTitleText": "我的团队"
+ }
+ },
+ {
+ "path": "team/edit/team-edit",
+ "style": {
+ "navigationBarTitleText": "修改团队信息"
+ }
+ },
+ {
+ "path": "team/detail/team-detail",
+ "style": {
+ "navigationBarTitleText": "团队信息"
+ }
+ },
+ {
+ "path": "service/contact-service",
+ "style": {
+ "navigationBarTitleText": "联系企微客服"
+ }
+ }
+ ]
},
{
- "path": "pages/work/team/invite/invite-teammate",
- "style": {
- "navigationBarTitleText": "邀请成员"
- }
- },
- {
- "path": "pages/work/team/list/team-list",
- "style": {
- "navigationBarTitleText": "我的团队"
- }
- },
- {
- "path": "pages/work/team/edit/team-edit",
- "style": {
- "navigationBarTitleText": "修改团队信息"
- }
- },
- {
- "path": "pages/work/team/detail/team-detail",
- "style": {
- "navigationBarTitleText": "团队信息"
- }
- },
- {
- "path": "pages/work/service/contact-service",
- "style": {
- "navigationBarTitleText": "联系企微客服"
- }
+ "root": "pages/case",
+ "pages": [
+ {
+ "path": "case",
+ "style": {
+ "navigationBarTitleText": "病例"
+ }
+ },
+ {
+ "path": "search",
+ "style": {
+ "navigationBarTitleText": "搜索患者"
+ }
+ },
+ {
+ "path": "group-manage",
+ "style": {
+ "navigationBarTitleText": "分组管理"
+ }
+ },
+ {
+ "path": "batch-transfer",
+ "style": {
+ "navigationBarTitleText": "转移客户给其他团队"
+ }
+ },
+ {
+ "path": "batch-share",
+ "style": {
+ "navigationBarTitleText": "共享客户"
+ }
+ },
+ {
+ "path": "patient-invite",
+ "style": {
+ "navigationBarTitleText": "邀请患者"
+ }
+ },
+ {
+ "path": "patient-create",
+ "style": {
+ "navigationBarTitleText": "新增患者"
+ }
+ },
+ {
+ "path": "patient-inner-info",
+ "style": {
+ "navigationBarTitleText": "内部信息"
+ }
+ },
+ {
+ "path": "archive-detail",
+ "style": {
+ "navigationBarTitleText": "档案详情"
+ }
+ },
+ {
+ "path": "archive-edit",
+ "style": {
+ "navigationBarTitleText": "档案编辑"
+ }
+ },
+ {
+ "path": "visit-record-detail",
+ "style": {
+ "navigationBarTitleText": "健康档案"
+ }
+ },
+ {
+ "path": "visit-record-view",
+ "style": {
+ "navigationBarTitleText": "病历详情"
+ }
+ },
+ {
+ "path": "medical-case-form",
+ "style": {
+ "navigationBarTitleText": "添加病历"
+ }
+ },
+ {
+ "path": "service-record-detail",
+ "style": {
+ "navigationBarTitleText": "服务记录"
+ }
+ },
+ {
+ "path": "followup-detail",
+ "style": {
+ "navigationBarTitleText": "回访详情"
+ }
+ },
+ {
+ "path": "new-followup",
+ "style": {
+ "navigationBarTitleText": "新增回访"
+ }
+ },
+ {
+ "path": "new-followup-record",
+ "style": {
+ "navigationBarTitleText": "回访记录"
+ }
+ },
+ {
+ "path": "plan-list",
+ "style": {
+ "navigationBarTitleText": "回访计划"
+ }
+ },
+ {
+ "path": "plan-preview",
+ "style": {
+ "navigationBarTitleText": "回访计划详情"
+ }
+ },
+ {
+ "path": "plan-execute",
+ "style": {
+ "navigationBarTitleText": "执行回访计划"
+ }
+ }
+ ]
}
],
"globalStyle": {
@@ -273,19 +308,19 @@
"borderStyle": "white",
"list": [
{
- "pagePath": "pages/message/message",
+ "pagePath": "pages/home/message-home",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home_selected.png",
"text": "消息"
},
{
- "pagePath": "pages/case/case",
+ "pagePath": "pages/home/case-home",
"iconPath": "static/tabbar/cart.png",
"selectedIconPath": "static/tabbar/cart_selected.png",
"text": "病例"
},
{
- "pagePath": "pages/work/work",
+ "pagePath": "pages/home/work-home",
"iconPath": "static/tabbar/center.png",
"selectedIconPath": "static/tabbar/center_selected.png",
"text": "工作台"
diff --git a/pages/home/case-home.vue b/pages/home/case-home.vue
new file mode 100644
index 0000000..49472f3
--- /dev/null
+++ b/pages/home/case-home.vue
@@ -0,0 +1,1115 @@
+
+
+
+
+
+
+
+
+
+
+ {{ tab.label }}
+
+
+
+ 共{{ totalPatients }}条
+
+
+
+
+
+
+
+ {{ group.letter }}
+
+
+
+
+
+
+
+
+
+
+ {{ patient.name }}
+ {{ patient.gender }}/{{ patient.age }}岁
+
+
+
+ {{ tag }}
+
+
+
+
+
+
+
+
+ {{ patient.createTime || '-' }} / {{ resolveCreatorName(patient) || '-' }}
+
+
+
+
+ {{ patient.record.type }} / {{ patient.record.date }} / {{ patient.record.diagnosis }}
+
+ 暂无病历记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/work/components/cert-popup.vue b/pages/home/components/cert-popup.vue
similarity index 100%
rename from pages/work/components/cert-popup.vue
rename to pages/home/components/cert-popup.vue
diff --git a/pages/work/components/filter-popup.vue b/pages/home/components/filter-popup.vue
similarity index 100%
rename from pages/work/components/filter-popup.vue
rename to pages/home/components/filter-popup.vue
diff --git a/pages/message/components/message-header.vue b/pages/home/components/message-header.vue
similarity index 100%
rename from pages/message/components/message-header.vue
rename to pages/home/components/message-header.vue
diff --git a/pages/home/message-home.vue b/pages/home/message-home.vue
new file mode 100644
index 0000000..654726d
--- /dev/null
+++ b/pages/home/message-home.vue
@@ -0,0 +1,696 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ conversation.unreadCount > 99 ? "99+" : conversation.unreadCount
+ }}
+
+
+
+
+
+
+ {{
+ conversation.lastMessage || "暂无消息"
+ }}
+
+
+
+
+
+
+
+ {{
+ activeTab === "processing" ? "暂无处理中的会话" : "暂无已结束的会话"
+ }}
+
+
+
+
+ {{
+ loadingMore ? "加载中..." : "上拉加载更多"
+ }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/home/work-home.vue b/pages/home/work-home.vue
new file mode 100644
index 0000000..2c8d760
--- /dev/null
+++ b/pages/home/work-home.vue
@@ -0,0 +1,384 @@
+
+
+
+
+
+ 待办列表
+
+
+ 个人
+
+
+ 团队
+
+
+
+
+
+ 共
+ {{ total }}
+ 条
+
+
+
+ {{ i.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 计划执行: {{ i.planDate }}
+
+ 患者: {{ i.customerName }}
+
+
+
+ {{ i.eventTypeLabel }}
+
+ {{ i.eventStatusLabel }}
+
+
+ {{ i.sendContent }}
+
+
+
+ 发送内容:{{ file.file.name }}
+
+
+ 发送
+
+
+ {{ i.executorUserName }}({{ i.executeTeamName }})
+
+
+ 创建:{{ i.createTime }} {{ i.creatorUserName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 654726d..6eb660b 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -80,7 +80,7 @@
import {
mergeConversationWithGroupDetails
} from "@/utils/conversation-merger.js";
- import MessageHeader from "./components/message-header.vue";
+ import MessageHeader from "../home/components/message-header.vue";
// 获取登录状态
const {
diff --git a/pages/work/work.vue b/pages/work/work.vue
index 2c8d760..6d28328 100644
--- a/pages/work/work.vue
+++ b/pages/work/work.vue
@@ -133,8 +133,8 @@ import useTeamStore from "@/store/team.js";
import api from '@/utils/api';
import { toast } from '@/utils/widget';
-import certPopup from "./components/cert-popup.vue";
-import filterPopup from './components/filter-popup.vue';
+import certPopup from "../home/components/cert-popup.vue";
+import filterPopup from '../home/components/filter-popup.vue';
import EmptyData from "@/components/empty-data.vue";
import fullPage from '@/components/full-page.vue';
import dayjs from 'dayjs';
diff --git a/routes/index.js b/routes/index.js
index 9f4a5bf..6979374 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -12,7 +12,7 @@ export default [
meta: { title: '登录', login: false },
},
{
- path: 'pages/message/message',
+ path: 'pages/home/message-home',
meta: { title: '消息', login: false }
},
{
@@ -46,7 +46,7 @@ export default [
style: { enablePullDownRefresh: false },
},
{
- path: 'pages/case/case',
+ path: 'pages/home/case-home',
meta: { title: '病例', login: false },
},
{
@@ -134,13 +134,9 @@ export default [
meta: { title: '阳性发现', login: false },
},
{
- path: 'pages/work/work',
+ path: 'pages/home/work-home',
meta: { title: '工作台' }
},
- {
- path: 'pages/case/case',
- meta: { title: '病例' }
- },
{
path: 'pages/work/profile',
meta: { title: '完善个人信息', login: true }
diff --git a/static/work/cardBack.png b/static/work/cardBack.png
deleted file mode 100644
index 337dd1f..0000000
Binary files a/static/work/cardBack.png and /dev/null differ
diff --git a/static/work/cardFront.png b/static/work/cardFront.png
deleted file mode 100644
index 30d923f..0000000
Binary files a/static/work/cardFront.png and /dev/null differ