病例bug处理

README.md

@@ -9,10 +9,19 @@ https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c
 images svn 地址
 svn://39.106.86.127:28386/projects/takeda/proj_src/shop/frontend/web/wt
 
-(/images/)(\S*(?=["|']))
+(/images/)(\S\*(?=["|']))
 {{imageUrl}}$2?t={{Timestamp}}
 
 ui问题
 
 1. 首页绑定医生弹窗需要重新切图
 2. 播放语音条图片没切
+
+showModel颜色统一
+
+```ts
+wx.showModal({
+  confirmColor: "#00B4C5",
+  cancelColor: "#141515",
+});
+```

project.private.config.json

@@ -9,7 +9,7 @@
     "miniprogram": {
       "list": [
         {
-          "name": "病例详情",
+          "name": "病历详情",
           "pathName": "module1/pages/casesDetail/index",
           "query": "id=25",
           "launchMode": "default",
@@ -79,7 +79,7 @@
           "scene": null
         },
         {
-          "name": "录入病例结果",
+          "name": "录入病历结果",
           "pathName": "module1/pages/entryCasesResult/index",
           "query": "",
           "launchMode": "default",

src/components/customRecord/index.ts

@@ -63,6 +63,13 @@ Component({
       });
       recorderManager.onStop((res) => {
         this.handleHide();
+        if (res.duration < 1000) {
+          wx.showToast({
+            title: "录音时间太短",
+            icon: "none",
+          });
+          return;
+        }
         this.uploadFile({
           fileType: "audio",
           tempFilePath: res.tempFilePath,
@@ -85,6 +92,8 @@ Component({
               fail() {
                 // 用户拒绝了授权
                 wx.showModal({
+                  confirmColor: "#00B4C5",
+                  cancelColor: "#141515",
                   title: "提示",
                   content: "需要获取录音权限，请点击确定进入设置页面进行授权。",
                   showCancel: false,
@@ -148,7 +157,7 @@ Component({
             const suffix = this.GetExtensionFileName(data.data.Url);
             const expandJson = {
               fileId: "",
-              name: `病例相关文件.${suffix}`,
+              name: `病历相关文件.${suffix}`,
               size: (item.size / 1024).toFixed(2),
               fileUrl: data.data.Url,
               suffix,

src/components/popupDoctorDetail/index.scss

@@ -99,7 +99,7 @@
         color: rgba(0, 180, 197, 1);
         line-height: 32rpx;
         border-radius: 4rpx 4rpx 4rpx 4rpx;
-        border: 1rpx solid #bfeff4;
+        border: 1px solid #bfeff4;
       }
     }
     .brief-introduction {

src/components/popupDoctorDetail/index.wxml

@@ -20,7 +20,7 @@
       <view class="hostipal">
         <view class="h-name">{{params.HospitalName}}</view>
         <view class="h-tag">{{params.HospitalClassificationName}}{{params.HospitalLevelName}}</view>
-        <view class="h-site">{{params.CityName}}/{{params.CountyName}}</view>
+        <view class="h-site" wx:if="{{params.CityName}}">{{params.CityName}}{{params.CountyName?'/':''}}{{params.CountyName}}</view>
       </view>
     </view>
     <view class="row">

src/components/uploadFile/index.ts

@@ -75,10 +75,12 @@ Component({
               this.triggerEvent("file", res as object);
             });
           },
-          fail: () => {
-            this.uploadFile(e.detail.file).then((res) => {
-              this.triggerEvent("file", res as object);
-            });
+          fail: (err) => {
+            if (err.errMsg.includes("开发者工具")) {
+              this.uploadFile(e.detail.file).then((res) => {
+                this.triggerEvent("file", res as object);
+              });
+            }
           },
         });
       } else {
@@ -148,7 +150,7 @@ Component({
             const suffix = this.GetExtensionFileName(data.data.Url);
             const expandJson = {
               fileId: "",
-              name: `病例相关文件.${suffix}`,
+              name: `病历相关文件.${suffix}`,
               size: (item.size / 1024).toFixed(2),
               fileUrl: data.data.Url,
               suffix,

src/custom-tab-bar/index.scss

@@ -8,7 +8,7 @@
     flex-shrink: 0;
     position: relative;
     width: 94rpx;
-    height: 94rpx;
+    height: 64rpx;
     .add {
       position: absolute;
       top: -42rpx;
@@ -69,6 +69,7 @@
     }
   }
   .tab-item {
+    padding-top: 10rpx;
     flex: 1;
     display: flex;
     flex-direction: column;

src/custom-tab-bar/index.ts

@@ -1,4 +1,4 @@
-const _app = getApp<IAppOption>()
+const _app = getApp<IAppOption>();
 
 // pages/story/a.ts
 Component({
@@ -15,38 +15,39 @@ Component({
     active: 0,
     tabbar: [
       {
-        path: '/pages/home/index',
-        name: '首页',
-        icon: 'tab1.png',
-        iconActive: 'tab-active1.png',
+        path: "/pages/home/index",
+        name: "首页",
+        icon: "tab1.png",
+        iconActive: "tab-active1.png",
         activeIndex: 1,
       },
       {
-        path: '/pages/cases/index',
-        name: '病历',
-        icon: 'tab2.png',
-        iconActive: 'tab-active2.png',
+        path: "/pages/cases/index",
+        name: "病历",
+        icon: "tab2.png",
+        iconActive: "tab-active2.png",
         activeIndex: 2,
       },
       {
         custom: true,
-        path: '/module1/pages/entryCases/index',
+        path: "/module1/pages/entryCases/index",
       },
       {
-        path: '/pages/chatRoomList/index',
-        name: '聊天室',
-        icon: 'tab3.png',
-        iconActive: 'tab-active3.png',
+        path: "/pages/chatRoomList/index",
+        name: "聊天室",
+        icon: "tab3.png",
+        iconActive: "tab-active3.png",
         activeIndex: 3,
       },
       {
-        path: '/pages/my/index',
-        name: '我的',
-        icon: 'tab4.png',
-        iconActive: 'tab-active3.png',
+        path: "/pages/my/index",
+        name: "我的",
+        icon: "tab4.png",
+        iconActive: "tab-active4.png",
         activeIndex: 4,
       },
     ],
+    userInfo: {},
   },
 
   /**
@@ -54,17 +55,17 @@ Component({
    */
   methods: {
     handleTab(e: any) {
-      const { index } = e.currentTarget.dataset
-      const tab = this.data.tabbar[index]
+      const { index } = e.currentTarget.dataset;
+      const tab = this.data.tabbar[index];
       if (tab.custom) {
         wx.navigateTo({
           url: tab.path,
-        })
+        });
       } else {
         wx.switchTab({
           url: tab.path,
-        })
+        });
       }
     },
   },
-})
+});

src/custom-tab-bar/index.wxml

@@ -1,6 +1,6 @@
 <view class="tabbar">
   <block wx:for="{{tabbar}}" wx:key="index">
-    <view class="custom" wx:if="{{item.custom}}" 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">
@@ -16,7 +16,12 @@
         </view>
       </view>
     </view>
-    <view class="tab-item {{active===item.activeIndex &&'active'}}" wx:else bind:tap="handleTab" data-index="{{index}}">
+    <view
+      class="tab-item {{active===item.activeIndex &&'active'}}"
+      wx:elif="{{!item.custom}}"
+      bind:tap="handleTab"
+      data-index="{{index}}"
+    >
       <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>

src/echart/components/homeLevel1/index.scss

@@ -67,7 +67,7 @@
       box-sizing: border-box;
       background: linear-gradient(180deg, #dcf5f7 0%, #ffffff 100%);
       border-radius: 24rpx 24rpx 24rpx 24rpx;
-      border: 1rpx solid #ffffff;
+      border: 1px solid #ffffff;
     }
     .bg {
       padding-top: 40rpx;
@@ -77,7 +77,7 @@
       .b-container {
         position: relative;
         z-index: 2;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
         display: flex;
@@ -117,7 +117,7 @@
         color: #fff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
       }
     }
   }
@@ -316,7 +316,7 @@
               font-size: 22rpx;
               color: rgba(0, 180, 197, 1);
               line-height: 32rpx;
-              border: 1rpx solid rgba(191, 239, 244, 1);
+              border: 1px solid rgba(191, 239, 244, 1);
             }
           }
         }

src/echart/components/homeLevel2/index.scss

@@ -86,7 +86,7 @@
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid rgba(191, 239, 244, 1);
+          border: 1px solid rgba(191, 239, 244, 1);
         }
       }
     }
@@ -106,7 +106,7 @@
       box-sizing: border-box;
       background: linear-gradient(180deg, #dcf5f7 0%, #ffffff 100%);
       border-radius: 24rpx 24rpx 24rpx 24rpx;
-      border: 1rpx solid #ffffff;
+      border: 1px solid #ffffff;
     }
     .bg {
       padding-top: 40rpx;
@@ -116,7 +116,7 @@
       .b-container {
         position: relative;
         z-index: 2;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
         display: flex;
@@ -156,7 +156,7 @@
         color: #fff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
       }
     }
   }
@@ -376,7 +376,7 @@
               font-size: 22rpx;
               color: rgba(0, 180, 197, 1);
               line-height: 32rpx;
-              border: 1rpx solid rgba(191, 239, 244, 1);
+              border: 1px solid rgba(191, 239, 244, 1);
             }
           }
         }

src/echart/components/homeLevel3/index.scss

@@ -86,7 +86,7 @@
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid rgba(191, 239, 244, 1);
+          border: 1px solid rgba(191, 239, 244, 1);
         }
       }
     }
@@ -106,7 +106,7 @@
       box-sizing: border-box;
       background: linear-gradient(180deg, #dcf5f7 0%, #ffffff 100%);
       border-radius: 24rpx 24rpx 24rpx 24rpx;
-      border: 1rpx solid #ffffff;
+      border: 1px solid #ffffff;
     }
     .bg {
       padding-top: 40rpx;
@@ -116,7 +116,7 @@
       .b-container {
         position: relative;
         z-index: 2;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
         display: flex;
@@ -156,7 +156,7 @@
         color: #fff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
       }
     }
   }

src/echart/components/homeLevel4/index.scss

@@ -86,7 +86,7 @@
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid rgba(191, 239, 244, 1);
+          border: 1px solid rgba(191, 239, 244, 1);
         }
       }
     }
@@ -106,7 +106,7 @@
       box-sizing: border-box;
       background: linear-gradient(180deg, #dcf5f7 0%, #ffffff 100%);
       border-radius: 24rpx 24rpx 24rpx 24rpx;
-      border: 1rpx solid #ffffff;
+      border: 1px solid #ffffff;
     }
     .bg {
       padding-top: 40rpx;
@@ -116,7 +116,7 @@
       .b-container {
         position: relative;
         z-index: 2;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
         display: flex;
@@ -156,7 +156,7 @@
         color: #fff;
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
-        border: 1rpx solid #ffffff;
+        border: 1px solid #ffffff;
       }
     }
   }
@@ -185,7 +185,7 @@
         color: rgba(133, 133, 133, 1);
         background: #ffffff;
         border-radius: 98rpx 98rpx 98rpx 98rpx;
-        border: 1rpx solid #f6f6f6;
+        border: 1px solid #f6f6f6;
       }
     }
     .more {
@@ -339,7 +339,7 @@
           color: rgba(133, 133, 133, 1);
           background: #ffffff;
           border-radius: 98rpx 98rpx 98rpx 98rpx;
-          border: 1rpx solid #f6f6f6;
+          border: 1px solid #f6f6f6;
         }
       }
     }

src/module1/pages/auditDoctorDetail/index.scss

@@ -85,7 +85,7 @@ page {
       font-size: 32rpx;
       color: rgba(1, 180, 197, 1);
       border-radius: 96rpx 96rpx 96rpx 96rpx;
-      border: 1rpx solid #01b4c5;
+      border: 1px solid #01b4c5;
     }
     .submit {
       width: 330rpx;

src/module1/pages/cHostipal/index.scss

@@ -113,7 +113,7 @@ page {
       font-size: 32rpx;
       color: rgba(1, 180, 197, 1);
       border-radius: 96rpx 96rpx 96rpx 96rpx;
-      border: 1rpx solid #01b4c5;
+      border: 1px solid #01b4c5;
     }
     .submit {
       width: 330rpx;

src/module1/pages/casesDetail/index.scss

@@ -113,7 +113,7 @@ page {
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid #bfeff4;
+          border: 1px solid #bfeff4;
           border-radius: 4rpx;
         }
       }
@@ -204,7 +204,7 @@ page {
             line-height: 32rpx;
             background: #ffffff;
             border-radius: 4rpx 4rpx 4rpx 4rpx;
-            border: 1rpx solid #bfeff4;
+            border: 1px solid #bfeff4;
           }
         }
         .edit-tag {
@@ -252,6 +252,9 @@ page {
           display: flex;
           gap: 28rpx;
           align-items: center;
+          &:not(:last-of-type) {
+            margin-bottom: 24rpx;
+          }
           .audio-bar {
             flex: 1;
             border-radius: 104rpx;
@@ -333,10 +336,54 @@ page {
         width: 136rpx;
         height: 44rpx;
       }
-      .gather {
+      .option {
+        position: relative;
         padding: 12rpx 32rpx;
         width: 48rpx;
         height: 48rpx;
+        .o-icon {
+          width: 48rpx;
+          height: 48rpx;
+        }
+        .option-popup {
+          display: none;
+          position: absolute;
+          top: -5rpx;
+          left: 30%;
+          transform: translate(-50%, -100%);
+          border-radius: 8rpx;
+          background-color: #fff;
+          box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.1);
+          .op-row {
+            padding: 24rpx;
+            display: flex;
+            align-items: center;
+            white-space: nowrap;
+            gap: 20rpx;
+            font-size: 28rpx;
+            color: #141515;
+            .icon {
+              width: 36rpx;
+              height: 36rpx;
+            }
+          }
+          &::after {
+            position: absolute;
+            bottom: -12rpx;
+            left: 45%;
+            content: "";
+            width: 0;
+            height: 0;
+            border-style: solid;
+            border-width: 27rpx 27rpx 0 27rpx;
+            border-color: #fff transparent transparent transparent;
+          }
+        }
+        &:hover {
+          .option-popup {
+            display: block;
+          }
+        }
       }
     }
     .li-row {
@@ -397,7 +444,7 @@ page {
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid #bfeff4;
+          border: 1px solid #bfeff4;
           border-radius: 4rpx;
         }
       }
@@ -501,6 +548,9 @@ page {
           display: flex;
           gap: 28rpx;
           align-items: center;
+          &:not(:last-of-type) {
+            margin-bottom: 24rpx;
+          }
           .audio-bar {
             flex: 1;
             border-radius: 104rpx;
@@ -670,7 +720,7 @@ page {
             font-size: 22rpx;
             color: rgba(0, 180, 197, 1);
             line-height: 32rpx;
-            border: 1rpx solid rgba(191, 239, 244, 1);
+            border: 1px solid rgba(191, 239, 244, 1);
           }
         }
       }

src/module1/pages/casesDetail/index.ts

@@ -2,10 +2,10 @@ const app = getApp<IAppOption>();
 
 Page({
   data: {
-    show1: false, // 驳回病例
-    show2: false, // 优质病例
+    show1: false, // 驳回病历
+    show2: false, // 优质病历
     show3: false, // 归档
-    show4: false, // 取消优质病例
+    show4: false, // 取消优质病历
     show5: false, // 取消归档
     show6: false, // 创建聊天室
     show7: false, // 更改标签
@@ -374,6 +374,8 @@ Page({
     const { detail, id } = this.data;
     const isOpen = detail.isOpen === "1";
     wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
       title: `确认${isOpen ? "取消公开" : "公开"}?`,
       success: (res) => {
         if (res.confirm) {
@@ -420,6 +422,8 @@ Page({
   handleDel() {
     const { id } = this.data;
     wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
       title: `确认删除？`,
       success: (res) => {
         if (res.confirm) {
@@ -450,6 +454,8 @@ Page({
     const { detail } = this.data;
     const item = detail.feedbackList[index];
     wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
       title: `确认删除该反馈？`,
       success: (res) => {
         if (res.confirm) {

src/module1/pages/casesDetail/index.wxml

@@ -3,7 +3,7 @@
   <view class="detail-card">
     <view class="li-header">
       <view class="wrap">
-        <view class="id">ID:{{detail.caseId}}</view>
+        <view class="id">ID:{{detail.caseNo}}</view>
         <view class="status status3" wx:if="{{detail.caseStatus==='1'}}">{{detail.caseStatusName}}</view>
         <view class="status status2" wx:elif="{{detail.caseStatus==='2'}}">{{detail.caseStatusName}}</view>
         <view class="status status1" wx:elif="{{detail.caseStatus==='3'}}">{{detail.caseStatusName}}</view>
@@ -37,7 +37,9 @@
           <view class="tag">
             {{detail.createDoctorInfo.hospitalClassificationName}}{{detail.createDoctorInfo.hospitalLevelName}}
           </view>
-          <view class="site">{{detail.createDoctorInfo.cityName}}/{{detail.createDoctorInfo.countyName}}</view>
+          <view class="site" wx:if="{{detail.createDoctorInfo.cityName}}">
+            {{detail.createDoctorInfo.cityName}}{{detail.createDoctorInfo.countyName?'/':''}}{{detail.createDoctorInfo.countyName}}
+          </view>
         </view>
       </view>
     </view>
@@ -80,7 +82,7 @@
         <view class="file-list">
           <view class="fl-row" wx:for="{{detail.caseFiles}}" wx:key="url">
             <view class="wrap">
-              <image class="icon" src="{{imageUrl}}icon-file.png?t={{Timestamp}}"></image>
+              <image class="icon" src="{{imageUrl}}icon-file{{item.fileType}}.png?t={{Timestamp}}"></image>
               <view class="name">{{item.name}}</view>
             </view>
             <view class="option">
@@ -110,13 +112,15 @@
         src="{{imageUrl}}self.png?t={{Timestamp}}"
         mode="scaleToFill"
       ></image>
-      <image
-        wx:if="{{item.isSelf===1}}"
-        class="gather"
-        src="{{imageUrl}}icon-gather.png?t={{Timestamp}}"
-        bind:tap="handleDelFeedBack"
-        data-index="{{index}}"
-      ></image>
+      <view wx:if="{{item.isSelf===1}}" class="option">
+        <image class="o-icon" src="{{imageUrl}}icon-gather.png?t={{Timestamp}}"></image>
+        <view class="option-popup">
+          <view class="op-row" bind:tap="handleDelFeedBack" data-index="{{index}}">
+            <image class="icon" src="{{imageUrl}}icon-del-dark.png?t={{Timestamp}}"></image>
+            删除
+          </view>
+        </view>
+      </view>
     </view>
     <view class="li-row">
       <view class="label">提交时间</view>
@@ -142,13 +146,15 @@
           <view class="tag">
             {{item.createDoctorInfo.hospitalClassificationName}}{{item.createDoctorInfo.hospitalLevelName}}
           </view>
-          <view class="site">{{item.createDoctorInfo.cityName}}/{{item.createDoctorInfo.countyName}}</view>
+          <view class="site" wx:if="{{item.createDoctorInfo.cityName}}">
+            {{item.createDoctorInfo.cityName}}{{item.createDoctorInfo.countyName?'/':''}}{{item.createDoctorInfo.countyName}}
+          </view>
         </view>
       </view>
     </view>
     <view class="cases {{item.fold && 'fold'}}">
       <view class="remark" wx:if="{{item.info}}">
-        <view class="r-title">对病例的标注</view>
+        <view class="r-title">对病历的标注</view>
         <view class="r-content">{{item.info}}</view>
       </view>
       <view class="audio-list" wx:if="{{item.feedbackAudios.length}}">
@@ -176,7 +182,7 @@
         <view class="file-list">
           <view class="fl-row" wx:for="{{item.feedbackFiles}}" wx:for-item="cItem" wx:key="url">
             <view class="wrap">
-              <image class="icon" src="{{imageUrl}}icon-file.png?t={{Timestamp}}"></image>
+              <image class="icon" src="{{imageUrl}}icon-file{{cItem.fileType}}.png?t={{Timestamp}}"></image>
               <view class="name">{{cItem.name}}</view>
             </view>
             <view class="option">
@@ -221,7 +227,7 @@
         <view class="w-container">
           <text class="hostipal">{{dealDoctorInfo.hospitalName}}</text>
           <view class="tag">{{dealDoctorInfo.hospitalClassificationName}}{{dealDoctorInfo.hospitalLevelName}}</view>
-          <view class="site">{{dealDoctorInfo.cityName}}/{{dealDoctorInfo.countyName}}</view>
+          <view class="site" wx:if="{{dealDoctorInfo.cityName}}">{{dealDoctorInfo.cityName}}{{dealDoctorInfo.countyName?'/':''}}{{dealDoctorInfo.countyName}}</view>
         </view>
         <view class="w-footer">
           <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
@@ -333,10 +339,9 @@
       </view>
       <view class="w-item" wx:if="{{auth.canSetOpen && !foldAuth.canSetOpen}}" bind:tap="handleOpen">
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon8.png?t={{Timestamp}}"></image>
-        <view class="name">{{detail.isOpen==='1'?'公开':'取消公开'}}</view>
+        <view class="name">{{detail.isOpen==='1'?'取消公开':'公开'}}</view>
       </view>
     </view>
-
     <view class="btn-wrap" wx:if="{{auth.canFeedback}}">
       <view class="btn1" bind:tap="handleFeedBack">提交反馈</view>
     </view>

src/module1/pages/casesFeedback/index.scss

@@ -37,6 +37,7 @@ page {
     .image-files {
       margin-top: 32rpx;
       display: flex;
+      flex-wrap: wrap;
       gap: 14rpx;
       .upload-file {
         width: 144rpx;
@@ -298,7 +299,7 @@ page {
       font-size: 32rpx;
       color: rgba(1, 180, 197, 1);
       border-radius: 96rpx 96rpx 96rpx 96rpx;
-      border: 1rpx solid #01b4c5;
+      border: 1px solid #01b4c5;
     }
     .disabled {
       opacity: 0.3;

src/module1/pages/casesFeedback/index.ts

@@ -23,6 +23,18 @@ Page({
           DoctorLevel: res.DoctorLevel,
         });
       });
+      this.getAuth();
+    });
+  },
+  getAuth() {
+    wx.ajax({
+      method: "GET",
+      url: "?r=takeda/case/get-case-detail-op-auth",
+      data: { caseId: this.data.caseId },
+    }).then((res) => {
+      this.setData({
+        auth: res,
+      });
     });
   },
   handlePhoto(e) {

src/module1/pages/casesFeedback/index.wxml

@@ -8,9 +8,9 @@
         placeholder-style="color:rgba(205, 205, 205, 1);"
         placeholder="请输入您的病历备注"
         auto-height
-        maxlength="{{3000}}"
+        maxlength="{{1000}}"
       ></textarea>
-      <view class="limit">{{description.length}}/3000</view>
+      <view class="limit">{{info.length}}/1000</view>
     </view>
     <view class="audio-list">
       <view class="row" wx:for="{{audios}}" wx:key="index">
@@ -104,10 +104,10 @@
   <view class="popup1">
     <view class="title">确认提交您的反馈信息</view>
     <view class="btn1" bind:tap="handleSubmit">直接提交我的反馈信息</view>
-    <view class="btn2" bind:tap="handleInvite">提交并邀约质控医生</view>
+    <view class="btn2" bind:tap="handleInvite" wx:if="{{res.canFeedbackInvite}}">提交并邀约质控医生</view>
     <view class="public">
       <radio class="radio" checked="{{isOpen===1}}" bind:tap="handleTogleOpen">
-        病例公开（选择公开后，本科室医生均查看病例）
+        病历公开（选择公开后，本科室医生均查看病历）
       </radio>
     </view>
   </view>

src/module1/pages/entryCases/index.json

@@ -6,6 +6,7 @@
     "customRecord": "/components/customRecord/index",
     "customAudioBar": "/components/customAudioBar/index",
     "van-popup": "@vant/weapp/popup/index",
-    "van-nav-bar": "@vant/weapp/nav-bar/index"
+    "van-nav-bar": "@vant/weapp/nav-bar/index",
+    "van-toast": "@vant/weapp/toast/index"
   }
 }

src/module1/pages/entryCases/index.scss

@@ -37,6 +37,7 @@ page {
     .image-files {
       margin-top: 32rpx;
       display: flex;
+      flex-wrap: wrap;
       gap: 14rpx;
       .upload-file {
         width: 144rpx;
@@ -298,7 +299,7 @@ page {
       font-size: 32rpx;
       color: rgba(1, 180, 197, 1);
       border-radius: 96rpx 96rpx 96rpx 96rpx;
-      border: 1rpx solid #01b4c5;
+      border: 1px solid #01b4c5;
     }
     .disabled{
       opacity: 0.3;

src/module1/pages/entryCases/index.ts

@@ -1,3 +1,4 @@
+import Toast from "@vant/weapp/toast/toast";
 const app = getApp<IAppOption>();
 
 Page({
@@ -20,9 +21,12 @@ Page({
     DoctorLevel: 1,
 
     caseId: "",
+
+    edit: true,
   },
   onLoad(options) {
     app.waitLogin().then(() => {
+      this.getVisit();
       this.getDoctorDict();
       this.getInviteDoctorList();
       app.getUserInfo(this, (res) => {
@@ -38,6 +42,24 @@ Page({
       }
     });
   },
+  getVisit() {
+    wx.ajax({
+      method: "GET",
+      url: "?r=takeda/case/is-visit",
+      data: {},
+    }).then((res) => {
+      this.setData({
+        edit: res === 2,
+      });
+    });
+  },
+  postVisit() {
+    wx.ajax({
+      method: "POST",
+      url: "?r=takeda/case/visit",
+      data: {},
+    });
+  },
   getDetail() {
     wx.ajax({
       method: "GET",
@@ -51,7 +73,7 @@ Page({
         description: res.description,
         audios: res.caseAudios,
         files: res.caseFiles,
-        deptId: res.caseDeptId[0] || '',
+        deptId: res.caseDeptId[0] || "",
         labelIds: res.caseLabels.map((item) => item.labelId),
       });
     });
@@ -80,7 +102,13 @@ Page({
   },
   handlePhoto(e) {
     const detail = e.detail;
-    const images = this.data.images;
+    const { images, edit } = this.data;
+    if (edit) {
+      this.postVisit();
+      this.setData({
+        edit: false,
+      });
+    }
     this.setData({
       images: [
         ...images,
@@ -112,9 +140,18 @@ Page({
     });
   },
   handleDelAudio(e) {
-    const { index } = e.currentTarget.dataset;
-    this.setData({
-      audios: this.data.audios.filter((_, i) => i !== Number(index)),
+    wx.showModal({
+      title: "确认删除?",
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      success: (res) => {
+        if (res.confirm) {
+          const { index } = e.currentTarget.dataset;
+          this.setData({
+            audios: this.data.audios.filter((_, i) => i !== Number(index)),
+          });
+        }
+      },
     });
   },
   handleFile(e) {
@@ -134,9 +171,18 @@ Page({
     });
   },
   handleDelFile(e) {
-    const { index } = e.currentTarget.dataset;
-    this.setData({
-      files: this.data.files.filter((_, i) => i !== Number(index)),
+    wx.showModal({
+      title: "确认删除?",
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      success: (res) => {
+        if (res.confirm) {
+          const { index } = e.currentTarget.dataset;
+          this.setData({
+            files: this.data.files.filter((_, i) => i !== Number(index)),
+          });
+        }
+      },
     });
   },
   handlePreviewFile(e) {
@@ -225,7 +271,14 @@ Page({
     });
   },
   handleCache() {
-    const { caseId } = this.data;
+    const { caseId, images, description, audios, files, deptId, labelIds } = this.data;
+    if (!images.length && !description && !audios.length && !files.length && !deptId && !labelIds.length) {
+      wx.showToast({
+        title: "请完善信息",
+        icon: "none",
+      });
+      return;
+    }
     const params = this.formatParams();
     const url = caseId ? "?r=takeda/case/save-case" : "?r=takeda/case/create-case";
     wx.ajax({
@@ -245,7 +298,7 @@ Page({
     const images = this.data.images;
     if (images.length === 0) {
       wx.showToast({
-        title: "请上传病例图片",
+        title: "请上传病历图片",
         icon: "none",
       });
       return;
@@ -260,13 +313,18 @@ Page({
       },
     });
   },
+  handleNoInvite() {
+    Toast("您还没有合作医生，无法邀请医生讨论病历，可暂时存为草稿");
+  },
   handleSave() {},
   handleSubmit() {},
   handleBack() {
     wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
       title: "您的病历还未保存，是否要存为草稿？",
       confirmText: "存为草稿",
-      cancelColor: "退出",
+      cancelText: "退出",
       success: (res) => {
         if (res.confirm) {
           this.handleCache();

src/module1/pages/entryCases/index.wxml

@@ -1,5 +1,5 @@
 <wxs src="/utils/util.wxs" module="tools" />
-<van-nav-bar title="录入病例" fixed bind:click-left="handleBack" bind:click-right="onClickRight">
+<van-nav-bar title="录入病历" fixed bind:click-left="handleBack" bind:click-right="onClickRight">
   <van-icon name="arrow-left" slot="left" size="18px" />
 </van-nav-bar>
 <view class="page" style="padding-top:{{menuButtonInfo.top + 60}}px;">
@@ -19,7 +19,7 @@
           <view class="r-title">重复图片</view>
         </view> -->
       </view>
-      <uploadFile obscure edit bind:file="handlePhoto">
+      <uploadFile obscure edit="{{edit}}" bind:file="handlePhoto" wx:if="{{images.length<9}}">
         <view class="upload-file">
           <van-icon class="add" name="plus" />
         </view>
@@ -128,7 +128,7 @@
   <view class="footer">
     <view class="cancel" bind:tap="handleCache">存为草稿</view>
     <view wx:if="{{isInvite}}" class="submit" bind:tap="handleInvite">保存并提交</view>
-    <view wx:else class="submit disabled">保存并提交</view>
+    <view wx:else class="submit disabled" bind:tap="handleNoInvite">保存并提交</view>
   </view>
 </view>
 
@@ -138,19 +138,21 @@
     <view class="btn1" bind:tap="handleSubmit">直接提交我的反馈信息</view>
     <view class="btn2" bind:tap="handleInvite">提交并邀约质控医生</view>
     <view class="public">
-      <radio class="radio">病例公开（选择公开后，本科室医生均查看病例）</radio>
+      <radio class="radio">病历公开（选择公开后，本科室医生均查看病历）</radio>
     </view>
   </view>
 </van-popup>
 
 <van-popup show="{{ show2 }}" bind:close="onClose" round closeable>
   <view class="popup2">
-    <view class="title">您的病例没有进行涂抹</view>
+    <view class="title">您的病历没有进行涂抹</view>
     <!-- prettier-ignore -->
     <view class="content">
-      请<text class="link">确认</text>上传的病例 已不包含患者的隐私信息
+      请<text class="link">确认</text>上传的病历 已不包含患者的隐私信息
     </view>
     <view class="btn">确认继续提交</view>
     <view class="cancel">返回</view>
   </view>
 </van-popup>
+
+<van-toast id="van-toast" />

src/module1/pages/entryCasesResult/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "录入新病例",
+  "navigationBarTitleText": "录入新病历",
   "navigationStyle": "default",
   "usingComponents": {}
 }

src/module1/pages/entryCasesResult/index.ts

@@ -13,9 +13,9 @@ Page({
       isFollow: options.isf,
     });
   },
-  handleReSubmit() {
-    wx.navigateTo({
-      url: "/module1/pages/entryCases/index",
+  handleBackCase() {
+    wx.reLaunch({
+      url: "/pages/cases/index",
     });
   },
   handleDetail() {

src/module1/pages/entryCasesResult/index.wxml

@@ -2,7 +2,7 @@
   <image class="badge" src="{{imageUrl}}icon-resolve.png?t={{Timestamp}}" mode="scaleToFill"></image>
   <view class="desc">病历提交后医生将收到消息提醒</view>
   <view class="btn1" bind:tap="handleDetail">查看我提交的病历</view>
-  <view class="btn2" bind:tap="handleReSubmit">继续录入新的病历</view>
+  <view class="btn2" bind:tap="handleBackCase">返回病历列表</view>
   <image class="code" src="{{codeUrl}}" mode="scaleToFill" show-menu-by-longpress></image>
-  <view class="tip">关注公众号接收病例反馈消息</view>
+  <view class="tip">关注公众号接收病历反馈消息</view>
 </view>

src/module1/pages/invite/index.scss

@@ -101,7 +101,7 @@
       text-align: center;
       line-height: 88rpx;
       border-radius: 96rpx 96rpx 96rpx 96rpx;
-      border: 1rpx solid #ffffff;
+      border: 1px solid #ffffff;
     }
     .share {
       flex: 1;

src/module1/pages/login/index.ts

@@ -1,5 +1,5 @@
 const app = getApp<IAppOption>();
-let timer = 0;
+let timer: number | null = 0;
 
 Page({
   data: {
@@ -85,8 +85,8 @@ Page({
         mobile,
         code,
       },
-    }).then((_res) => {
-      this.submitCallback();
+    }).then((res) => {
+      this.submitCallback(res);
     });
   },
   handleWxSubmit(e: any) {
@@ -107,15 +107,18 @@ Page({
           iv: encodeURIComponent(iv),
           encryptedData: encodeURIComponent(encryptedData),
         },
-      }).then((_res) => {
-        this.submitCallback();
+      }).then((res) => {
+        this.submitCallback(res);
       });
     }
   },
-  submitCallback() {
+  submitCallback(res) {
     app.globalData.isLogin = 1;
+    app.globalData.doctorId = res.doctorId;
     app.waitLogin().then(() => {
-      wx.reLaunch({ url: "/module1/pages/setInfo/index" });
+      wx.reLaunch({
+        url: "/pages/home/index",
+      });
     });
   },
   handleProtool() {

src/module1/pages/org3/index.scss

@@ -14,7 +14,7 @@ page {
       align-items: center;
       background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
       border-radius: 16rpx 16rpx 16rpx 16rpx;
-      border: 1rpx solid #ffffff;
+      border: 1px solid #ffffff;
       .item {
         flex: 1;
         text-align: center;
@@ -69,7 +69,7 @@ page {
         line-height: 44rpx;
         color: rgba(0, 180, 197, 1);
         border-radius: 72rpx 72rpx 72rpx 72rpx;
-        border: 1rpx solid #00b4c5;
+        border: 1px solid #00b4c5;
       }
     }
   }
@@ -176,7 +176,7 @@ page {
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid rgba(191, 239, 244, 1);
+          border: 1px solid rgba(191, 239, 244, 1);
         }
       }
     }

src/module1/pages/org4/index.scss

@@ -34,7 +34,7 @@ page {
       align-items: center;
       background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
       border-radius: 16rpx 16rpx 16rpx 16rpx;
-      border: 1rpx solid #ffffff;
+      border: 1px solid #ffffff;
       .item {
         flex: 1;
         text-align: center;
@@ -88,7 +88,7 @@ page {
         line-height: 44rpx;
         color: rgba(0, 180, 197, 1);
         border-radius: 72rpx 72rpx 72rpx 72rpx;
-        border: 1rpx solid #00b4c5;
+        border: 1px solid #00b4c5;
       }
     }
   }
@@ -195,7 +195,7 @@ page {
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid rgba(191, 239, 244, 1);
+          border: 1px solid rgba(191, 239, 244, 1);
         }
       }
     }

src/module1/pages/sHostipal/index.ts

@@ -23,8 +23,13 @@ Page({
     list: [],
 
     area: [],
+
+    reg: true,
   },
-  onLoad() {
+  onLoad(options) {
+    this.setData({
+      reg: options.reg === "1",
+    });
     app.waitLogin(true).then(() => {
       this.getHostipalDict();
       this.getList();

src/module1/pages/sHostipal/index.wxml

@@ -17,7 +17,7 @@
       />
     </view>
   </view>
-  <view class="tip" wx:if="{{list.length}}">
+  <view class="tip" wx:if="{{list.length && reg}}">
     没找到您的医院？
     <text class="link" bind:tap="handlePushDoctor">这里录入</text>
   </view>
@@ -34,7 +34,7 @@
         {{item.CityName}}{{item.CountyName}}{{item.Address}}
       </view>
     </view>
-    <view class="empty" wx:if="{{(search || ProvinceId ) && pagination.count==0}}">
+    <view class="empty" wx:if="{{(search || ProvinceId ) && pagination.count==0 && reg}}">
       <image class="e-img" src="{{imageUrl}}empty-1.png?t={{Timestamp}}"></image>
       <view class="e-tip">没有找到您搜索的医院哦！</view>
       <view class="e-submit" bind:tap="handlePushDoctor">提交新医院</view>

src/module1/pages/setCaseDoctor/index.scss

@@ -12,26 +12,37 @@ page {
         color: rgba(0, 180, 197, 1);
       }
     }
-    .search {
+    .search-wrap {
       margin-top: 32rpx;
-      padding: 20rpx 30rpx;
       display: flex;
       align-items: center;
-      gap: 20rpx;
-      border-radius: 122rpx;
-      background-color: rgba(246, 246, 246, 1);
-      .icon {
-        width: 32rpx;
-        height: 32rpx;
-      }
-      .input {
+      gap: 22rpx;
+      .search {
         flex: 1;
-        text-align: center;
-        font-size: 28rpx;
-        color: #000;
+        padding: 20rpx 30rpx;
+        display: flex;
+        align-items: center;
+        gap: 20rpx;
+        border-radius: 122rpx;
+        background-color: rgba(246, 246, 246, 1);
+        .icon {
+          width: 32rpx;
+          height: 32rpx;
+        }
+        .input {
+          flex: 1;
+          text-align: center;
+          font-size: 28rpx;
+          color: #000;
+        }
+        .place-input {
+          color: rgba(205, 205, 205, 1);
+        }
       }
-      .place-input {
-        color: rgba(205, 205, 205, 1);
+      .reset {
+        padding: 10rpx;
+        font-size: 28rpx;
+        color: #00b4c5;
       }
     }
     .options {
@@ -62,8 +73,9 @@ page {
     }
   }
   .list {
-    padding: 26rpx 32rpx;
+    padding: 26rpx 32rpx 300rpx;
     .list-item {
+      margin-bottom: 24rpx;
       display: flex;
       align-items: center;
       .radio {
@@ -148,7 +160,7 @@ page {
               font-size: 22rpx;
               color: rgba(0, 180, 197, 1);
               line-height: 32rpx;
-              border: 1rpx solid rgba(191, 239, 244, 1);
+              border: 1px solid rgba(191, 239, 244, 1);
             }
           }
         }
@@ -176,7 +188,7 @@ page {
       font-size: 32rpx;
       color: rgba(1, 180, 197, 1);
       border-radius: 96rpx 96rpx 96rpx 96rpx;
-      border: 1rpx solid #01b4c5;
+      border: 1px solid #01b4c5;
     }
     .submit {
       flex: 1;

src/module1/pages/setCaseDoctor/index.ts

@@ -108,6 +108,22 @@ Page({
     });
     this.getList();
   },
+  handleReset() {
+    this.setData({
+      search: "",
+      hospitalId: "",
+      HospitalName: "",
+      provinceId: "",
+      cityId: "",
+      countyId: "",
+      ProvinceName: "",
+      CityName: "",
+      CountyName: "",
+      specialtyId: "",
+      SpecialtyName: "",
+    });
+    this.handleSearch();
+  },
   getList() {
     const { search, hospitalId, provinceId, cityId, countyId, specialtyId } = this.data;
     wx.ajax({
@@ -255,7 +271,7 @@ Page({
         dealDoctorId: DoctorId,
       },
     }).then((res) => {
-      wx.navigateTo({
+      wx.reLaunch({
         url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`,
       });
     });

src/module1/pages/setCaseDoctor/index.wxml

@@ -1,17 +1,20 @@
 <view class="page">
   <view class="header">
     <view class="tip">邀请医生进行病历反馈，提交后医生将收到消息提醒</view>
-    <view class="search">
-      <image class="icon" src="{{imageUrl}}icon-search.png?t={{Timestamp}}"></image>
-      <input
-        model:value="{{search}}"
-        class="input"
-        placeholder-class="place-input"
-        placeholder="搜索医生名"
-        type="text"
-        confirm-type="search"
-        bindconfirm="handleSearch"
-      />
+    <view class="search-wrap">
+      <view class="search">
+        <image class="icon" src="{{imageUrl}}icon-search.png?t={{Timestamp}}"></image>
+        <input
+          model:value="{{search}}"
+          class="input"
+          placeholder-class="place-input"
+          placeholder="搜索医生名"
+          type="text"
+          confirm-type="search"
+          bindconfirm="handleSearch"
+        />
+      </view>
+      <view class="reset" bind:tap="handleReset">重置</view>
     </view>
     <view class="options">
       <view class="option-wrap" bind:tap="handleHostipal">
@@ -53,7 +56,7 @@
               <view class="w-container">
                 <text class="hostipal">{{item.hospitalName}}</text>
                 <view class="tag">{{item.hospitalClassificationName}}{{item.hospitalLevelName}}</view>
-                <view class="site">{{item.cityName}}/{{item.countyName}}</view>
+                <view class="site" wx:if="{{item.cityName}}">{{item.cityName}}{{item.countyName?'/':''}}{{item.countyName}}</view>
               </view>
               <view class="w-footer">
                 <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>

src/module1/pages/setDoctor/index.scss

@@ -12,26 +12,37 @@ page {
         color: rgba(0, 180, 197, 1);
       }
     }
-    .search {
+    .search-wrap {
       margin-top: 32rpx;
-      padding: 20rpx 30rpx;
       display: flex;
       align-items: center;
-      gap: 20rpx;
-      border-radius: 122rpx;
-      background-color: rgba(246, 246, 246, 1);
-      .icon {
-        width: 32rpx;
-        height: 32rpx;
-      }
-      .input {
+      gap: 22rpx;
+      .search {
         flex: 1;
-        text-align: center;
-        font-size: 28rpx;
-        color: #000;
+        padding: 20rpx 30rpx;
+        display: flex;
+        align-items: center;
+        gap: 20rpx;
+        border-radius: 122rpx;
+        background-color: rgba(246, 246, 246, 1);
+        .icon {
+          width: 32rpx;
+          height: 32rpx;
+        }
+        .input {
+          flex: 1;
+          text-align: center;
+          font-size: 28rpx;
+          color: #000;
+        }
+        .place-input {
+          color: rgba(205, 205, 205, 1);
+        }
       }
-      .place-input {
-        color: rgba(205, 205, 205, 1);
+      .reset {
+        padding: 10rpx;
+        font-size: 28rpx;
+        color: #00b4c5;
       }
     }
     .options {
@@ -62,8 +73,9 @@ page {
     }
   }
   .list {
-    padding: 26rpx 32rpx;
+    padding: 26rpx 32rpx 300rpx;
     .list-item {
+      margin-bottom: 24rpx;
       display: flex;
       align-items: center;
       .radio {
@@ -147,7 +159,7 @@ page {
               font-size: 22rpx;
               color: rgba(0, 180, 197, 1);
               line-height: 32rpx;
-              border: 1rpx solid rgba(191, 239, 244, 1);
+              border: 1px solid rgba(191, 239, 244, 1);
             }
           }
         }
@@ -175,7 +187,7 @@ page {
       font-size: 32rpx;
       color: rgba(1, 180, 197, 1);
       border-radius: 96rpx 96rpx 96rpx 96rpx;
-      border: 1rpx solid #01b4c5;
+      border: 1px solid #01b4c5;
     }
     .submit {
       flex: 1;

src/module1/pages/setDoctor/index.ts

@@ -39,12 +39,6 @@ Page({
     this.setData({
       id: options.id,
     });
-    if (options.hid) {
-      this.setData({
-        HospitalId: options.hid,
-        HospitalName: options.hname,
-      });
-    }
     app.waitLogin().then(() => {
       this.getDetail();
       this.getList();
@@ -111,6 +105,22 @@ Page({
     });
     this.getList();
   },
+  handleReset() {
+    this.setData({
+      search: "",
+      hospitalId: "",
+      HospitalName: "",
+      provinceId: "",
+      cityId: "",
+      countyId: "",
+      ProvinceName: "",
+      CityName: "",
+      CountyName: "",
+      specialtyId: "",
+      SpecialtyName: "",
+    });
+    this.handleSearch();
+  },
   getList() {
     const { Search, HospitalId, ProvinceId, CityId, CountyId, SpecialtyId } = this.data;
     wx.ajax({
@@ -158,9 +168,17 @@ Page({
     });
   },
   handleHostipal() {
-    const prev = encodeURIComponent(`/module1/pages/setDoctor/index?id=${this.data.id}`);
-    wx.redirectTo({
-      url: `/module1/pages/sHostipal/index?prev=${prev}}`,
+    wx.navigateTo({
+      url: `/module1/pages/sHostipal/index`,
+      events: {
+        acceptDataFromOpenedPage: (data: any) => {
+          this.setData({
+            HospitalId: data.hid,
+            HospitalName: data.hname,
+          });
+          this.handleSearch();
+        },
+      },
     });
   },
   handleArea() {

src/module1/pages/setDoctor/index.wxml

@@ -5,17 +5,20 @@
       <text class="link">{{detail.Name}}医生</text>
       指派核心医生，帮助TA一起反馈病历
     </view>
-    <view class="search">
-      <image class="icon" src="{{imageUrl}}icon-search.png?t={{Timestamp}}"></image>
-      <input
-        model:value="{{Search}}"
-        class="input"
-        placeholder-class="place-input"
-        placeholder="搜索医生名"
-        type="text"
-        confirm-type="search"
-        bindconfirm="handleSearch"
-      />
+    <view class="search-wrap">
+      <view class="search">
+        <image class="icon" src="{{imageUrl}}icon-search.png?t={{Timestamp}}"></image>
+        <input
+          model:value="{{search}}"
+          class="input"
+          placeholder-class="place-input"
+          placeholder="搜索医生名"
+          type="text"
+          confirm-type="search"
+          bindconfirm="handleSearch"
+        />
+      </view>
+      <view class="reset" bind:tap="handleReset">重置</view>
     </view>
     <view class="options">
       <view class="option-wrap" bind:tap="handleHostipal">
@@ -60,7 +63,7 @@
                 <view class="tag">
                   {{hospitalClassification[item.HospitalClassification]}}{{hospitalLevel[item.HospitalLevel]}}
                 </view>
-                <view class="site">{{item.CityName}}/{{item.CountyName}}</view>
+                <view class="site" wx:if="{{item.CityName}}">{{item.CityName}}{{item.CountyName?'/':''}}{{item.CountyName}}</view>
               </view>
               <view class="w-footer">
                 <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>

src/module1/pages/setInfo/index.scss

@@ -1,6 +1,10 @@
 .page {
   overflow: hidden;
   .reject {
+    position: fixed;
+    top: 0;
+    width: 100%;
+    box-sizing: border-box;
     padding: 20rpx 32rpx;
     background-color: #ffedea;
     font-size: 28rpx;

src/module1/pages/setInfo/index.ts

@@ -101,7 +101,7 @@ Page({
   },
   handleHostipal() {
     wx.navigateTo({
-      url: "/module1/pages/sHostipal/index",
+      url: "/module1/pages/sHostipal/index?reg=1",
       events: {
         acceptDataFromOpenedPage: (data) => {
           this.setData({

src/module1/pages/setInfo/index.wxml

@@ -23,7 +23,7 @@
           />
         </view>
       </view>
-      <view class="row row-center">
+      <view class="row">
         <view class="label required">所在医院</view>
         <view class="error-wrap">
           <view class="select-wrap" bind:tap="handleHostipal">

src/module1/pages/userInfo/index.ts

@@ -18,6 +18,8 @@ Page({
   },
   handleLoginOut() {
     wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
       title: "确认退出登录？",
       success(res) {
         if (res.confirm) {

src/pages/cases/index.scss

@@ -224,9 +224,53 @@ page {
           }
         }
         .option {
+          position: relative;
           flex-shrink: 0;
           width: 48rpx;
           height: 48rpx;
+          .o-icon {
+            width: 48rpx;
+            height: 48rpx;
+          }
+          .option-popup {
+            display: none;
+            position: absolute;
+            top: -20rpx;
+            left: 0;
+            transform: translate(-50%, -100%);
+            border-radius: 8rpx;
+            background-color: #fff;
+            box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.1);
+            .op-row {
+              padding: 24rpx;
+              display: flex;
+              align-items: center;
+              white-space: nowrap;
+              gap: 20rpx;
+              font-size: 28rpx;
+              color: #141515;
+              .icon {
+                width: 36rpx;
+                height: 36rpx;
+              }
+            }
+            &::after {
+              position: absolute;
+              bottom: -12rpx;
+              left: 45%;
+              content: "";
+              width: 0;
+              height: 0;
+              border-style: solid;
+              border-width: 27rpx 27rpx 0 27rpx;
+              border-color: #fff transparent transparent transparent;
+            }
+          }
+          &:hover {
+            .option-popup {
+              display: block;
+            }
+          }
         }
       }
       .li-row {
@@ -272,7 +316,7 @@ page {
             font-size: 22rpx;
             color: rgba(0, 180, 197, 1);
             line-height: 32rpx;
-            border: 1rpx solid #bfeff4;
+            border: 1px solid #bfeff4;
             border-radius: 4rpx;
           }
         }

src/pages/cases/index.ts

@@ -1,4 +1,3 @@
-import Dialog from "@vant/weapp/dialog/dialog";
 const app = getApp<IAppOption>();
 
 Page({
@@ -64,6 +63,8 @@ Page({
     orderType: "",
 
     myCaseCount: 0,
+
+    userInfo: {},
   },
   onLoad() {
     this.getTabBar().setData({
@@ -78,6 +79,11 @@ Page({
       this.getHostipalDict();
       this.getDoctorDict();
       this.getArea();
+      app.getUserInfo(this, (userInfo) => {
+        this.getTabBar().setData({
+          userInfo,
+        });
+      });
     });
   },
   getBaseInfo() {
@@ -196,12 +202,31 @@ Page({
     this.handleSearch();
   },
   onClose() {
+    const { show2, showArea } = this.data;
     this.setData({
       show1: false,
       show2: false,
       show3: false,
       showArea: false,
     });
+    if (show2) {
+      this.setData({
+        hospitalId: "",
+        hospitalName: "",
+      });
+      this.handleSearch();
+    }
+    if (showArea) {
+      this.setData({
+        provinceId: "",
+        cityId: "",
+        countyId: "",
+        provinceName: "",
+        cityName: "",
+        countyName: "",
+      });
+      this.handleSearch();
+    }
   },
   handleImagePreview(e) {
     const { url } = e.currentTarget.dataset;
@@ -270,6 +295,7 @@ Page({
       hospitalId: this.data.hospitalId.includes(params.HospitalId) ? [] : [params.HospitalId],
       hospitalName: this.data.hospitalId.includes(params.HospitalId) ? "全部" : params.Name,
     });
+    this.handleSearch();
   },
 
   getDoctorDict() {
@@ -315,7 +341,7 @@ Page({
     const labelId = this.data.labelId;
     const newLabelId = labelId.includes(params.value)
       ? labelId.filter((item) => item !== params.value)
-      : [...labelId, ...params.value];
+      : [...labelId, params.value];
     this.setData({
       labelId: newLabelId,
     });
@@ -368,6 +394,8 @@ Page({
     const { index } = e.currentTarget.dataset;
     const params: any = this.data.list[index];
     wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
       title: "确认删除该病历?",
       success: (e) => {
         if (e.confirm) {
@@ -390,15 +418,20 @@ Page({
   handleQuestion(e) {
     const { index } = e.currentTarget.dataset;
     const message = {
-      1: "",
-      2: "",
+      1: "属于您所在科室的公开的病历",
+      2: "平台所有优质的病历",
     }[index];
-    Dialog.confirm({
-      showCancelButton: false,
-      confirmButtonText: "知道了",
-      message,
+    wx.showModal({
+      confirmColor: "#00B4C5",
+      showCancel: false,
+      confirmText: "知道了",
+      content: message,
     });
   },
+
+  handleCatch() {
+    return false;
+  },
 });
 
 export {};

src/pages/cases/index.wxml

@@ -148,6 +148,7 @@
       </view>
     </view>
     <radio
+      wx:if="{{userInfo.DoctorLevel>1}}"
       class="feedback"
       color="rgba(0, 180, 197, 1)"
       checked="{{needDeal==='1'}}"
@@ -158,25 +159,27 @@
     </radio>
   </view>
   <view class="list">
-    <view class="list-total" wx:if="{{pagination.count}}">共有{{myCaseCount}}条病历</view>
+    <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>
       <view class="li-header">
         <view class="wrap">
-          <view class="id">ID:{{item.caseId}}</view>
+          <view class="id">ID:{{item.caseNo}}</view>
           <view class="status status3" wx:if="{{item.caseStatus==='1'}}">{{item.statusName}}</view>
           <view class="status status2" wx:elif="{{item.caseStatus==='2'}}">{{item.statusName}}</view>
           <view class="status status1" wx:elif="{{item.caseStatus==='3'}}">{{item.statusName}}</view>
           <view class="status status1" wx:elif="{{item.caseStatus==='4'}}">{{item.statusName}}</view>
           <view class="status status3" wx:if="{{item.isOpen==='1'}}">已公开</view>
         </view>
-        <image
-          wx:if="{{item.canDel===1}}"
-          class="option"
-          src="{{imageUrl}}icon-gather.png?t={{Timestamp}}"
-          catch:tap="handleDel"
-          data-index="{{index}}"
-        ></image>
+        <view wx:if="{{item.canDel===1}}" class="option" catch:tap="handleCatch">
+          <image class="o-icon" src="{{imageUrl}}icon-gather.png?t={{Timestamp}}"></image>
+          <view class="option-popup">
+            <view class="op-row" catch:tap="handleDel" data-index="{{index}}">
+              <image class="icon" src="{{imageUrl}}icon-del-dark.png?t={{Timestamp}}"></image>
+              删除
+            </view>
+          </view>
+        </view>
       </view>
       <view class="li-row" wx:if="{{item.caseSubmitTime}}">
         <view class="label">提交时间</view>
@@ -236,7 +239,7 @@
   </view>
   <view class="empty-2" wx:elif="{{nav==='0' && myCaseCount==0}}">
     <image class="e-img" src="{{imageUrl}}empty-2.png?t={{Timestamp}}"></image>
-    <view class="e-tip">你还没有病例哦！</view>
+    <view class="e-tip">你还没有病历哦！</view>
   </view>
   <pagination wx:else pagination="{{pagination}}"></pagination>
 </view>
@@ -352,5 +355,3 @@
     bind:finish="onFinish"
   />
 </van-popup>
-
-<van-dialog id="van-dialog" />

src/pages/chatRoomList/index.scss

@@ -227,7 +227,7 @@ page {
             color: rgba(0, 180, 197, 1);
             line-height: 32rpx;
             border-radius: 4rpx 4rpx 4rpx 4rpx;
-            border: 1rpx solid #bfeff4;
+            border: 1px solid #bfeff4;
           }
         }
       }

src/pages/chatRoomList/index.ts

@@ -1,4 +1,4 @@
-const _app = getApp<IAppOption>()
+const app = getApp<IAppOption>();
 
 Page({
   data: {
@@ -8,11 +8,20 @@ Page({
   onLoad() {
     this.getTabBar().setData({
       active: 3,
-    })
+    });
+    app.waitLogin().then(() => {
+      app.getUserInfo(this, (userInfo) => {
+        this.getTabBar().setData({
+          userInfo,
+        });
+      });
+    });
   },
   handleRoom() {
     wx.navigateTo({
-      url: '/module1/pages/chatRoom/index',
-    })
+      url: "/module1/pages/chatRoom/index",
+    });
   },
-})
+});
+
+export {};

src/pages/home/index.ts

@@ -14,6 +14,11 @@ Page({
     });
     app.waitLogin().then(() => {
       this.handleBindDoctor();
+      app.getUserInfo(this, (userInfo) => {
+        this.getTabBar().setData({
+          userInfo,
+        });
+      });
     });
   },
   handleBindDoctor() {

src/pages/home/index.wxml

@@ -22,7 +22,7 @@
       <view class="content">
         作为您的合作医生
         <view></view>
-        后续病例可邀约对方参与
+        后续病历可邀约对方参与
       </view>
       <view class="sure" bind:tap="handleSure">确认</view>
     </view>

src/pages/my/index.scss

@@ -81,7 +81,7 @@ page {
           font-size: 22rpx;
           color: rgba(0, 180, 197, 1);
           line-height: 32rpx;
-          border: 1rpx solid rgba(191, 239, 244, 1);
+          border: 1px solid rgba(191, 239, 244, 1);
         }
       }
     }

src/pages/my/index.ts

@@ -1,15 +1,24 @@
-const _app = getApp<IAppOption>()
+const app = getApp<IAppOption>();
 
 Page({
   data: {},
   onLoad() {
     this.getTabBar().setData({
       active: 4,
-    })
+    });
+    app.waitLogin().then(() => {
+      app.getUserInfo(this, (userInfo) => {
+        this.getTabBar().setData({
+          userInfo,
+        });
+      });
+    });
   },
   handleUserInfo() {
     wx.navigateTo({
-      url: '/module1/pages/userInfo/index',
-    })
+      url: "/module1/pages/userInfo/index",
+    });
   },
-})
+});
+
+export {}