update

src/echart/components/homeLevel2/index.scss

@@ -406,6 +406,10 @@
         width: 240rpx;
         height: 200rpx;
       }
+      .none-img1 {
+        width: 230rpx;
+        height: 184rpx;
+      }
       .content {
         margin-top: -70rpx;
         text-align: center;

src/echart/components/homeLevel2/index.wxml

@@ -212,7 +212,7 @@
       <view class="name">我邀约的医生</view>
     </view>
     <view class="none">
-      <image class="none-img" src="/images/empty-4.png"></image>
+      <image class="none-img1" src="/images/empty-5.png"></image>
       <view class="content">
         还没有邀约医生哦
       </view>

src/echart/components/homeLevel4/index.wxml

@@ -32,7 +32,7 @@
   <view class="banner">
     <view class="title">待处理事项</view>
     <view class="bg">
-      <view class="b-container" wx:if="{{false}}">
+      <view class="b-container">
         <view class="item">
           <view class="name">待处理病历</view>
           <view class="num">27</view>
@@ -48,7 +48,6 @@
           <view class="num">1</view>
         </view>
       </view>
-      <view class="b-container-none" wx:else>暂时没有需要处理的事项哦~</view>
     </view>
   </view>
   <view

src/module1/pages/casesDetail/index.scss

@@ -739,6 +739,70 @@ page {
         }
       }
     }
+    .one-wrap {
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      gap: 24rpx;
+      .tip {
+        position: absolute;
+        top: -150rpx;
+        left: 0;
+        border-radius: 12rpx;
+        width: 686rpx;
+        box-sizing: border-box;
+        padding: 18rpx 24rpx;
+        background-color: rgba(255, 247, 232, 1);
+        .t-header {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          gap: 20rpx;
+          font-size: 28rpx;
+          color: rgba(255, 125, 0, 1);
+          .date {
+            flex-shrink: 0;
+          }
+        }
+        .content {
+          margin-top: 12rpx;
+          font-size: 28rpx;
+          color: rgba(255, 125, 0, 1);
+        }
+        &::after {
+          position: absolute;
+          bottom: -12rpx;
+          left: 178rpx;
+          content: '';
+          width: 0;
+          height: 0;
+          border-style: solid;
+          border-width: 27rpx 27rpx 0 27rpx;
+          border-color: rgba(255, 247, 232, 1) transparent transparent transparent;
+        }
+      }
+      .cancel {
+        width: 332rpx;
+        height: 84rpx;
+        font-size: 32rpx;
+        color: rgba(1, 180, 197, 1);
+        text-align: center;
+        line-height: 84rpx;
+        border-radius: 96rpx 96rpx 96rpx 96rpx;
+        border: 1px solid #01b4c5;
+      }
+      .sure {
+        width: 330rpx;
+        height: 88rpx;
+        font-size: 32rpx;
+        color: rgba(255, 255, 255, 1);
+        text-align: center;
+        line-height: 88rpx;
+        background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
+        border-radius: 84rpx 84rpx 84rpx 84rpx;
+      }
+    }
   }
 }
 
@@ -911,22 +975,37 @@ page {
   }
   .btn1 {
     margin-top: 32rpx;
-    padding: 14rpx;
+    padding: 12rpx;
     text-align: center;
     font-size: 32rpx;
     color: rgba(255, 255, 255, 1);
     line-height: 44rpx;
     background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
     border-radius: 60rpx 60rpx 60rpx 60rpx;
+    font-weight: bold;
+    .content {
+      font-size: 22rpx;
+      color: rgba(255, 255, 255, 1);
+      line-height: 28rpx;
+      font-weight: normal;
+    }
   }
   .btn2 {
     margin-top: 24rpx;
     text-align: center;
-    padding: 12rpx;
+    padding: 24rpx;
     font-size: 32rpx;
     color: rgba(1, 180, 197, 1);
+    font-weight: bold;
     line-height: 44rpx;
     border-radius: 60rpx 60rpx 60rpx 60rpx;
     border: 1px solid #01b4c5;
   }
+  .btn3{
+    margin-top: 22rpx;
+    text-align: center;
+    padding: 22rpx;
+    font-size: 32rpx;
+    color: rgba(0, 180, 197, 1);
+  }
 }

src/module1/pages/casesDetail/index.ts

@@ -2,12 +2,12 @@ const _app = getApp<IAppOption>()
 
 Page({
   data: {
-    show1: false,
+    show1: false, // 驳回病例
-    show2: false,
+    show2: false, // 优质病例
-    show3: false,
+    show3: false, // 归档
-    show4: false,
+    show4: false, // 取消优质病例
-    show5: false,
+    show5: false, // 取消归档
-    show6: true,
+    show6: false, // 创建聊天室
   },
   onLoad() {},
 })

src/module1/pages/casesDetail/index.wxml

@@ -193,49 +193,63 @@
     </view>
   </view>
   <view class="footer">
-    <view class="wrap">
+    <block wx:if="{{false}}">
-      <view class="w-item">
+      <view class="wrap">
-        <image class="icon" src="/images/case-detail-footer-icon1.png"></image>
+        <view class="w-item">
-        <view class="name">驳回</view>
+          <image class="icon" src="/images/case-detail-footer-icon1.png"></image>
-      </view>
+          <view class="name">驳回</view>
-      <view class="w-item" wx:if="{{false}}">
+        </view>
-        <image class="icon" src="/images/case-detail-footer-icon3.png"></image>
+        <view class="w-item" wx:if="{{false}}">
-        <view class="name">驳回原因</view>
+          <image class="icon" src="/images/case-detail-footer-icon3.png"></image>
-      </view>
+          <view class="name">驳回原因</view>
-      <view class="w-item" wx:if="{{false}}">
+        </view>
-        <image class="icon" src="/images/case-detail-footer-icon2.png"></image>
+        <view class="w-item" wx:if="{{false}}">
-        <view class="name">创建聊天室</view>
+          <image class="icon" src="/images/case-detail-footer-icon2.png"></image>
-      </view>
+          <view class="name">创建聊天室</view>
-      <view class="w-item" wx:if="{{false}}">
+        </view>
-        <image class="icon" src="/images/case-detail-footer-icon4.png"></image>
+        <view class="w-item" wx:if="{{false}}">
-        <view class="name">更多操作</view>
+          <image class="icon" src="/images/case-detail-footer-icon4.png"></image>
-      </view>
+          <view class="name">更多操作</view>
-      <view class="w-item" wx:if="{{false}}">
+        </view>
-        <image class="icon" src="/images/case-detail-footer-icon5.png"></image>
+        <view class="w-item" wx:if="{{false}}">
-        <view class="name">归档</view>
+          <image class="icon" src="/images/case-detail-footer-icon5.png"></image>
-      </view>
+          <view class="name">归档</view>
-      <view class="w-item" wx:if="{{false}}">
+        </view>
-        <image class="icon" src="/images/case-detail-footer-icon6.png"></image>
+        <view class="w-item" wx:if="{{false}}">
-        <view class="name">创建聊天室</view>
+          <image class="icon" src="/images/case-detail-footer-icon6.png"></image>
-      </view>
+          <view class="name">创建聊天室</view>
-      <view class="w-item" wx:if="{{false}}">
+        </view>
-        <image class="icon" src="/images/case-detail-footer-icon7.png"></image>
+        <view class="w-item" wx:if="{{false}}">
-        <view class="name">标为优质</view>
+          <image class="icon" src="/images/case-detail-footer-icon7.png"></image>
+          <view class="name">标为优质</view>
+        </view>
       </view>
-    </view>
+      <view class="btn-wrap">
-    <view class="btn-wrap">
+        <view class="btn1" wx:if="{{false}}">更多操作</view>
-      <view class="btn1" wx:if="{{false}}">更多操作</view>
+        <view class="btn2" wx:if="{{false}}">
-      <view class="btn2" wx:if="{{false}}">
+          <view class="l-btn">@质控医生</view>
-        <view class="l-btn">@质控医生</view>
+          <view class="r-btn">提交反馈</view>
-        <view class="r-btn">提交反馈</view>
+        </view>
+        <view class="btn2" wx:if="{{true}}">
+          <view class="l-btn">创建聊天室</view>
+          <view class="r-btn">提交反馈</view>
+        </view>
       </view>
-      <view class="btn2" wx:if="{{true}}">
+    </block>
-        <view class="l-btn">创建聊天室</view>
+    <view class="one-wrap">
-        <view class="r-btn">提交反馈</view>
+      <view class="tip">
+        <view class="t-header">
+          <view class="title">李俊医生驳回了您的病历</view>
+          <view class="date">2024.09.12</view>
+        </view>
+        <view class="content">原因:资料待补充</view>
       </view>
+      <view class="cancel">驳回记录</view>
+      <view class="sure">提交</view>
     </view>
   </view>
 </view>
+
 <van-dialog
   use-slot
   title=""
@@ -338,7 +352,11 @@
   <view class="dialog6">
     <van-icon name="cross" class="close" />
     <view class="title">确认创建聊天室</view>
-    <view class="btn1">邀约并创建</view>
+    <view class="btn1">
+      邀约并创建
+      <view class="content">您可邀约一位您的合作医生讨论病历</view>
+    </view>
     <view class="btn2">直接创建</view>
+    <view class="btn3">取消</view>
   </view>
 </van-dialog>

src/module1/pages/loginProtool/index.scss

@@ -13,7 +13,7 @@
       height: 44rpx;
     }
     .rule {
-      margin-top: 32rpx;
+      margin: 32rpx 0;
       flex: 1;
       overflow-y: auto;
       overflow-x: hidden;
@@ -49,6 +49,17 @@
         background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
         border-radius: 96rpx 96rpx 96rpx 96rpx;
       }
+      .wait {
+        flex: 1;
+        height: 88rpx;
+        text-align: center;
+        line-height: 88rpx;
+        font-size: 32rpx;
+        color: #fff;
+        opacity: 0.3;
+        background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
+        border-radius: 96rpx 96rpx 96rpx 96rpx;
+      }
     }
   }
 }

src/module1/pages/loginProtool/index.ts

@@ -3,6 +3,14 @@ const app = getApp<IAppOption>()
 Page({
   data: {
     menuButtonInfo: {},
+    wait: true,
   },
   onLoad() {},
+  handleScrollToLower(e) {
+    if (e.detail.direction === 'bottom') {
+      this.setData({
+        wait: false,
+      })
+    }
+  },
 })

src/module1/pages/loginProtool/index.wxml

@@ -1,10 +1,7 @@
-<view
+<view class="page" style="background: url({{imageUrl}}login-bg.png?r={{Timestamp}}) no-repeat top center/100% 300rpx;">
-  class="page"
-  style="background: url({{imageUrl}}login-bg.png?r={{Timestamp}}) no-repeat top center/100% 300rpx;"
->
   <view class="container" style="padding-top:{{menuButtonInfo.bottom}}px;">
     <image class="title" src="/images/login-protool-title.png"></image>
-    <view class="rule">
+    <scroll-view class="rule" scroll-y="{{true}}" bindscrolltolower="handleScrollToLower">
       Lorem ipsum dolor sit, amet consectetur adipisicing elit. Architecto ipsa reiciendis deleniti blanditiis sit
       vitae, reprehenderit laudantium veniam corporis quisquam quas fugiat. Beatae molestias quos unde neque et,
       similique cumque. Lorem ipsum dolor sit, amet consectetur adipisicing elit. Architecto ipsa reiciendis deleniti
@@ -428,10 +425,11 @@
       cumque. Lorem ipsum dolor sit, amet consectetur adipisicing elit. Architecto ipsa reiciendis deleniti blanditiis
       sit vitae, reprehenderit laudantium veniam corporis quisquam quas fugiat. Beatae molestias quos unde neque et,
       similique cumque.
-    </view>
+    </scroll-view>
     <view class="footer">
       <view class="cancel">不同意</view>
-      <view class="sure">同意</view>
+      <view wx:if="{{wait}}" class="wait">请上滑阅读完成</view>
+      <view wx:else class="sure">同意</view>
     </view>
   </view>
 </view>

src/module1/pages/userInfo/index.scss

@@ -2,6 +2,7 @@ page {
   background-color: rgba(246, 246, 246, 1);
 }
 .page {
+  margin-bottom: 32rpx;
   padding: 48rpx 32rpx 0;
   background-color: #fff;
   .upload {
@@ -58,17 +59,15 @@ page {
 }
 
 .btn {
-  margin: 32rpx 32rpx 0;
+  margin: 16rpx 0;
-  width: 686rpx;
   height: 88rpx;
-  border-radius: 84rpx 84rpx 84rpx 84rpx;
+  background-color: #fff;
-  border: 1rpx solid #00b4c5;
   box-sizing: border-box;
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 32rpx;
+  font-size: 28rpx;
-  color: rgba(0, 180, 197, 1);
+  color: rgba(20, 21, 21, 1);
   &:first-of-type {
     margin-top: 48rpx;
   }

src/module1/pages/userInfo/index.wxml

@@ -46,6 +46,7 @@
 </view>
 <view class="btn">退出登录</view>
 <view class="btn">更换手机号</view>
+<view class="btn">注销账号</view>
 
 <van-popup
   show="{{ popupBriefShow }}"

src/pages/home/index.ts

@@ -2,7 +2,7 @@ const _app = getApp<IAppOption>()
 
 Page({
   data: {
-    level: 4,
+    level: 2,
     show1: false,
   },
   onLoad() {