diff --git a/App.vue b/App.vue index 973d67f..133cbaf 100644 --- a/App.vue +++ b/App.vue @@ -154,6 +154,26 @@ uni-button[type="primary"]:not([disabled]):active { background: rgb(248 113 113); } +.bg-light-text-color { + position: relative; +} + +.bg-light-text-color::after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + opacity: 0.2; + background: currentColor; +} + +.py-3 { + padding-top: 6rpx; + padding-bottom: 6rpx; +} + .py-5 { padding-top: 10rpx; padding-bottom: 10rpx; diff --git a/baseData/index.js b/baseData/index.js index 0b54e87..9d252b0 100644 --- a/baseData/index.js +++ b/baseData/index.js @@ -36,4 +36,4 @@ export const statusClassNames = { processing: "text-danger", cancelled: "text-gray", expired: "text-gray", -} \ No newline at end of file +} 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..038009f 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,239 @@ "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": "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": "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": "/todo/todo-detail", + "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": "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 +296,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/case/archive-detail.vue b/pages/case/archive-detail.vue index bba4aa0..f3d7761 100644 --- a/pages/case/archive-detail.vue +++ b/pages/case/archive-detail.vue @@ -222,9 +222,9 @@ import { onLoad, onPullDownRefresh, onReachBottom, onReady, onShow } from '@dclo import { storeToRefs } from 'pinia'; import dayjs from 'dayjs'; -import HealthProfileTab from '@/components/archive-detail/health-profile-tab.vue'; -import ServiceInfoTab from '@/components/archive-detail/service-info-tab.vue'; -import FollowUpManageTab from '@/components/archive-detail/follow-up-manage-tab.vue'; +import HealthProfileTab from './components/archive-detail/health-profile-tab.vue'; +import ServiceInfoTab from './components/archive-detail/service-info-tab.vue'; +import FollowUpManageTab from './components/archive-detail/follow-up-manage-tab.vue'; import api from '@/utils/api'; import useAccountStore from '@/store/account'; import { hideLoading, loading, toast } from '@/utils/widget'; diff --git a/pages/case/archive-edit.vue b/pages/case/archive-edit.vue index 1c8a96a..6018649 100644 --- a/pages/case/archive-edit.vue +++ b/pages/case/archive-edit.vue @@ -14,7 +14,7 @@ import { ref } from 'vue'; import { onLoad, onShow } from '@dcloudio/uni-app'; import { storeToRefs } from 'pinia'; -import CustomerProfileTab from '@/components/archive-detail/customer-profile-tab.vue'; +import CustomerProfileTab from './components/archive-detail/customer-profile-tab.vue'; import api from '@/utils/api'; import useAccountStore from '@/store/account'; import { hideLoading, loading, toast } from '@/utils/widget'; diff --git a/components/archive-detail/customer-profile-tab.vue b/pages/case/components/archive-detail/customer-profile-tab.vue similarity index 100% rename from components/archive-detail/customer-profile-tab.vue rename to pages/case/components/archive-detail/customer-profile-tab.vue diff --git a/components/archive-detail/follow-up-manage-tab.vue b/pages/case/components/archive-detail/follow-up-manage-tab.vue similarity index 100% rename from components/archive-detail/follow-up-manage-tab.vue rename to pages/case/components/archive-detail/follow-up-manage-tab.vue diff --git a/components/archive-detail/health-profile-tab.vue b/pages/case/components/archive-detail/health-profile-tab.vue similarity index 100% rename from components/archive-detail/health-profile-tab.vue rename to pages/case/components/archive-detail/health-profile-tab.vue diff --git a/components/archive-detail/service-info-tab.vue b/pages/case/components/archive-detail/service-info-tab.vue similarity index 100% rename from components/archive-detail/service-info-tab.vue rename to pages/case/components/archive-detail/service-info-tab.vue diff --git a/components/archive-detail/templates.js b/pages/case/components/archive-detail/templates.js similarity index 100% rename from components/archive-detail/templates.js rename to pages/case/components/archive-detail/templates.js diff --git a/components/manage-plan/node-list.vue b/pages/case/components/manage-plan/node-list.vue similarity index 100% rename from components/manage-plan/node-list.vue rename to pages/case/components/manage-plan/node-list.vue diff --git a/components/manage-plan/plan-node-item.vue b/pages/case/components/manage-plan/plan-node-item.vue similarity index 100% rename from components/manage-plan/plan-node-item.vue rename to pages/case/components/manage-plan/plan-node-item.vue diff --git a/components/manage-plan/plan-node-list.vue b/pages/case/components/manage-plan/plan-node-list.vue similarity index 100% rename from components/manage-plan/plan-node-list.vue rename to pages/case/components/manage-plan/plan-node-list.vue diff --git a/pages/case/plan-execute.vue b/pages/case/plan-execute.vue index fe695be..0eabbcd 100644 --- a/pages/case/plan-execute.vue +++ b/pages/case/plan-execute.vue @@ -76,7 +76,7 @@ import dayjs from 'dayjs'; import api from '@/utils/api'; import useAccountStore from '@/store/account'; import { toast } from '@/utils/widget'; -import planNodeList from '@/components/manage-plan/plan-node-list.vue'; +import planNodeList from './components/manage-plan/plan-node-list.vue'; const archiveId = ref(''); const plan = ref({}); diff --git a/pages/case/plan-preview.vue b/pages/case/plan-preview.vue index 70d113f..de8a052 100644 --- a/pages/case/plan-preview.vue +++ b/pages/case/plan-preview.vue @@ -23,7 +23,7 @@ + + 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 @@ + + + + + \ 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 @@ + + + + + \ 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/todo/todo-detail.vue b/pages/work/todo/todo-detail.vue new file mode 100644 index 0000000..d724fe2 --- /dev/null +++ b/pages/work/todo/todo-detail.vue @@ -0,0 +1,313 @@ +