1.6产品意见优化

src/module1/pages/applicationRecords/index.ts

@@ -7,6 +7,10 @@ Page({
 
     status: [
       {
+        id: "",
+        value: "全部",
+      },
+      {
         id: "0",
         value: "待审核",
       },
@@ -19,6 +23,11 @@ Page({
         value: "审核驳回",
       },
     ],
+    statusNames: {
+      0: "待审核",
+      1: "审核通过",
+      2: "审核驳回",
+    },
     auditStatus: "",
 
     list: [],
@@ -35,7 +44,7 @@ Page({
   },
   handleStatus(e) {
     this.setData({
-      auditStatus: e.detail.value,
+      auditStatus: e.detail.value === 0 ? "" : String(e.detail.value - 1),
     });
     this.getList();
   },

src/module1/pages/applicationRecords/index.wxml

@@ -4,7 +4,7 @@
       <view class="label">状态</view>
       <picker class="picker" range="{{status}}" range-key="value" bind:change="handleStatus" bindcancel="onClose">
         <view class="picker-content">
-          <view class="content">{{status[auditStatus].value || '全部'}}</view>
+          <view class="content">{{statusNames[auditStatus] || '全部'}}</view>
           <van-icon name="arrow-down" />
         </view>
       </picker>

src/module1/pages/casesDetail/index.wxml

@@ -263,6 +263,10 @@
             <image class="icon" src="{{imageUrl}}case-detail-footer-icon2.png?t={{Timestamp}}"></image>
             <view class="name">进入学习窗</view>
           </view>
+          <view class="m-item" wx:if="{{auth.canInvite && foldAuth.canInvite}}" bind:tap="handleInvite">
+            <image class="icon" src="{{imageUrl}}case-detail-footer-icon9.png?t={{Timestamp}}"></image>
+            <view class="name">邀约上级</view>
+          </view>
           <view class="m-item" wx:if="{{auth.canArchive && foldAuth.canArchive}}" bind:tap="handleArchive">
             <image class="icon" src="{{imageUrl}}case-detail-footer-icon4.png?t={{Timestamp}}"></image>
             <view class="name">归档</view>
@@ -283,10 +287,6 @@
             <image class="icon" src="{{imageUrl}}case-detail-footer-icon6.png?t={{Timestamp}}"></image>
             <view class="name">{{detail.isHighQuality==='1'?'取消优质':'标为优质'}}</view>
           </view>
-          <view class="m-item" wx:if="{{auth.canInvite && foldAuth.canInvite}}" bind:tap="handleInvite">
-            <image class="icon" src="{{imageUrl}}case-detail-footer-icon9.png?t={{Timestamp}}"></image>
-            <view class="name">邀约上级</view>
-          </view>
           <view class="m-item" wx:if="{{auth.canDel && foldAuth.canDel}}" bind:tap="handleDel">
             <image class="icon" src="{{imageUrl}}case-detail-footer-icon10.png?t={{Timestamp}}"></image>
             <view class="name">删除</view>
@@ -328,6 +328,10 @@
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon2.png?t={{Timestamp}}"></image>
         <view class="name">进入学习窗</view>
       </view>
+      <view class="w-item" wx:if="{{auth.canInvite && !foldAuth.canInvite}}" bind:tap="handleInvite">
+        <image class="icon" src="{{imageUrl}}case-detail-footer-icon9.png?t={{Timestamp}}"></image>
+        <view class="name">邀约上级</view>
+      </view>
       <view class="w-item" wx:if="{{auth.canArchive && !foldAuth.canArchive}}" bind:tap="handleArchive">
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon4.png?t={{Timestamp}}"></image>
         <view class="name">归档</view>
@@ -340,10 +344,6 @@
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon6.png?t={{Timestamp}}"></image>
         <view class="name">{{detail.isHighQuality==='1'?'取消优质':'标为优质'}}</view>
       </view>
-      <view class="w-item" wx:if="{{auth.canInvite && !foldAuth.canInvite}}" bind:tap="handleInvite">
-        <image class="icon" src="{{imageUrl}}case-detail-footer-icon9.png?t={{Timestamp}}"></image>
-        <view class="name">邀约上级</view>
-      </view>
       <view class="w-item" wx:if="{{auth.canDel && !foldAuth.canDel}}" bind:tap="handleDel">
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon10.png?t={{Timestamp}}"></image>
         <view class="name">删除</view>

src/module1/pages/entryCasesResult/index.scss

@@ -1,12 +1,15 @@
 .page {
-  padding: 60rpx 34rpx;
+  padding: 200rpx 34rpx 60rpx;
+  &.page-code {
+    padding-top: 60rpx;
+  }
   .badge {
     display: block;
     margin: 0 auto;
     width: 200rpx;
     height: 200rpx;
   }
-  .title{
+  .title {
     font-size: 48rpx;
     text-align: center;
     font-weight: bold;
@@ -18,25 +21,8 @@
     color: rgba(20, 21, 21, 1);
     text-align: center;
   }
-  .btn1 {
+  .block-code {
-    margin: 86rpx 124rpx 0;
+    height: 400rpx;
-    padding: 22rpx;
-    font-size: 32rpx;
-    color: #fff;
-    line-height: 44rpx;
-    text-align: center;
-    background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
-    border-radius: 60rpx 60rpx 60rpx 60rpx;
-  }
-  .btn2 {
-    margin: 32rpx 124rpx 0;
-    padding: 20rpx 14rpx;
-    font-size: 32rpx;
-    color: rgba(1, 180, 197, 1);
-    line-height: 44rpx;
-    text-align: center;
-    border: 1px solid rgba(1, 180, 197, 1);
-    border-radius: 60rpx 60rpx 60rpx 60rpx;
   }
   .code {
     margin: 90rpx auto 0;
@@ -46,10 +32,41 @@
     height: 296rpx;
     border-radius: 16rpx;
   }
-  .tip{
+  .tip {
     margin-top: 32rpx;
     text-align: center;
     font-size: 32rpx;
     color: rgba(153, 153, 153, 1);
   }
+  .wrap-btns {
+    margin-top: 84rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 24px;
+    .btn1 {
+      // margin: 86rpx 124rpx 0;
+      max-width: 60%;
+      flex: 1;
+      padding: 24rpx;
+      font-size: 32rpx;
+      color: #fff;
+      line-height: 44rpx;
+      text-align: center;
+      background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
+      border-radius: 60rpx 60rpx 60rpx 60rpx;
+    }
+    .btn2 {
+      // margin: 32rpx 124rpx 0;
+      flex: 1;
+      max-width: 60%;
+      padding: 22rpx 14rpx;
+      font-size: 32rpx;
+      color: rgba(1, 180, 197, 1);
+      line-height: 44rpx;
+      text-align: center;
+      border: 1px solid rgba(1, 180, 197, 1);
+      border-radius: 60rpx 60rpx 60rpx 60rpx;
+    }
+  }
 }

src/module1/pages/entryCasesResult/index.ts

@@ -1,10 +1,25 @@
+import { getCurrentPage } from "@/miniprogram_npm/@vant/weapp/common/utils";
+
 const _app = getApp<IAppOption>();
 
+// 返回逻辑
+// 1、一级医生和二级医生录入病历、提交反馈后，提交成功页面
+// 按钮： 查看病历详情  返回病历列表
+//
+// 2、二级医生在病历详情页，选择邀请上级后，成功页面：查看病历详情  返回病历列表
+//
+// 从学习窗：
+// 3、学习窗顶部进入病历详情：选择邀请上级后，成功页面，按钮：返回学习窗；
+//
+// 4、学习窗顶部进入病历详情：提交反馈后，按钮：返回学习窗
+
 Page({
   data: {
     caseId: "",
     codeUrl: "",
     isFollow: "",
+
+    btnType: "1",
   },
   onLoad(options) {
     this.setData({
@@ -23,8 +38,21 @@ Page({
     });
   },
   handleDetail() {
-    wx.navigateTo({
+    // console.log(getCurrentPage());
+    wx.reLaunch({
       url: `/module1/pages/casesDetail/index?id=${this.data.caseId}`,
     });
+    // wx.reLaunch({
+    //   url: "/pages/cases/index",
+    //   success: () => {
+    //     wx.navigateTo({
+    //       url: `/module1/pages/casesDetail/index?id=${this.data.caseId}`,
+    //       fail(err){
+    //         console.log(err)
+    //       }
+    //     });
+    //   },
+    // });
   },
+  handleBackRoom() {},
 });

src/module1/pages/entryCasesResult/index.wxml

@@ -1,9 +1,24 @@
-<view class="page">
+<view class="page {{codeUrl && 'page-code'}}">
   <image class="badge" src="{{imageUrl}}icon-resolve.png?t={{Timestamp}}" mode="scaleToFill"></image>
   <view class="title">提交成功</view>
   <view class="desc">病历提交后医生将收到消息提醒</view>
-  <view class="btn1" bind:tap="handleDetail">查看病历详情</view>
+  <view wx:if="{{!codeUrl}}" class="block-code"></view>
-  <view class="btn2" bind:tap="handleBackCase">返回病历列表</view>
   <image wx:if="{{codeUrl}}" class="code" src="{{codeUrl}}" mode="scaleToFill" show-menu-by-longpress></image>
   <view wx:if="{{codeUrl}}" class="tip">关注公众号接收病历反馈消息</view>
+  <view class="wrap-btns">
+    <block wx:if="{{btnType==='1'}}">
+      <view class="btn2" bind:tap="handleDetail">查看病历详情</view>
+      <view class="btn1" bind:tap="handleBackCase">返回病历列表</view>
+    </block>
+    <block wx:if="{{btnType==='2'}}">
+      <view class="btn2" bind:tap="handleDetail">查看病历详情</view>
+      <view class="btn1" bind:tap="handleBackCase">返回病历列表</view>
+    </block>
+    <block wx:if="{{btnType==='3'}}">
+      <view class="btn1" bind:tap="handleBackRoom">返回学习窗</view>
+    </block>
+    <block wx:if="{{btnType==='4'}}">
+      <view class="btn1" bind:tap="handleBackRoom">返回学习窗</view>
+    </block>
+  </view>
 </view>