bug处理

src/app.ts

@@ -35,6 +35,7 @@ App<IAppOption>({
     scene: null,
 
     needDeal: "",
+    caseNav: "0",
   },
   onLaunch() {
     Page = page as WechatMiniprogram.Page.Constructor;

src/echart/components/homeLevel1/index.scss

@@ -59,7 +59,7 @@
     .title {
       position: relative;
       z-index: 1;
-      padding: 18rpx 30rpx;
+      padding: 22rpx 30rpx 18rpx;
       width: 262rpx;
       height: 116rpx;
       font-size: 28rpx;

src/echart/components/homeLevel2/index.scss

@@ -99,7 +99,7 @@
     .title {
       position: relative;
       z-index: 1;
-      padding: 18rpx 30rpx;
+      padding: 22rpx 30rpx 18rpx;
       width: 262rpx;
       height: 116rpx;
       font-size: 28rpx;

src/echart/components/homeLevel3/index.scss

@@ -99,7 +99,7 @@
     .title {
       position: relative;
       z-index: 1;
-      padding: 18rpx 30rpx;
+      padding: 22rpx 30rpx 18rpx;
       width: 262rpx;
       height: 116rpx;
       font-size: 28rpx;
@@ -171,6 +171,7 @@
       left: 0;
       padding: 16rpx 24rpx;
       font-size: 28rpx;
+      font-weight: bold;
       color: #fff;
     }
     .more {

src/echart/components/homeLevel4/index.scss

@@ -98,7 +98,7 @@
     .title {
       position: relative;
       z-index: 1;
-      padding: 18rpx 30rpx;
+      padding: 22rpx 30rpx 18rpx;
       width: 262rpx;
       height: 116rpx;
       font-size: 28rpx;
@@ -178,7 +178,7 @@
       top: 8rpx;
       left: 296rpx;
       .picker-content {
-        padding: 4rpx 24rpx;
+        padding: 8rpx 24rpx;
         display: flex;
         gap: 18rpx;
         font-size: 28rpx;

src/echart/components/homeLevel4/index.ts

@@ -605,7 +605,9 @@ Component({
       wx.ajax({
         method: "GET",
         url: "?r=takeda/doctor/case",
-        data: {},
+        data: {
+          DepartmentId: this.data.DepartmentId,
+        },
       }).then((res) => {
         this.setData({
           case: res,
@@ -647,6 +649,7 @@ Component({
       });
     },
     handleCase() {
+      app.globalData.caseNav = "3";
       wx.switchTab({
         url: "/pages/cases/index",
       });

src/module1/pages/cHostipal/index.scss

@@ -30,6 +30,9 @@ page {
       padding: 32rpx 0;
       display: flex;
       border-bottom: 1px solid rgba(224, 224, 224, 0.5);
+      &:last-of-type{
+        border: none;
+      }
       .label {
         flex-shrink: 0;
         width: 6em;

src/module1/pages/chatRoomInfo/index.ts

@@ -4,6 +4,8 @@ Page({
   data: { id: "", caseId: "", list: [], canInvite: false },
   onLoad(options) {
     this.setData({ id: options.id, caseId: options.cid });
+  },
+  onShow() {
     app.waitLogin().then(() => {
       this.getInvite();
       this.getDetail();

src/module1/pages/doctorRankList/index.scss

@@ -9,6 +9,7 @@ page {
     background: #fff linear-gradient(180deg, #f1feff 0%, #ffffff 7%, #ffffff 100%);
     border: 2rpx solid #ffffff;
     .table {
+      margin-bottom: 100rpx;
       .thead {
         padding: 22rpx 0;
         display: flex;

src/module1/pages/loginProtool/index.wxml

@@ -1,4 +1,4 @@
-<view class="page" style="background: url({{imageUrl}}login-bg.png?r={{Timestamp}}) no-repeat top center/100% 300rpx;">
+<view class="page" style="background: url({{imageUrl}}login-protool-bg.png?r={{Timestamp}}) no-repeat top center/100% 316rpx;">
   <view class="container" style="padding-top:{{menuButtonInfo.bottom}}px;">
     <image class="title" src="{{imageUrl}}login-protool-title.png?t={{Timestamp}}"></image>
     <scroll-view class="rule" scroll-y="{{true}}" bindscrolltolower="handleScrollToLower">

src/module1/pages/org4/index.ts

@@ -58,6 +58,8 @@ Page({
       DepartmentId,
       DepartmentName,
     });
+    this.getManageDoctor();
+    this.getTree()
   },
   handleInvite() {
     wx.navigateTo({

src/module1/pages/setChatDoctor/index.ts

@@ -263,9 +263,13 @@ Page({
         doctorId: DoctorId,
       },
     }).then((res) => {
-      wx.reLaunch({
-        url: `/module1/pages/chatRoom/index?id=${res.roomId || roomId}`,
-      });
+      if (create) {
+        wx.reLaunch({
+          url: `/module1/pages/chatRoom/index?id=${res.roomId || roomId}`,
+        });
+      } else {
+        wx.navigateBack();
+      }
     });
   },
   handleBack() {

src/module1/pages/setInfo/index.scss

@@ -19,7 +19,7 @@
   .container {
     margin-top: 244rpx;
     padding: 32rpx 32rpx 250rpx;
-    background: rgba(246, 246, 246, 1) linear-gradient(180deg, #e5f5f7 0%, #f6f6f6 50%) top center/100% 258rpx;
+    background: rgba(246, 246, 246, 1) linear-gradient(180deg, #e5f5f7 0%, #f6f6f6 50%) no-repeat top center/100% 258rpx;
     border-radius: 32rpx 32rpx 0 0;
     .invite {
       padding: 22rpx 28rpx;
@@ -27,6 +27,14 @@
       font-size: 32rpx;
       color: #fff;
       background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .icon{
+        flex-shrink: 0;
+        width: 40rpx;
+        height: 40rpx;
+      }
     }
     .card {
       margin-top: 24rpx;
@@ -39,6 +47,9 @@
         align-items: top;
         border-bottom: 1px solid rgba(224, 224, 224, 0.5);
         line-height: 1;
+        &:last-child {
+          border: none;
+        }
         &.row-center {
           align-items: center;
         }

src/module1/pages/setInfo/index.ts

@@ -1,3 +1,4 @@
+import { parseScene } from "@/utils/util";
 const app = getApp<IAppOption>();
 
 Page({
@@ -220,8 +221,55 @@ Page({
     });
   },
   handleScan() {
-    wx.scanCode({
-      success() {},
+    wx.showModal({
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      confirmText: "继续",
+      title: " 扫描已入驻医生的邀约码 ",
+      content: "绑定成功后，医生可审核您的入驻申请 ",
+      success: (res) => {
+        if (res.confirm) {
+          wx.scanCode({
+            scanType: ["qrCode"],
+            success: (res) => {
+              if (res.errMsg === "scanCode:ok") {
+                if (res.path.includes("pages/start/index")) {
+                  const scene: any = parseScene(res.path.split("?scene=")[1]);
+                  if (scene?.doctorId) {
+                    app.globalData.scene = scene;
+                    this.getDoctorInfo(scene.doctorId as string);
+                    wx.showToast({
+                      title: "扫码成功",
+                      icon: "none",
+                    });
+                  } else {
+                    wx.showToast({
+                      title: "扫码失败",
+                      icon: "none",
+                    });
+                  }
+                } else {
+                  wx.showToast({
+                    title: "扫码失败",
+                    icon: "none",
+                  });
+                }
+              } else {
+                wx.showToast({
+                  title: "扫码失败",
+                  icon: "none",
+                });
+              }
+            },
+            fail() {
+              wx.showToast({
+                title: "扫码失败",
+                icon: "none",
+              });
+            },
+          });
+        }
+      },
     });
   },
 });

src/module1/pages/setInfo/index.wxml

@@ -7,8 +7,14 @@
   style="background: url({{imageUrl}}set-info-bg.png?r={{Timestamp}}) no-repeat top center/100% 356rpx;"
 >
   <view class="container">
-    <view class="invite" wx:if="{{inviteName}}">{{inviteName}}医生为您的邀约医生</view>
-    <view class="invite" wx:else>您没有邀约医生，可能会影响您的审核</view>
+    <view class="invite" wx:if="{{inviteName}}">
+      {{inviteName}}医生为您的邀约医生
+      <image class="icon" src="{{imageUrl}}scan.png?r={{Timestamp}}" bind:tap="handleScan"></image>
+    </view>
+    <view class="invite" wx:else>
+      您没有邀约医生，可能会影响您的审核
+      <image class="icon" src="{{imageUrl}}scan.png?r={{Timestamp}}" bind:tap="handleScan"></image>
+    </view>
     <view class="card">
       <view class="row row-center">
         <view class="label required">您的姓名</view>
@@ -82,11 +88,11 @@
               <image wx:else class="u-img" src="{{imageUrl}}credentials1.png?t={{Timestamp}}"></image>
             </uploadFile>
             <uploadFile class="upload" bind:file="handleFile" data-key="QualificationImg">
-              <image wx:if="{{QualificationImg}}"  mode="aspectFill" class="u-img" src="{{QualificationImg}}"></image>
+              <image wx:if="{{QualificationImg}}" mode="aspectFill" class="u-img" src="{{QualificationImg}}"></image>
               <image wx:else class="u-img" src="{{imageUrl}}credentials2.png?t={{Timestamp}}"></image>
             </uploadFile>
             <uploadFile class="upload" bind:file="handleFile" data-key="PositionImg">
-              <image wx:if="{{PositionImg}}"  mode="aspectFill" class="u-img" src="{{PositionImg}}"></image>
+              <image wx:if="{{PositionImg}}" mode="aspectFill" class="u-img" src="{{PositionImg}}"></image>
               <image wx:else class="u-img" src="{{imageUrl}}credentials3.png?t={{Timestamp}}"></image>
             </uploadFile>
           </view>

src/module1/pages/userInfo/index.ts

@@ -123,6 +123,7 @@ Page({
       show1: false,
       show2: false,
     });
+    this.getUserInfo();
   },
   handleSubmit() {
     const { Img, Name, Introduce, DepartmentId, SpecialtyId } = this.data;

src/pages/cases/index.ts

@@ -66,6 +66,8 @@ Page({
     myCaseCount: 0,
 
     userInfo: {},
+
+    entryDetail: false,
   },
   onLoad() {
     this.getTabBar().setData({
@@ -73,7 +75,14 @@ Page({
     });
   },
   onShow() {
-    this.handleNav({ currentTarget: { dataset: { nav: "0", noSearch: true } } });
+    if (this.data.entryDetail) {
+      this.setData({
+        entryDetail: false,
+      });
+      return;
+    }
+    this.handleNav({ currentTarget: { dataset: { nav: app.globalData.caseNav, noSearch: true } } });
+    app.globalData.caseNav = "0";
     this.setData({
       needDeal: app.globalData.needDeal,
     });
@@ -271,6 +280,9 @@ Page({
   },
   handleDetail(e) {
     const { params } = e.currentTarget.dataset;
+    this.setData({
+      entryDetail: true,
+    });
     wx.navigateTo({
       url: `/module1/pages/casesDetail/index?id=${params.caseId}`,
     });

typings/index.d.ts

@@ -10,6 +10,7 @@ interface IAppOption {
     scene: null | { [key: string]: any };
 
     needDeal: "" | "1";
+    caseNav: "0" | "1" | "2" | "3";
   };
   userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback;
   waitLogin: (waitLoginState?: boolean) => Promise<any>;