From 971af0654beae97c5b80c76a271998d025de4da6 Mon Sep 17 00:00:00 2001
From: kola-web <l15567540858@gmail.com>
Date: Tue, 12 Nov 2024 14:10:04 +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

---
 src/components/customRecord/index.scss         |  2 ++
 src/components/customRecord/index.ts           |  1 +
 src/custom-tab-bar/index.scss                  | 49 +++++++++++++++-----------
 src/custom-tab-bar/index.wxml                  | 15 ++++----
 src/module1/pages/auditDoctorDetail/index.wxml |  2 +-
 src/module1/pages/chatRoom/index.scss          |  6 +++-
 src/module1/pages/chatRoom/index.ts            |  2 +-
 src/module1/pages/chatRoom/index.wxml          |  2 +-
 src/module1/pages/chatRoomInfo/index.scss      | 11 +++---
 src/module1/pages/entryCases/index.scss        |  9 ++---
 src/module1/pages/entryCases/index.wxml        |  2 +-
 src/module1/pages/setCaseDoctor/index.ts       |  3 +-
 src/pages/cases/index.wxml                     | 11 ++++--
 src/pages/chatRoomList/index.ts                | 11 +++++-
 src/pages/chatRoomList/index.wxml              |  2 +-
 15 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/src/components/customRecord/index.scss b/src/components/customRecord/index.scss
index 3e7cfb7..d5e5d4c 100644
--- a/src/components/customRecord/index.scss
+++ b/src/components/customRecord/index.scss
@@ -1,5 +1,7 @@
 .record {
   &.record-slot {
+    width: 100%;
+    height: 100%;
     border: none;
   }
   .icon {
diff --git a/src/components/customRecord/index.ts b/src/components/customRecord/index.ts
index d2e9923..5e83110 100644
--- a/src/components/customRecord/index.ts
+++ b/src/components/customRecord/index.ts
@@ -11,6 +11,7 @@ Component({
       value: false,
     },
   },
+  externalClasses: ["custom-record"],
 
   /**
    * 组件的初始数据
diff --git a/src/custom-tab-bar/index.scss b/src/custom-tab-bar/index.scss
index e3a1cab..67ca140 100644
--- a/src/custom-tab-bar/index.scss
+++ b/src/custom-tab-bar/index.scss
@@ -76,25 +76,30 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    .dot {
-      position: absolute;
-      top: 10rpx;
-      right: 40rpx;
-      width: 10rpx;
-      height: 10rpx;
-      border-radius: 50%;
-      background-color: red;
-    }
 
-    .icon {
-      display: block;
-      width: 48rpx;
-      height: 48rpx;
-    }
-    .icon-active {
-      display: none;
+    .icon-wrap {
+      position: relative;
       width: 48rpx;
       height: 48rpx;
+      .icon {
+        display: block;
+        width: 100%;
+        height: 100%;
+      }
+      .icon-active {
+        display: none;
+        width: 100%;
+        height: 100%;
+      }
+      .dot {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 10rpx;
+        height: 10rpx;
+        border-radius: 50%;
+        background-color: #ED4F39;
+      }
     }
     .name {
       margin-top: 8rpx;
@@ -103,11 +108,13 @@
       line-height: 21rpx;
     }
     &.active {
-      .icon {
-        display: none;
-      }
-      .icon-active {
-        display: block;
+      .icon-wrap {
+        .icon {
+          display: none;
+        }
+        .icon-active {
+          display: block;
+        }
       }
       .name {
         color: rgba(0, 180, 197, 1);
diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml
index 22cf4c8..b570491 100644
--- a/src/custom-tab-bar/index.wxml
+++ b/src/custom-tab-bar/index.wxml
@@ -1,11 +1,6 @@
 <view class="tabbar">
   <block wx:for="{{tabbar}}" wx:key="index">
-    <view
-      class="custom"
-      wx:if="{{item.custom && userInfo.DoctorLevel<3}}"
-      bind:tap="handleTab"
-      data-index="{{index}}"
-    >
+    <view class="custom" wx:if="{{item.custom && userInfo.DoctorLevel<3}}" bind:tap="handleTab" data-index="{{index}}">
       <image class="add" src="{{imageUrl}}tabbar/add.png?t={{Timestamp}}"></image>
       <view class="popup-tip" wx:if="{{showEntryCase}}">
         <view class="content">
@@ -27,9 +22,11 @@
       bind:tap="handleTab"
       data-index="{{index}}"
     >
-      <view class="dot" wx:if="{{notice && index===3}}"></view>
-      <image class="icon" src="{{imageUrl}}tabbar/{{item.icon}}?t={{Timestamp}}"></image>
-      <image class="icon-active" src="{{imageUrl}}tabbar/{{item.iconActive}}?t={{Timestamp}}"></image>
+      <view class="icon-wrap">
+        <view class="dot" wx:if="{{notice && index===3}}"></view>
+        <image class="icon" src="{{imageUrl}}tabbar/{{item.icon}}?t={{Timestamp}}"></image>
+        <image class="icon-active" src="{{imageUrl}}tabbar/{{item.iconActive}}?t={{Timestamp}}"></image>
+      </view>
       <view class="name">{{item.name}}</view>
     </view>
   </block>
diff --git a/src/module1/pages/auditDoctorDetail/index.wxml b/src/module1/pages/auditDoctorDetail/index.wxml
index b9ba307..29e548c 100644
--- a/src/module1/pages/auditDoctorDetail/index.wxml
+++ b/src/module1/pages/auditDoctorDetail/index.wxml
@@ -83,7 +83,7 @@
 <van-dialog
   custom-style="background:transparent"
   use-slot
-  width="324"
+  width="90vw"
   show="{{ showReject }}"
   showCancelButton
   confirm-button-color="rgba(0, 180, 197, 1)"
diff --git a/src/module1/pages/chatRoom/index.scss b/src/module1/pages/chatRoom/index.scss
index cb5bf6f..ac1c5f5 100644
--- a/src/module1/pages/chatRoom/index.scss
+++ b/src/module1/pages/chatRoom/index.scss
@@ -21,7 +21,7 @@ page {
       border: 2rpx solid #ffffff;
       display: flex;
       gap: 28rpx;
-      align-items: flex-start;
+      align-items: center;
       .photos {
         position: relative;
         padding: 4rpx;
@@ -306,6 +306,10 @@ page {
       gap: 12rpx;
       align-items: center;
       justify-content: space-between;
+      .custom-record{
+        width: 48rpx;
+        height: 48rpx;
+      }
       .icon {
         width: 48rpx;
         height: 48rpx;
diff --git a/src/module1/pages/chatRoom/index.ts b/src/module1/pages/chatRoom/index.ts
index 99a48ee..7b18303 100644
--- a/src/module1/pages/chatRoom/index.ts
+++ b/src/module1/pages/chatRoom/index.ts
@@ -118,7 +118,7 @@ Page({
     }).then((res) => {
       this.setData({
         roomDoctors: res.roomDoctors,
-        newRoomDoctors: res.roomDoctors.slice(0, 4),
+        newRoomDoctors: { ...res }.roomDoctors.slice(0, 4),
         case: res.case,
         chatGroupInfo: res.chatGroupInfo,
         chatDoctor: res.chatDoctor,
diff --git a/src/module1/pages/chatRoom/index.wxml b/src/module1/pages/chatRoom/index.wxml
index 2dc2171..3eeaf84 100644
--- a/src/module1/pages/chatRoom/index.wxml
+++ b/src/module1/pages/chatRoom/index.wxml
@@ -130,7 +130,7 @@
   </view>
   <view class="page-footer" wx:if="{{case.caseStatus!=='4'}}">
     <view class="header">
-      <customRecord bind:file="handleSendAudio" slotIcon>
+      <customRecord class="custom-record" bind:file="handleSendAudio" slotIcon>
         <image class="icon" src="{{imageUrl}}icon-voice.png?t={{Timestamp}}"></image>
       </customRecord>
       <input
diff --git a/src/module1/pages/chatRoomInfo/index.scss b/src/module1/pages/chatRoomInfo/index.scss
index 6f7ef5a..8c2ee86 100644
--- a/src/module1/pages/chatRoomInfo/index.scss
+++ b/src/module1/pages/chatRoomInfo/index.scss
@@ -7,24 +7,27 @@ page {
     padding: 32rpx;
     border-radius: 16rpx;
     background-color: #fff;
-    display: flex;
-    flex-wrap: wrap;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
     gap: 28rpx;
     .user {
-      width: 25%;
       flex-shrink: 0;
       .avatar {
+        margin: 0 auto;
         display: block;
         width: 102rpx;
         height: 102rpx;
       }
       .name {
-        margin-top: 14rpx;
+        margin: 14rpx auto 0;
         text-align: center;
         font-size: 24rpx;
         color: rgba(133, 133, 133, 1);
         line-height: 28rpx;
         max-width: 4em;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
       }
     }
     .add {
diff --git a/src/module1/pages/entryCases/index.scss b/src/module1/pages/entryCases/index.scss
index 45af102..199fc19 100644
--- a/src/module1/pages/entryCases/index.scss
+++ b/src/module1/pages/entryCases/index.scss
@@ -151,9 +151,10 @@ page {
       height: 198rpx;
       border-radius: 16rpx;
       background: linear-gradient(to bottom, #fff 0%, #fff 34%, #f6f6f6 34%, #f6f6f6 100%);
-      .record-btn {
+      .custom-record {
         display: flex;
         justify-content: center;
+        align-items: center;
       }
       .r-title {
         margin-top: 12rpx;
@@ -212,11 +213,11 @@ page {
             text-overflow: ellipsis;
             max-width: 13em;
           }
-          .preview{
+          .preview {
             font-size: 32rpx;
-            color: #01B4C5;
+            color: #01b4c5;
           }
-          .del{
+          .del {
             position: absolute;
             top: -16rpx;
             right: -16rpx;
diff --git a/src/module1/pages/entryCases/index.wxml b/src/module1/pages/entryCases/index.wxml
index c37ec70..9f6e9d9 100644
--- a/src/module1/pages/entryCases/index.wxml
+++ b/src/module1/pages/entryCases/index.wxml
@@ -54,7 +54,7 @@
       </view>
     </view>
     <view class="record">
-      <customRecord class="record-btn" bind:file="handleAudio"></customRecord>
+      <customRecord class="custom-record" bind:file="handleAudio"></customRecord>
       <view class="r-title">您也可以长按录入语音</view>
     </view>
   </view>
diff --git a/src/module1/pages/setCaseDoctor/index.ts b/src/module1/pages/setCaseDoctor/index.ts
index bcc589e..1d4c879 100644
--- a/src/module1/pages/setCaseDoctor/index.ts
+++ b/src/module1/pages/setCaseDoctor/index.ts
@@ -247,9 +247,10 @@ Page({
     const { feedBackInvite, caseId, DoctorId, params, detailInvite } = this.data;
     if (!DoctorId) {
       wx.showToast({
-        title: "请选择指派医生",
+        title: "请选择医生",
         icon: "none",
       });
+      return
     }
     if (feedBackInvite) {
       wx.ajax({
diff --git a/src/pages/cases/index.wxml b/src/pages/cases/index.wxml
index 780d3b8..ab4f1da 100644
--- a/src/pages/cases/index.wxml
+++ b/src/pages/cases/index.wxml
@@ -3,7 +3,12 @@
   <view class="header">
     <view class="navbar">
       <view class="nav {{nav==='0' && 'active'}}" bind:tap="handleNav" data-nav="0">我的病历</view>
-      <view wx:if="{{userInfo.DoctorLevel===3 && userInfo.IsSuper===1}}" class="nav {{nav==='3' && 'active'}}" bind:tap="handleNav" data-nav="3">
+      <view
+        wx:if="{{userInfo.DoctorLevel===3 && userInfo.IsSuper===1}}"
+        class="nav {{nav==='3' && 'active'}}"
+        bind:tap="handleNav"
+        data-nav="3"
+      >
         全部病历
         <van-icon name="question" size="12" catch:tap="handleQuestion" data-index="3" color="rgba(224, 224, 224, 1)" />
       </view>
@@ -179,7 +184,7 @@
     <view class="list-total" wx:if="{{pagination.count}}">共有{{pagination.count}}条病历</view>
     <view class="list-item" wx:for="{{list}}" bind:tap="handleDetail" wx:key="caseId" data-params="{{item}}">
       <image wx:if="{{item.isHighQuality==='1'}}" class="quality" src="{{imageUrl}}quality.png?t={{Timestamp}}"></image>
-      <image  class="quality" src="{{imageUrl}}quality.png?t={{Timestamp}}"></image>
+      <image class="quality" src="{{imageUrl}}quality.png?t={{Timestamp}}"></image>
       <view class="li-header">
         <view class="wrap">
           <view class="id">ID:{{item.caseNo}}</view>
@@ -363,7 +368,7 @@
   </view>
 </van-popup>
 
-<van-popup show="{{ showArea }}" round position="bottom">
+<van-popup show="{{ showArea }}" round position="bottom" z-index="100000">
   <van-cascader
     value="{{ cascaderValue }}"
     title="请选择所在地区"
diff --git a/src/pages/chatRoomList/index.ts b/src/pages/chatRoomList/index.ts
index f432ca1..b5e000d 100644
--- a/src/pages/chatRoomList/index.ts
+++ b/src/pages/chatRoomList/index.ts
@@ -12,7 +12,7 @@ Page({
     show4: false,
     show5: false,
     showArea: false,
-    fieldNames: { text: "label", value: "value", children: "children" },
+    fieldNames: { text: "label" },
 
     area: [],
     caseStatusList: {},
@@ -466,11 +466,20 @@ Page({
             data: {},
           }).then(() => {
             this.handleSearch();
+            this.getNotice();
           });
         }
       },
     });
   },
+  handleNoRead() {
+    wx.showModal({
+      title: "暂无未读消息",
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      showCancel: false,
+    });
+  },
 });
 
 export {};
diff --git a/src/pages/chatRoomList/index.wxml b/src/pages/chatRoomList/index.wxml
index f717ca5..e9b6ef4 100644
--- a/src/pages/chatRoomList/index.wxml
+++ b/src/pages/chatRoomList/index.wxml
@@ -124,7 +124,7 @@
       <view class="btn {{readStatus==='1' && 'active'}}" bind:tap="handleRead" data-value="1">已读</view>
     </view>
     <view class="all-read" wx:if="{{noReadCount>0}}" bind:tap="handleReadAll">全部标为已读</view>
-    <view class="all-read" wx:else>暂无未读消息</view>
+    <view class="all-read" wx:else bind:tap="handleNoRead">暂无未读消息</view>
   </view>
   <view class="room-list">
     <view class="card" wx:for="{{list}}" wx:key="msgId" bind:tap="handleRoom" data-params="{{item}}">