From 25f0885e112f7c5f9f4e2a4ca0752813fb19cb68 Mon Sep 17 00:00:00 2001 From: kola-web Date: Wed, 13 Nov 2024 17:09:00 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.private.config.json | 6 ++--- src/components/customRecord/index.ts | 18 +++++++++----- src/echart/components/homeLevel1/index.ts | 11 +-------- src/echart/components/homeLevel2/index.ts | 4 +++ src/echart/components/homeLevel2/index.wxml | 2 +- src/echart/components/homeLevel3/index.ts | 4 +++ src/images/icon-close.png | Bin 733 -> 1233 bytes src/module1/pages/casesDetail/index.scss | 22 ++++++++++++++++- src/module1/pages/casesDetail/index.wxml | 2 ++ src/module1/pages/chatRoom/index.ts | 9 ++++--- src/module1/pages/entryCasesResult/index.wxml | 2 +- src/module1/pages/invite/index.scss | 2 +- src/module1/pages/loginProtool/index.scss | 2 +- src/module1/pages/org4/index.scss | 10 ++++---- src/module1/pages/org4/index.ts | 16 ++++++++---- src/module1/pages/org4/index.wxml | 2 +- src/module1/pages/setDoctor/index.wxml | 2 +- src/module1/pages/setInfo/index.ts | 5 ++++ src/pages/chatRoomList/index.wxml | 34 +++++++++++++------------- 19 files changed, 97 insertions(+), 56 deletions(-) diff --git a/project.private.config.json b/project.private.config.json index 55640ec..b6a6b04 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,9 +9,9 @@ "miniprogram": { "list": [ { - "name": "module1/pages/setCaseDoctor/index", - "pathName": "module1/pages/setChatDoctor/index", - "query": "", + "name": "module1/pages/chatRoom/index", + "pathName": "module1/pages/chatRoom/index", + "query": "id=5", "launchMode": "default", "scene": null }, diff --git a/src/components/customRecord/index.ts b/src/components/customRecord/index.ts index 5e83110..d7be014 100644 --- a/src/components/customRecord/index.ts +++ b/src/components/customRecord/index.ts @@ -48,14 +48,18 @@ Component({ this.setData({ show: true, }); - recorderManager?.start({ - format: "mp3", - sampleRate: 16000, - }); + if (this.data.startShow) { + recorderManager?.start({ + format: "mp3", + sampleRate: 16000, + }); + } }, handleHide() { - const { recorderManager } = this.data; - recorderManager?.stop(); + const { recorderManager, startShow } = this.data; + if (startShow) { + recorderManager?.stop(); + } this.setData({ startShow: false, show: false, @@ -95,6 +99,7 @@ Component({ scope: "scope.record", success() { // 用户已同意授权 + callback(); }, fail() { // 用户拒绝了授权 @@ -111,6 +116,7 @@ Component({ // 用户在设置页面设置了录音权限 if (res.authSetting["scope.record"]) { // 用户在设置页面设置了录音权限 + callback(); } else { // 用户在设置页面未设置录音权限 } diff --git a/src/echart/components/homeLevel1/index.ts b/src/echart/components/homeLevel1/index.ts index 3dacb38..31ef7f9 100644 --- a/src/echart/components/homeLevel1/index.ts +++ b/src/echart/components/homeLevel1/index.ts @@ -99,16 +99,7 @@ Component({ }, handleQuestion(e) { const { index } = e.currentTarget.dataset; - const message = { - 1: "属于您所在科室的公开的病历", - 2: "平台所有优质的病历", - }[index]; - wx.showModal({ - confirmColor: "#00B4C5", - showCancel: false, - confirmText: "知道了", - content: message, - }); + this.triggerEvent("question", index); }, }, }); diff --git a/src/echart/components/homeLevel2/index.ts b/src/echart/components/homeLevel2/index.ts index 2869bda..ad7aadf 100644 --- a/src/echart/components/homeLevel2/index.ts +++ b/src/echart/components/homeLevel2/index.ts @@ -143,6 +143,10 @@ Component({ url: "/module1/pages/auditDoctorList/index", }); }, + handleQuestion(e) { + const { index } = e.currentTarget.dataset; + this.triggerEvent("question", index); + }, }, }); diff --git a/src/echart/components/homeLevel2/index.wxml b/src/echart/components/homeLevel2/index.wxml index 468dc60..64e7a02 100644 --- a/src/echart/components/homeLevel2/index.wxml +++ b/src/echart/components/homeLevel2/index.wxml @@ -194,7 +194,7 @@ {{item.DepartmentName}} - 蒋亮医生指派 + {{item.Level3DoctorName}}医生指派 {{item.HospitalName}} diff --git a/src/echart/components/homeLevel3/index.ts b/src/echart/components/homeLevel3/index.ts index 27f4838..8a3461c 100644 --- a/src/echart/components/homeLevel3/index.ts +++ b/src/echart/components/homeLevel3/index.ts @@ -102,6 +102,10 @@ Component({ url: "/module1/pages/auditDoctorList/index", }); }, + handleQuestion(e) { + const { index } = e.currentTarget.dataset; + this.triggerEvent("question", index); + }, }, }); diff --git a/src/images/icon-close.png b/src/images/icon-close.png index ab741d66bf45c05f35ec3f6dceaea717ad1baaf6..7f20d7135f4a9204b03a2bdff52b8bebb9ada515 100644 GIT binary patch literal 1233 zcmV;?1TOoDP)Px(i%CR5R9HvNm|sXNRUF69@64Iq+1YJH7PFwuKj=diR4?sgR3Jew5riq?)rT&5 z{Zrv3Na~>*M0j6RM7^k(6g^1wltmEPW4&F1`*16$Yl^5WZtk3&U7eX<{HC2j_pZ)( z?;0IAxH@}&=QF?G_xC%$Be4I;fP3XI4C5go#M8EIrvV^|h%o>#9mm-MfZugpzX-3h zUXDhit`2H7EX#7e0|3v(VzD1RyLat?h>Dc*WAa3;A-qk?FeS^fo=hf_x9RV9ffNb_ z%8J#Cf~bJmlu~vyG&JN-fKYAVoc|GtM6_CHA}E}tQi)lXHJwN#-aG+PC={+!NFtF) zkd2x=r+QN?7D>QQ_#pXw{y{}ib~H_^sW^j(Nw}6}eddEmDc=)9d>FONFAwzs!gV`C$u)IV#Ky;3?3aw{5*b_8jIAf~3KT(9-@^|9vW<`er+MV+0UW!Y?& zB@ziXHZ~UI6h>NcK}^$ZLc~8~u~^`ugM$M$IXUT`Cp7x|`&m;{llz$i923R_sb^!^LMtyxf8yXr4Rgo!_ zE{K%!vJm1%7=3u4J3BjUetzEPrk9`$pix&>$3{j*LP2<*bU_M*!c|34uAc{l*6r@@ zvbnjr6HX)nkB*LphM>h1X3rz<3n8wZ7laH6ppU0F1EP1_^+D*SWiz6Yinx@W6sSs zPb1F&z|Uc_=6Ic`6z0~}7F$|c@?pBWyIFgCdmxOTzU%AjB9qDFHBHlkdXLS`O?R`? zQk0%AFE6`qN!53Jd^}LNZhzw8N-4ioRrQsil1z)Hr>7Z(ad2?3>Lwc-8*F7|g>`mz zvP>ou=n+bLAH*<>7ZpYMHcWT|Ei>je%|XWn*(vw4w|x*qjGCtTo2sg5YLfq}LFbHZ z+gB?4k!}F^yjETbdYQ5}e$_PX@e?43D2m16cbxO*&s*GrHm&xYwBb0;OYwO8n`%Al zBLHwq2$8(V5K%}R$C=c1{cVD*dQUJ6<0;PhPpYa$F9N2li?4KDf6coepL$`T)_`-q zR!bPFx`&5{)EchFS7PHyxVmh5RPm91mZ=gO5$*5ip00000NkvXXu0mjfkF-KZ literal 733 zcmV<30wVp1P)Px%mq|oHRA@u(SwD-^Kooy3v2fuEOUo0_!o?!VSe%uD&3*to3l9|h01BR!XXOd{ z2`p4lu(7wWI4cj1nTa54bHdvB0S@+xzdDA;d)@x`l{m7Xe5_qclz5F5=^A`wsyj!~+1>1%NXRgYQZyA2;+} z*lmhH6h%=Oh6fJda{yaX%B3hVMIfvGiwwm+Gk>xz2_oJA0P``|F%b>4)?aM>o7zng zNRs3UBJP-A%)FzNdTJZE-|w&WdcCgza3%BkO+=eo>tD7pn%K2Qz$A~NXgv%=L*je} z=KFX&zBU{VkD7q9@oANSNf^iR^&kk$*2|w@d(6C705d_v4^qmXWq_HAcbWNIaSaiV zi0HG{`ditjbpj@V5aJF1yqQ-)WXw$_dq$R z5aO9hI13CjkCajuX861UfO{2NXTr>vl~RYfO(zQE!Hp8kyj}t{A)@zbnvUjdq5I6d zR@y=X0N6CY5z)5R`uS1_*xZCRHdQ;LQw40m+1PjjHdX4<#w*Zeb!}p|ra+P;w*g?o zCTW{C#e-t`jAs25s(ZV(3Aid&V*;l7i1=<SEW1@be_j5llNoLbpJoujNs z(ArJBDiWT+sw$u7^$K_e94p|rkYfRz-Ms?NC3Fnn6>uz|v%6QoxrB}Z{vQS6IDQla zff+BE`M~~3JI{K+;aKE4_W>gQZ7l-8!(xNC{Eut{5r4EWVyXkwblvn-uNK?vT@3k} zf~)hZZ?ESOvSHuNa+kO+Ls#p}e2j=6i*5Bhm!H&kRdw6AUIE)mb!GPlwJCZ}7BT*F P00000NkvXXu0mjfRrgDs diff --git a/src/module1/pages/casesDetail/index.scss b/src/module1/pages/casesDetail/index.scss index a2062ef..91c4515 100644 --- a/src/module1/pages/casesDetail/index.scss +++ b/src/module1/pages/casesDetail/index.scss @@ -307,13 +307,23 @@ page { display: flex; align-items: center; .icon { + flex-shrink: 0; width: 56rpx; height: 56rpx; } .name { + flex: 1; margin-left: 30rpx; font-size: 32rpx; color: rgba(128, 128, 128, 1); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 13em; + } + .preview { + font-size: 32rpx; + color: #01b4c5; } } } @@ -327,7 +337,7 @@ page { position: relative; border-radius: 16rpx 16rpx 16rpx 16rpx; border: 2rpx solid #ffffff; - background:#fffdfd linear-gradient(to bottom, #e5f5f7 0%, #ffffff 100%) no-repeat top center/100% 200rpx; + background: #fffdfd linear-gradient(to bottom, #e5f5f7 0%, #ffffff 100%) no-repeat top center/100% 200rpx; .li-options { margin-bottom: -32rpx; display: flex; @@ -616,13 +626,23 @@ page { display: flex; align-items: center; .icon { + flex-shrink: 0; width: 56rpx; height: 56rpx; } .name { + flex: 1; margin-left: 30rpx; font-size: 32rpx; color: rgba(128, 128, 128, 1); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 13em; + } + .preview { + font-size: 32rpx; + color: #01b4c5; } } } diff --git a/src/module1/pages/casesDetail/index.wxml b/src/module1/pages/casesDetail/index.wxml index 718abbc..c4af3c1 100644 --- a/src/module1/pages/casesDetail/index.wxml +++ b/src/module1/pages/casesDetail/index.wxml @@ -90,6 +90,7 @@ {{item.name}} + 预览 @@ -194,6 +195,7 @@ {{cItem.name}} + 预览 diff --git a/src/module1/pages/chatRoom/index.ts b/src/module1/pages/chatRoom/index.ts index 4ec574b..de47876 100644 --- a/src/module1/pages/chatRoom/index.ts +++ b/src/module1/pages/chatRoom/index.ts @@ -48,7 +48,7 @@ Page({ sendMessage: "", videoUrl: "", - protocol: `

罕心守护平台向用户提供了“聊天室”功能，基于此服务，我们在此特别声明：

罕心守护平台非常重视您的个人信息保护及平台信息的隐私性，您同意在聊天室功能使用时遵守以下规则：

1.严禁在聊天室内讨论或分享任何患者的个人身份信息，包括但不限于姓名、性别等。群内发送的任何素材内容，必须去除所有可能识别患者身份的敏感信息；

2.不以截图、录音或以任何形式将内容传播；

3.讨论内容仅限于专业交流，不得用于任何商业目的。

4.保持讨论的专业性和尊重性，避免使用侮辱性或攻击性语言。


`, + protocol: `

罕心守护平台向用户提供了“聊天室”功能，基于此服务，我们在此特别声明：

罕心守护平台非常重视您的个人信息保护及平台信息的隐私性，您同意在聊天室功能使用时遵守以下规则：

1.严禁在聊天室内讨论或分享任何患者的个人身份信息，包括但不限于姓名、性别等。群内发送的任何素材内容，必须去除所有可能识别患者身份的敏感信息；

2.不以截图、录音或以任何形式将内容传播；

3.讨论内容仅限于专业交流，不得用于任何商业目的;

4.保持讨论的专业性和尊重性，避免使用侮辱性或攻击性语言。


`, }, innerAudioContext: null as WechatMiniprogram.InnerAudioContext | null, videoContext: null as WechatMiniprogram.VideoContext | null, @@ -124,7 +124,7 @@ Page({ chatDoctor: res.chatDoctor, }); wx.setNavigationBarTitle({ - title: `聊天室(${res.roomDoctors.length})`, + title: `聊天室(${res.roomDoctorCount})`, }); this.WebIMLogin(); @@ -178,7 +178,10 @@ Page({ isLoad: false, }); this.filterCreateTime(); - this.handleView(); + + if (!lastMsgId) { + this.handleView(); + } }); }, scrolltoupper(e) { diff --git a/src/module1/pages/entryCasesResult/index.wxml b/src/module1/pages/entryCasesResult/index.wxml index 683a45b..869d316 100644 --- a/src/module1/pages/entryCasesResult/index.wxml +++ b/src/module1/pages/entryCasesResult/index.wxml @@ -5,5 +5,5 @@ 查看病历详情 返回病历列表 - 关注公众号接收病历反馈消息 + 关注公众号接收病历反馈消息 diff --git a/src/module1/pages/invite/index.scss b/src/module1/pages/invite/index.scss index 81f638d..494dd72 100644 --- a/src/module1/pages/invite/index.scss +++ b/src/module1/pages/invite/index.scss @@ -16,7 +16,7 @@ padding: 12rpx; border-radius: 48rpx 48rpx 48rpx 48rpx; border: 2rpx solid #ffffff; - background: linear-gradient(180deg, #ffffff 0%, #e7fbff 100%); + background-color: #fff; .container { padding: 96rpx 30rpx 58rpx; position: relative; diff --git a/src/module1/pages/loginProtool/index.scss b/src/module1/pages/loginProtool/index.scss index 9f9736e..4e95229 100644 --- a/src/module1/pages/loginProtool/index.scss +++ b/src/module1/pages/loginProtool/index.scss @@ -7,7 +7,7 @@ height: 100vh; box-sizing: border-box; .title { - margin-top: 204rpx; + margin-top: 264rpx; flex-shrink: 0; width: 464rpx; height: 44rpx; diff --git a/src/module1/pages/org4/index.scss b/src/module1/pages/org4/index.scss index 41cee07..e13b85c 100644 --- a/src/module1/pages/org4/index.scss +++ b/src/module1/pages/org4/index.scss @@ -210,9 +210,9 @@ page { overflow: hidden; .level-three { &.active { - background: #f7feff; + background: #E9F7F9; .doctor { - background: #f7feff; + background: #E9F7F9; } } .doctor { @@ -238,7 +238,7 @@ page { .level-two { display: flex; &.active { - background-color: #f7feff; + background-color: #E9F7F9; } .aside { padding-left: 60rpx; @@ -284,7 +284,7 @@ page { .level-one { display: flex; &.active { - background-color: #f7feff; + background-color: #E9F7F9; } .aside { margin-left: 60rpx; @@ -319,7 +319,7 @@ page { .level-one-only { display: flex; &.active { - background-color: #f7feff; + background-color: #E9F7F9; } .aside { padding-left: 60rpx; diff --git a/src/module1/pages/org4/index.ts b/src/module1/pages/org4/index.ts index 094fd2c..cf5d4ab 100644 --- a/src/module1/pages/org4/index.ts +++ b/src/module1/pages/org4/index.ts @@ -12,6 +12,8 @@ Page({ search: "", userInfo: {} as any, + + allFold: false, }, onLoad() { app.waitLogin().then(() => { @@ -113,15 +115,19 @@ Page({ }); }, handleFoldAll() { - const { tree } = this.data; - this.toggleFoldAll(tree); + const { tree, allFold } = this.data; + const newTree = this.toggleFoldAll(tree, !allFold); + this.setData({ + allFold: !allFold, + tree: newTree, + }); }, - toggleFoldAll(tree) { + toggleFoldAll(tree, fold) { return tree.map((item) => { if (item.Children?.length) { - this.toggleFoldAll(item.Children); + this.toggleFoldAll(item.Children, fold); } - item.fold = !item.fold; + item.fold = fold; return item; }); }, diff --git a/src/module1/pages/org4/index.wxml b/src/module1/pages/org4/index.wxml index e9ebb95..1043729 100644 --- a/src/module1/pages/org4/index.wxml +++ b/src/module1/pages/org4/index.wxml @@ -35,7 +35,7 @@ model:value="{{search}}" class="input" placeholder-class="place-input" - placeholder="搜索医院名称" + placeholder="搜索医生名称" confirm-type="search" bindconfirm="handleSearch" /> diff --git a/src/module1/pages/setDoctor/index.wxml b/src/module1/pages/setDoctor/index.wxml index add4f50..fd578cd 100644 --- a/src/module1/pages/setDoctor/index.wxml +++ b/src/module1/pages/setDoctor/index.wxml @@ -113,7 +113,7 @@ 确定审核通过？ - 审核通过后，当前医生将成为您的邀约医生，他上传的病历将可以指定您一起讨论病历 + 审核通过后，指派的核心医生将成为该一级医生的邀约医生，一级医生可邀约核心医生讨论病历 diff --git a/src/module1/pages/setInfo/index.ts b/src/module1/pages/setInfo/index.ts index cb66d4f..69d946e 100644 --- a/src/module1/pages/setInfo/index.ts +++ b/src/module1/pages/setInfo/index.ts @@ -219,6 +219,11 @@ Page({ url: "/module1/pages/cHostipal/index", }); }, + handleScan() { + wx.scanCode({ + success() {}, + }); + }, }); export {}; diff --git a/src/pages/chatRoomList/index.wxml b/src/pages/chatRoomList/index.wxml index 09e67f3..0259253 100644 --- a/src/pages/chatRoomList/index.wxml +++ b/src/pages/chatRoomList/index.wxml @@ -39,26 +39,26 @@ - {{createRoomTimeBegin || '开始'}} + {{createCaseTimeBegin || '开始'}} - - {{createRoomTimeEnd || '结束'}} + {{createCaseTimeEnd || '结束'}} @@ -72,26 +72,26 @@ - {{createCaseTimeBegin || '开始'}} + {{createRoomTimeBegin || '开始'}} - - {{createCaseTimeEnd || '结束'}} + {{createRoomTimeEnd || '结束'}} @@ -134,7 +134,7 @@ 已读 全部标为已读 - 暂无未读消息 + 全部标为已读