From a631fb5a538cfd6d037e9845f07c83bfaf8c6457 Mon Sep 17 00:00:00 2001
From: kola-web <l15567540858@gmail.com>
Date: Mon, 11 Nov 2024 16:32:33 +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/custom-tab-bar/index.scss                  | 12 +++++++++++-
 src/custom-tab-bar/index.ts                    |  1 +
 src/custom-tab-bar/index.wxml                  |  8 +++++++-
 src/echart/components/homeLevel1/index.wxml    |  2 +-
 src/echart/components/homeLevel2/index.scss    | 11 +++++++++++
 src/echart/components/homeLevel2/index.ts      |  2 +-
 src/echart/components/homeLevel2/index.wxml    |  1 +
 src/module1/pages/auditDoctorDetail/index.scss |  1 -
 src/module1/pages/auditDoctorDetail/index.wxml |  1 +
 src/module1/pages/casesFeedback/index.wxml     |  2 +-
 src/module1/pages/chatRoom/index.scss          | 12 ++++++++++++
 src/module1/pages/chatRoom/index.ts            | 13 ++++++++++++-
 src/module1/pages/chatRoom/index.wxml          |  8 +++++++-
 src/module1/pages/setCaseDoctor/index.ts       |  2 +-
 src/module1/pages/setChatDoctor/index.ts       |  2 +-
 src/pages/cases/index.ts                       | 14 +++++++++++++-
 src/pages/chatRoomList/index.ts                | 15 +++++++++++++++
 src/pages/chatRoomList/index.wxml              |  3 ++-
 src/pages/home/index.ts                        | 12 ++++++++++++
 src/pages/my/index.ts                          | 12 ++++++++++++
 20 files changed, 122 insertions(+), 12 deletions(-)

diff --git a/src/custom-tab-bar/index.scss b/src/custom-tab-bar/index.scss
index 5a260a9..e3a1cab 100644
--- a/src/custom-tab-bar/index.scss
+++ b/src/custom-tab-bar/index.scss
@@ -56,7 +56,7 @@
       }
       &::after {
         position: absolute;
-        content: '';
+        content: "";
         bottom: -10rpx;
         left: 50%;
         transform: translateX(-50%);
@@ -69,12 +69,22 @@
     }
   }
   .tab-item {
+    position: relative;
     padding-top: 10rpx;
     flex: 1;
     display: flex;
     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;
diff --git a/src/custom-tab-bar/index.ts b/src/custom-tab-bar/index.ts
index 6eaf327..c1ff084 100644
--- a/src/custom-tab-bar/index.ts
+++ b/src/custom-tab-bar/index.ts
@@ -13,6 +13,7 @@ Component({
   data: {
     showEntryCase: false,
     active: 0,
+    notice: false,
     tabbar: [
       {
         path: "/pages/home/index",
diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml
index 856e348..22cf4c8 100644
--- a/src/custom-tab-bar/index.wxml
+++ b/src/custom-tab-bar/index.wxml
@@ -1,6 +1,11 @@
 <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">
@@ -22,6 +27,7 @@
       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="name">{{item.name}}</view>
diff --git a/src/echart/components/homeLevel1/index.wxml b/src/echart/components/homeLevel1/index.wxml
index 1771916..abba25c 100644
--- a/src/echart/components/homeLevel1/index.wxml
+++ b/src/echart/components/homeLevel1/index.wxml
@@ -84,7 +84,7 @@
   </view>
   <view class="cooperate" wx:if="{{cooperateList.length}}">
     <view class="cooperate-header">
-      <view class="name">我合作的医生（{{inviteList.length}}）</view>
+      <view class="name">我合作的医生（{{cooperateList.length}}）</view>
       <view class="fold" bind:tap="toggleFold1">
         <block wx:if="{{fold1}}">
           展开
diff --git a/src/echart/components/homeLevel2/index.scss b/src/echart/components/homeLevel2/index.scss
index 4546675..02b4c6f 100644
--- a/src/echart/components/homeLevel2/index.scss
+++ b/src/echart/components/homeLevel2/index.scss
@@ -295,6 +295,17 @@
         &:last-of-type {
           margin-bottom: 0;
         }
+        .invite-doctor {
+          position: absolute;
+          top: 0;
+          right: 0;
+          padding: 2rpx 16rpx;
+          font-size: 22rpx;
+          color: #00b4c5;
+          line-height: 28rpx;
+          border-radius: 0 16rpx 0 16rpx;
+          background-color: #d7edee;
+        }
         .avatar {
           flex-shrink: 0;
           position: relative;
diff --git a/src/echart/components/homeLevel2/index.ts b/src/echart/components/homeLevel2/index.ts
index 0e9200d..2869bda 100644
--- a/src/echart/components/homeLevel2/index.ts
+++ b/src/echart/components/homeLevel2/index.ts
@@ -52,7 +52,7 @@ Component({
       query.select("#fold2").boundingClientRect();
       query.exec((res) => {
         this.setData({
-          foldHeight2: res[1].height,
+          foldHeight2: res[0].height,
         });
       });
     },
diff --git a/src/echart/components/homeLevel2/index.wxml b/src/echart/components/homeLevel2/index.wxml
index 3947dd1..4d23037 100644
--- a/src/echart/components/homeLevel2/index.wxml
+++ b/src/echart/components/homeLevel2/index.wxml
@@ -189,6 +189,7 @@
               <view class="line"></view>
               <view class="label">{{item.DepartmentName}}</view>
             </block>
+            <view class="invite-doctor">蒋亮医生指派</view>
           </view>
           <view class="w-container">
             <text class="hostipal">{{item.HospitalName}}</text>
diff --git a/src/module1/pages/auditDoctorDetail/index.scss b/src/module1/pages/auditDoctorDetail/index.scss
index 4ba4d63..b230fc0 100644
--- a/src/module1/pages/auditDoctorDetail/index.scss
+++ b/src/module1/pages/auditDoctorDetail/index.scss
@@ -149,7 +149,6 @@ page {
 }
 
 .reject {
-  width: 648rpx;
   background-color: transparent;
   .r-badge {
     position: relative;
diff --git a/src/module1/pages/auditDoctorDetail/index.wxml b/src/module1/pages/auditDoctorDetail/index.wxml
index f529c8e..b9ba307 100644
--- a/src/module1/pages/auditDoctorDetail/index.wxml
+++ b/src/module1/pages/auditDoctorDetail/index.wxml
@@ -83,6 +83,7 @@
 <van-dialog
   custom-style="background:transparent"
   use-slot
+  width="324"
   show="{{ showReject }}"
   showCancelButton
   confirm-button-color="rgba(0, 180, 197, 1)"
diff --git a/src/module1/pages/casesFeedback/index.wxml b/src/module1/pages/casesFeedback/index.wxml
index 445b1f0..6143094 100644
--- a/src/module1/pages/casesFeedback/index.wxml
+++ b/src/module1/pages/casesFeedback/index.wxml
@@ -100,7 +100,7 @@
     <view class="btn1" bind:tap="handleSubmit">直接提交我的反馈信息</view>
     <view class="btn2" bind:tap="handleInvite" wx:if="{{auth.canFeedbackInvite}}">提交并邀约质控医生</view>
     <view class="public" wx:if="{{auth.canFeedbackOpen}}">
-      <radio class="radio" checked="{{isOpen===1}}" bind:tap="handleTogleOpen">
+      <radio class="radio" checked="{{isOpen===1}}" color="#00B4C5" bind:tap="handleTogleOpen">
         病历公开（选择公开后，本科室医生均查看病历）
       </radio>
     </view>
diff --git a/src/module1/pages/chatRoom/index.scss b/src/module1/pages/chatRoom/index.scss
index de33801..cb5bf6f 100644
--- a/src/module1/pages/chatRoom/index.scss
+++ b/src/module1/pages/chatRoom/index.scss
@@ -310,6 +310,18 @@ page {
         width: 48rpx;
         height: 48rpx;
       }
+      .place {
+        padding: 16rpx 32rpx;
+        flex: 1;
+        background: #f6f6f6;
+        border-radius: 212rpx 212rpx 212rpx 212rpx;
+        font-size: 28rpx;
+        color: #000;
+        &:empty::after {
+          content: "请输入";
+          color: rgba(205, 205, 205, 1);
+        }
+      }
       .input {
         padding: 16rpx 32rpx;
         flex: 1;
diff --git a/src/module1/pages/chatRoom/index.ts b/src/module1/pages/chatRoom/index.ts
index 021f2fd..99a48ee 100644
--- a/src/module1/pages/chatRoom/index.ts
+++ b/src/module1/pages/chatRoom/index.ts
@@ -25,6 +25,7 @@ Page({
 
     show1: false,
 
+    focus: false,
     fold: true,
     scrollTop: 0,
     scrollIntoView: "",
@@ -89,7 +90,7 @@ Page({
       this.setData({
         show1: res.show === 1,
       });
-      if (res.show === 2) {
+      if (res.show !== 1) {
         this.init();
       }
     });
@@ -468,4 +469,14 @@ Page({
       data: { roomId: this.data.id },
     });
   },
+  handleFocus() {
+    this.setData({
+      focus: true,
+    });
+  },
+  handleBlur() {
+    this.setData({
+      focus: false,
+    });
+  },
 });
diff --git a/src/module1/pages/chatRoom/index.wxml b/src/module1/pages/chatRoom/index.wxml
index 5c47943..2dc2171 100644
--- a/src/module1/pages/chatRoom/index.wxml
+++ b/src/module1/pages/chatRoom/index.wxml
@@ -134,16 +134,22 @@
         <image class="icon" src="{{imageUrl}}icon-voice.png?t={{Timestamp}}"></image>
       </customRecord>
       <input
+        wx:if="{{focus}}"
         class="input"
-        placeholder-class="place-class"
+        placeholder-class="place-input"
         type="text"
         fixed
+        focus="{{focus}}"
+        always-embed
         model:value="{{sendMessage}}"
         placeholder="请输入"
         cursor-spacing="{{30}}"
         confirm-type="send"
         bindconfirm="handleSendMessage"
+        bindblur="handleBlur"
+        bindfocus="handleFocus"
       />
+      <view class="place" wx:else bind:tap="handleFocus">{{sendMessage}}</view>
       <image
         class="icon-add"
         src="{{imageUrl}}icon-circle-add.png?t={{Timestamp}}"
diff --git a/src/module1/pages/setCaseDoctor/index.ts b/src/module1/pages/setCaseDoctor/index.ts
index 15bed1e..bcc589e 100644
--- a/src/module1/pages/setCaseDoctor/index.ts
+++ b/src/module1/pages/setCaseDoctor/index.ts
@@ -194,7 +194,7 @@ Page({
       events: {
         acceptDataFromOpenedPage: (data: any) => {
           this.setData({
-            HospitalId: data.hid,
+            hospitalId: data.hid,
             HospitalName: data.hname,
           });
           this.handleSearch();
diff --git a/src/module1/pages/setChatDoctor/index.ts b/src/module1/pages/setChatDoctor/index.ts
index afe6e24..7039efb 100644
--- a/src/module1/pages/setChatDoctor/index.ts
+++ b/src/module1/pages/setChatDoctor/index.ts
@@ -186,7 +186,7 @@ Page({
       events: {
         acceptDataFromOpenedPage: (data: any) => {
           this.setData({
-            HospitalId: data.hid,
+            hospitalId: data.hid,
             HospitalName: data.hname,
           });
           this.handleSearch();
diff --git a/src/pages/cases/index.ts b/src/pages/cases/index.ts
index a557cda..1dcf9e7 100644
--- a/src/pages/cases/index.ts
+++ b/src/pages/cases/index.ts
@@ -73,8 +73,8 @@ Page({
     });
   },
   onShow() {
+    this.handleNav({ currentTarget: { dataset: { nav: "0" } } });
     this.setData({
-      nav: "0",
       needDeal: app.globalData.needDeal,
     });
     app.globalData.needDeal = "";
@@ -90,6 +90,18 @@ Page({
           userInfo,
         });
       });
+      this.getNotice();
+    });
+  },
+  getNotice() {
+    wx.ajax({
+      method: "GET",
+      url: "?r=takeda/doctor/todo",
+      data: {},
+    }).then((res) => {
+      this.getTabBar().setData({
+        notice: res.notReadChatRoomCount > 0,
+      });
     });
   },
   getBaseInfo() {
diff --git a/src/pages/chatRoomList/index.ts b/src/pages/chatRoomList/index.ts
index 9c278dc..f432ca1 100644
--- a/src/pages/chatRoomList/index.ts
+++ b/src/pages/chatRoomList/index.ts
@@ -63,6 +63,8 @@ Page({
     readStatus: "",
 
     userInfo: {},
+
+    noReadCount: 0,
   },
   onLoad() {
     this.getTabBar().setData({
@@ -82,6 +84,18 @@ Page({
           userInfo,
         });
       });
+      this.getNotice();
+    });
+  },
+  getNotice() {
+    wx.ajax({
+      method: "GET",
+      url: "?r=takeda/doctor/todo",
+      data: {},
+    }).then((res) => {
+      this.getTabBar().setData({
+        notice: res.notReadChatRoomCount > 0,
+      });
     });
   },
   getBaseInfo() {
@@ -145,6 +159,7 @@ Page({
       const list = res.page === 1 ? res.list : [...this.data.list, ...res.list];
       this.setData({
         list,
+        noReadCount: res.noReadCount,
         pagination: {
           page: res.page,
           pages: res.pages,
diff --git a/src/pages/chatRoomList/index.wxml b/src/pages/chatRoomList/index.wxml
index bc52a6c..f717ca5 100644
--- a/src/pages/chatRoomList/index.wxml
+++ b/src/pages/chatRoomList/index.wxml
@@ -123,7 +123,8 @@
       <view class="btn {{readStatus==='2' && 'active'}}" bind:tap="handleRead" data-value="2">未读</view>
       <view class="btn {{readStatus==='1' && 'active'}}" bind:tap="handleRead" data-value="1">已读</view>
     </view>
-    <view class="all-read" bind:tap="handleReadAll">全部标为已读</view>
+    <view class="all-read" wx:if="{{noReadCount>0}}" bind:tap="handleReadAll">全部标为已读</view>
+    <view class="all-read" wx:else>暂无未读消息</view>
   </view>
   <view class="room-list">
     <view class="card" wx:for="{{list}}" wx:key="msgId" bind:tap="handleRoom" data-params="{{item}}">
diff --git a/src/pages/home/index.ts b/src/pages/home/index.ts
index b920866..7c3e9e7 100644
--- a/src/pages/home/index.ts
+++ b/src/pages/home/index.ts
@@ -32,6 +32,7 @@ Page({
           userInfo,
         });
       });
+      this.getNotice();
     });
   },
   onShow() {
@@ -44,6 +45,17 @@ Page({
       hide: true,
     });
   },
+  getNotice() {
+    wx.ajax({
+      method: "GET",
+      url: "?r=takeda/doctor/todo",
+      data: {},
+    }).then((res) => {
+      this.getTabBar().setData({
+        notice: res.notReadChatRoomCount > 0,
+      });
+    });
+  },
   handleBindDoctor() {
     const scene = app.globalData.scene;
     if (scene?.doctorId) {
diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts
index 92a8f3e..45f2320 100644
--- a/src/pages/my/index.ts
+++ b/src/pages/my/index.ts
@@ -18,6 +18,18 @@ Page({
           userInfo,
         });
       });
+      this.getNotice();
+    });
+  },
+  getNotice() {
+    wx.ajax({
+      method: "GET",
+      url: "?r=takeda/doctor/todo",
+      data: {},
+    }).then((res) => {
+      this.getTabBar().setData({
+        notice: res.notReadChatRoomCount > 0,
+      });
     });
   },
   getDoctorDict() {