1.6开发&bug处理

src/app.ts

@@ -57,7 +57,9 @@ App<IAppOption>({
     if (options.query.scene) {
       this.globalData.scene = parseScene(options.query.scene);
     }
-    if (this.globalData.loginState) {
+
+    const reSourceScene: number[] = [1007, 1008, 1043];
+    if (this.globalData.loginState && reSourceScene.includes(options.scene)) {
       this.globalData.loginState = "";
       this.initLogin();
     }

src/components/doctorAvatar/index.ts

@@ -47,12 +47,13 @@ Component({
       });
     },
     async handleDetail() {
-      const did = this.data.did;
+      const { did, popupDoctorDetail, showDetail } = this.data;
-      if (!did) return;
+      if (!did || showDetail) return;
-      const { DoctorTitleType } = await this.getDoctorDict();
       this.setData({
         showDetail: true,
       });
+      if (Object.keys(popupDoctorDetail).length) return;
+      const { DoctorTitleType } = await this.getDoctorDict();
       wx.ajax({
         method: "GET",
         url: "?r=takeda/doctor/detail",

src/components/doctorAvatar/index.wxml

@@ -21,8 +21,8 @@
 </view>
 
 <popupDoctorDetail
-  wx:if="{{did}}"
+  wx:if="{{did && showDetail}}"
   show="{{showDetail}}"
   params="{{popupDoctorDetail}}"
-  bind:close="handlePopupClose"
+  catch:close="handlePopupClose"
 ></popupDoctorDetail>

src/components/popupDoctorDetail/index.ts

@@ -28,5 +28,8 @@ Component({
     onClose() {
       this.triggerEvent("close");
     },
+    handleTap() {
+      return false;
+    },
   },
 });

src/components/popupDoctorDetail/index.wxml

@@ -1,4 +1,4 @@
-<van-popup show="{{ show }}" catch:close="onClose" custom-style="background:transparent">
+<van-popup show="{{ show }}" catch:close="onClose" custom-style="background:transparent" catch:tap="handleTap">
   <view class="doctor-detail">
     <van-icon class="close" name="cross" catch:tap="onClose" />
     <view class="title">医生详情</view>

src/echart/components/doctorLevel3/index.ts

@@ -28,7 +28,6 @@ Component({
       this.getTake();
       this.getCase();
       this.getManageDoctor();
-      this.getTips();
     },
   },
   /**
@@ -78,17 +77,6 @@ Component({
       const { index } = e.currentTarget.dataset;
       this.triggerEvent("question", index);
     },
-    getTips() {
-      wx.ajax({
-        method: "GET",
-        url: "?r=takeda/doctor/get-tips",
-        data: {},
-      }).then((res) => {
-        this.setData({
-          tips: res,
-        });
-      });
-    },
   },
 });
 

src/echart/components/doctorLevel3/index.wxml

@@ -42,39 +42,19 @@
       <view class="b-container">
         <view class="item">
           <view class="name">待处理病历</view>
-          <view class="num">
+          <view class="num">{{take.dealCaseCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.dealCaseCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipDealCase===1}}"></view>
-            </view>
-          </view>
         </view>
         <view class="item">
           <view class="name">病历更新</view>
-          <view class="num">
+          <view class="num">{{take.notReadFeedBackCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.notReadFeedBackCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipCaseUpdate===1}}"></view>
-            </view>
-          </view>
         </view>
         <view class="item">
           <view class="name">学习窗消息</view>
-          <view class="num">
+          <view class="num">{{take.notReadChatRoomCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.notReadChatRoomCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipChatRoom===1}}"></view>
-            </view>
-          </view>
         </view>
         <view class="item">
           <view class="name">医生待审核</view>
-          <view class="num">
+          <view class="num">{{take.toAuditDoctorCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.toAuditDoctorCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipDoctorWaitAudit===1}}"></view>
-            </view>
-          </view>
         </view>
       </view>
     </view>

src/echart/components/doctorLevel4/index.wxml

@@ -37,39 +37,19 @@
       <view class="b-container">
         <view class="item">
           <view class="name">待处理病历</view>
-          <view class="num">
+          <view class="num">{{take.dealCaseCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.dealCaseCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipDealCase===1}}"></view>
-            </view>
-          </view>
         </view>
         <view class="item">
           <view class="name">病历更新</view>
-          <view class="num">
+          <view class="num">{{take.notReadFeedBackCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.notReadFeedBackCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipCaseUpdate===1}}"></view>
-            </view>
-          </view>
         </view>
         <view class="item">
           <view class="name">学习窗消息</view>
-          <view class="num">
+          <view class="num">{{take.notReadChatRoomCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.notReadChatRoomCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipChatRoom===1}}"></view>
-            </view>
-          </view>
         </view>
         <view class="item">
           <view class="name">医生待审核</view>
-          <view class="num">
+          <view class="num">{{take.toAuditDoctorCount*1 || '--'}}</view>
-            <view class="num-center">
-              {{take.toAuditDoctorCount*1 || '--'}}
-              <view class="dot" wx:if="{{tips.tipDoctorWaitAudit===1}}"></view>
-            </view>
-          </view>
         </view>
       </view>
     </view>

src/echart/components/homeLevel1/index.scss

@@ -396,6 +396,43 @@
     .none {
       padding-bottom: 54rpx;
       text-align: center;
+      .cooperate-options {
+        padding-bottom: 20rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 18rpx;
+        .co-item {
+          flex: 1;
+          padding: 18rpx 36rpx;
+          background: linear-gradient(180deg, #e5f5f7 0%, #ffffff 50%);
+          box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
+          border-radius: 16rpx 16rpx 16rpx 16rpx;
+          border: 2rpx solid #ffffff;
+          display: flex;
+          align-items: center;
+          .icon {
+            width: 76rpx;
+            height: 76rpx;
+          }
+          .co-content {
+            position: relative;
+            padding-left: 8rpx;
+            font-size: 32rpx;
+            color: #141515;
+            &.dot::after {
+              content: "";
+              position: absolute;
+              top: -10rpx;
+              right: -10rpx;
+              width: 16rpx;
+              height: 16rpx;
+              background-color: #ed4f39;
+              border-radius: 50%;
+            }
+          }
+        }
+      }
       .none-img {
         width: 240rpx;
         height: 200rpx;
@@ -424,17 +461,16 @@
   overflow: hidden;
   .img {
     position: absolute;
-    top: 0;
+    bottom: 0;
     left: 0;
     width: 100%;
-    height: 100%;
+    min-height: 100vh;
     opacity: 0;
     display: block;
   }
   .close {
     position: absolute;
-    left: 50%;
+    left: 80%;
-    transform: translateX(-50%);
     z-index: 1;
     width: 64rpx;
     height: 64rpx;

src/echart/components/homeLevel1/index.ts

@@ -37,11 +37,13 @@ Component({
 
   lifetimes: {
     attached() {
-      this.getTake();
+      app.waitLogin(true).then(() => {
-      this.getCase();
+        this.getTake();
-      this.getCooperate();
+        this.getCase();
-      this.getTips();
+        this.getCooperate();
-      this.getGuide();
+        this.getTips();
+        this.getGuide();
+      });
     },
   },
   /**
@@ -156,6 +158,18 @@ Component({
         });
       });
     },
+
+    getGuide() {
+      wx.ajax({
+        method: "GET",
+        url: "?r=takeda/account/get-guide",
+        data: {},
+      }).then((res) => {
+        this.setData({
+          guideShow: res.tipStatus === 2,
+        });
+      });
+    },
     touchmovePreview() {
       return false;
     },
@@ -170,18 +184,6 @@ Component({
         guide: Number(this.data.guide) + 1,
       });
     },
-    getGuide() {
-      wx.ajax({
-        method: "GET",
-        url: "?r=takeda/account/get-guide",
-        data: {},
-      }).then((res) => {
-        this.setData({
-          guideShow: res.tipStatus === 2,
-          // guideShow: true,
-        });
-      });
-    },
     handleGuideClose() {
       this.setData({
         guideShow: false,

src/echart/components/homeLevel1/index.wxml

@@ -130,7 +130,7 @@
         class="doctor"
         wx:for="{{cooperateList}}"
         wx:key="DoctorId"
-        bind:tap="handleCooperateDetail"
+        catch:tap="handleCooperateDetail"
         data-index="{{index}}"
       >
         <doctorAvatar
@@ -172,6 +172,16 @@
       <view class="name">我合作的医生</view>
     </view>
     <view class="none">
+      <view class="cooperate-options">
+        <view class="co-item" bind:tap="handleApplication">
+          <image class="icon" src="{{imageUrl}}cooperate-icon1.png?t={{Timestamp}}"></image>
+          <view class="co-content {{tips.tipDoctorAudit===1 && 'dot'}}">申请记录</view>
+        </view>
+        <view class="co-item" bind:tap="handleApplicationDoctor">
+          <image class="icon" src="{{imageUrl}}cooperate-icon2.png?t={{Timestamp}}"></image>
+          <view class="co-content">绑定医生</view>
+        </view>
+      </view>
       <image class="none-img" src="{{imageUrl}}empty-4.png?t={{Timestamp}}"></image>
       <view class="content">
         还没有合作医生哦
@@ -183,16 +193,10 @@
 
 <view wx:if="{{guideShow}}" class="preview" bind:touchmove="touchmovePreview" bind:tap="handleTapPreview">
   <image
-    class="close"
-    style="top:{{menuButtonInfo.top+60}}px"
-    src="{{imageUrl}}guide-close.png?t={{Timestamp}}"
-    catch:tap="handleGuideClose"
-  ></image>
-  <image
     class="img {{index==guide && 'show'}}"
     src="{{imageUrl}}guide{{item}}.png?t={{Timestamp}}"
     wx:for="{{guideList}}"
     wx:key="*this"
-    mode="aspectFill"
+    mode="widthFix"
   ></image>
 </view>

src/echart/components/homeLevel2/index.scss

@@ -339,6 +339,43 @@
         max-height: 0;
         overflow: hidden;
       }
+      .cooperate-options {
+        padding-bottom: 20rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 18rpx;
+        .co-item {
+          flex: 1;
+          padding: 18rpx 36rpx;
+          background: linear-gradient(180deg, #e5f5f7 0%, #ffffff 50%);
+          box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
+          border-radius: 16rpx 16rpx 16rpx 16rpx;
+          border: 2rpx solid #ffffff;
+          display: flex;
+          align-items: center;
+          .icon {
+            width: 76rpx;
+            height: 76rpx;
+          }
+          .content {
+            position: relative;
+            padding-left: 8rpx;
+            font-size: 32rpx;
+            color: #141515;
+            &.dot::after {
+              content: "";
+              position: absolute;
+              top: -10rpx;
+              right: -10rpx;
+              width: 16rpx;
+              height: 16rpx;
+              background-color: #ed4f39;
+              border-radius: 50%;
+            }
+          }
+        }
+      }
       .doctor {
         position: relative;
         margin-bottom: 20rpx;
@@ -473,6 +510,43 @@
     .none {
       padding-bottom: 54rpx;
       text-align: center;
+      .cooperate-options {
+        padding-bottom: 20rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 18rpx;
+        .co-item {
+          flex: 1;
+          padding: 18rpx 36rpx;
+          background: linear-gradient(180deg, #e5f5f7 0%, #ffffff 50%);
+          box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
+          border-radius: 16rpx 16rpx 16rpx 16rpx;
+          border: 2rpx solid #ffffff;
+          display: flex;
+          align-items: center;
+          .icon {
+            width: 76rpx;
+            height: 76rpx;
+          }
+          .co-content {
+            position: relative;
+            padding-left: 8rpx;
+            font-size: 32rpx;
+            color: #141515;
+            &.dot::after {
+              content: "";
+              position: absolute;
+              top: -10rpx;
+              right: -10rpx;
+              width: 16rpx;
+              height: 16rpx;
+              background-color: #ed4f39;
+              border-radius: 50%;
+            }
+          }
+        }
+      }
       .none-img {
         width: 240rpx;
         height: 200rpx;
@@ -494,3 +568,32 @@
     }
   }
 }
+
+.preview {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  z-index: 1000000000;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  .img {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    min-height: 100vh;
+    opacity: 0;
+    display: block;
+  }
+  .close {
+    position: absolute;
+    left: 80%;
+    z-index: 1;
+    width: 64rpx;
+    height: 64rpx;
+  }
+  .show {
+    opacity: 1;
+  }
+}

src/echart/components/homeLevel2/index.ts

@@ -26,15 +26,22 @@ Component({
     inviteList: [],
     newCaseShow: false,
     tips: {},
+
+    guide: 0,
+    guideShow: false,
+    guideList: ["1-1", "1-2", "1-3"],
   },
 
   lifetimes: {
     attached() {
-      this.getTake();
+      app.waitLogin(true).then(() => {
-      this.getCase();
+        this.getTake();
-      this.getCooperate();
+        this.getCase();
-      this.getInvite();
+        this.getCooperate();
-      this.getTips();
+        this.getInvite();
+        this.getTips();
+        this.getGuide();
+      });
     },
   },
   /**
@@ -184,6 +191,18 @@ Component({
       const { index } = e.currentTarget.dataset;
       this.selectComponent(`#invite${index}`).handleDetail();
     },
+
+    handleApplication() {
+      wx.navigateTo({
+        url: "/module1/pages/applicationRecords/index",
+      });
+    },
+    handleApplicationDoctor() {
+      wx.navigateTo({
+        url: "/module1/pages/setApplicationDoctor/index",
+      });
+    },
+
     getTips() {
       wx.ajax({
         method: "GET",
@@ -195,6 +214,43 @@ Component({
         });
       });
     },
+
+    getGuide() {
+      wx.ajax({
+        method: "GET",
+        url: "?r=takeda/account/get-guide",
+        data: {},
+      }).then((res) => {
+        this.setData({
+          guideShow: res.tipStatus === 2,
+          // guideShow: true,
+        });
+      });
+    },
+    touchmovePreview() {
+      return false;
+    },
+    handleTapPreview() {
+      if (this.data.guide === this.data.guideList.length - 1) {
+        this.setData({
+          guideShow: false,
+        });
+        this.handleGuideClose();
+      }
+      this.setData({
+        guide: Number(this.data.guide) + 1,
+      });
+    },
+    handleGuideClose() {
+      this.setData({
+        guideShow: false,
+      });
+      wx.ajax({
+        method: "POST",
+        url: "?r=takeda/account/close-guide",
+        data: {},
+      });
+    },
   },
 });
 

src/echart/components/homeLevel2/index.wxml

@@ -162,11 +162,21 @@
       </view>
     </view>
     <view id="fold1" class="doctor-list {{fold1 && 'doctor-list-fold'}}" style="--fold-height: {{foldHeight1}}px;">
+      <view class="cooperate-options">
+        <view class="co-item" bind:tap="handleApplication">
+          <image class="icon" src="{{imageUrl}}cooperate-icon1.png?t={{Timestamp}}"></image>
+          <view class="content {{tips.tipDoctorAudit===1 && 'dot'}}">申请记录</view>
+        </view>
+        <view class="co-item" bind:tap="handleApplicationDoctor">
+          <image class="icon" src="{{imageUrl}}cooperate-icon2.png?t={{Timestamp}}"></image>
+          <view class="content">绑定医生</view>
+        </view>
+      </view>
       <view
         class="doctor"
         wx:for="{{cooperateList}}"
         wx:key="DoctorId"
-        bind:tap="handleCooperateDetail"
+        catch:tap="handleCooperateDetail"
         data-index="{{index}}"
       >
         <doctorAvatar
@@ -208,6 +218,16 @@
       <view class="name">我合作的医生</view>
     </view>
     <view class="none">
+      <view class="cooperate-options">
+        <view class="co-item" bind:tap="handleApplication">
+          <image class="icon" src="{{imageUrl}}cooperate-icon1.png?t={{Timestamp}}"></image>
+          <view class="co-content {{tips.tipDoctorAudit===1 && 'dot'}}">申请记录</view>
+        </view>
+        <view class="co-item" bind:tap="handleApplicationDoctor">
+          <image class="icon" src="{{imageUrl}}cooperate-icon2.png?t={{Timestamp}}"></image>
+          <view class="co-content">绑定医生</view>
+        </view>
+      </view>
       <image class="none-img" src="{{imageUrl}}empty-4.png?t={{Timestamp}}"></image>
       <view class="content">
         还没有合作医生哦
@@ -234,7 +254,7 @@
         class="doctor"
         wx:for="{{inviteList}}"
         wx:key="DoctorId"
-        bind:tap="handleInviteDetail"
+        catch:tap="handleInviteDetail"
         data-index="{{index}}"
       >
         <doctorAvatar
@@ -282,3 +302,13 @@
     </view>
   </view>
 </view>
+
+<view wx:if="{{guideShow}}" class="preview" bind:touchmove="touchmovePreview" bind:tap="handleTapPreview">
+  <image
+    class="img {{index==guide && 'show'}}"
+    src="{{imageUrl}}guide{{item}}.png?t={{Timestamp}}"
+    wx:for="{{guideList}}"
+    wx:key="*this"
+    mode="widthFix"
+  ></image>
+</view>

src/echart/components/homeLevel3/index.scss

@@ -262,3 +262,32 @@
     }
   }
 }
+
+.preview {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  z-index: 1000000000;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  .img {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    min-height: 100vh;
+    opacity: 0;
+    display: block;
+  }
+  .close {
+    position: absolute;
+    left: 80%;
+    z-index: 1;
+    width: 64rpx;
+    height: 64rpx;
+  }
+  .show {
+    opacity: 1;
+  }
+}

src/echart/components/homeLevel3/index.ts

@@ -19,13 +19,23 @@ Component({
     take: {},
     case: {} as any,
     doctorCount: {},
+
+    tips: {},
+
+    guide: 0,
+    guideShow: false,
+    guideList: ["3-1", "1-2", "3-3"],
   },
 
   lifetimes: {
     attached() {
-      this.getTake();
+      app.waitLogin(true).then(() => {
-      this.getCase();
+        this.getTake();
-      this.getManageDoctor();
+        this.getCase();
+        this.getManageDoctor();
+        this.getTips();
+        this.getGuide();
+      });
     },
   },
   /**
@@ -121,6 +131,54 @@ Component({
         url: "/pages/cases/index",
       });
     },
+
+    getTips() {
+      wx.ajax({
+        method: "GET",
+        url: "?r=takeda/doctor/get-tips",
+        data: {},
+      }).then((res) => {
+        this.setData({
+          tips: res,
+        });
+      });
+    },
+
+    getGuide() {
+      wx.ajax({
+        method: "GET",
+        url: "?r=takeda/account/get-guide",
+        data: {},
+      }).then((res) => {
+        this.setData({
+          guideShow: res.tipStatus === 2,
+        });
+      });
+    },
+    touchmovePreview() {
+      return false;
+    },
+    handleTapPreview() {
+      if (this.data.guide === this.data.guideList.length - 1) {
+        this.setData({
+          guideShow: false,
+        });
+        this.handleGuideClose();
+      }
+      this.setData({
+        guide: Number(this.data.guide) + 1,
+      });
+    },
+    handleGuideClose() {
+      this.setData({
+        guideShow: false,
+      });
+      wx.ajax({
+        method: "POST",
+        url: "?r=takeda/account/close-guide",
+        data: {},
+      });
+    },
   },
 });
 

src/echart/components/homeLevel3/index.wxml

@@ -46,7 +46,7 @@
           <view class="num">
             <view class="num-center">
               {{take.dealCaseCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.dealCaseCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipDealCase===1}}"></view>
             </view>
           </view>
         </view>
@@ -55,7 +55,7 @@
           <view class="num">
             <view class="num-center">
               {{take.notReadFeedBackCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.notReadFeedBackCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipCaseUpdate===1}}"></view>
             </view>
           </view>
         </view>
@@ -64,7 +64,7 @@
           <view class="num">
             <view class="num-center">
               {{take.notReadChatRoomCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.notReadChatRoomCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipChatRoom===1}}"></view>
             </view>
           </view>
         </view>
@@ -73,7 +73,7 @@
           <view class="num">
             <view class="num-center">
               {{take.toAuditDoctorCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.toAuditDoctorCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipDoctorWaitAudit===1}}"></view>
             </view>
           </view>
         </view>
@@ -170,3 +170,13 @@
     </view>
   </view>
 </view>
+
+<view wx:if="{{guideShow}}" class="preview" bind:touchmove="touchmovePreview" bind:tap="handleTapPreview">
+  <image
+    class="img {{index==guide && 'show'}}"
+    src="{{imageUrl}}guide{{item}}.png?t={{Timestamp}}"
+    wx:for="{{guideList}}"
+    wx:key="*this"
+    mode="widthFix"
+  ></image>
+</view>

src/echart/components/homeLevel4/index.scss

@@ -507,3 +507,32 @@
     }
   }
 }
+
+.preview {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  z-index: 1000000000;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  .img {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    min-height: 100vh;
+    opacity: 0;
+    display: block;
+  }
+  .close {
+    position: absolute;
+    left: 80%;
+    z-index: 1;
+    width: 64rpx;
+    height: 64rpx;
+  }
+  .show {
+    opacity: 1;
+  }
+}

src/echart/components/homeLevel4/index.ts

@@ -40,28 +40,38 @@ Component({
     rankList: [],
 
     newCaseShow: false,
+
+    tips: {},
+
+    guide: 0,
+    guideShow: false,
+    guideList: ["4-1", "1-2", "3-3"],
   },
 
   lifetimes: {
     attached() {
-      const { DepartmentId, DepartmentName } = this.data.userInfo.Department[0];
+      app.waitLogin(true).then(() => {
-      this.setData({
+        const { DepartmentId, DepartmentName } = this.data.userInfo.Department[0];
-        Department: this.data.userInfo.Department,
+        this.setData({
-        DepartmentId,
+          Department: this.data.userInfo.Department,
-        DepartmentName,
+          DepartmentId,
-      });
+          DepartmentName,
-      this.getTake();
+        });
-      this.getCase();
+        this.getTake();
-      this.getManageDoctor();
+        this.getCase();
-      this.getRankList();
+        this.getManageDoctor();
+        this.getRankList();
+        this.getTips();
+        this.getGuide();
 
-      this.waitEchart(async () => {
+        this.waitEchart(async () => {
-        this.getChat1();
+          this.getChat1();
-        this.getChat2();
+          this.getChat2();
-        this.getChat3();
+          this.getChat3();
-        // const chart1: any = await this.initChart1();
+          // const chart1: any = await this.initChart1();
-        // const chart2: any = await this.initChart2();
+          // const chart2: any = await this.initChart2();
-        // const chart3: any = await this.initChart3();
+          // const chart3: any = await this.initChart3();
+        });
       });
     },
   },
@@ -720,6 +730,53 @@ Component({
         url: "/pages/cases/index",
       });
     },
+    getTips() {
+      wx.ajax({
+        method: "GET",
+        url: "?r=takeda/doctor/get-tips",
+        data: {},
+      }).then((res) => {
+        this.setData({
+          tips: res,
+        });
+      });
+    },
+
+    getGuide() {
+      wx.ajax({
+        method: "GET",
+        url: "?r=takeda/account/get-guide",
+        data: {},
+      }).then((res) => {
+        this.setData({
+          guideShow: res.tipStatus === 2,
+        });
+      });
+    },
+    touchmovePreview() {
+      return false;
+    },
+    handleTapPreview() {
+      if (this.data.guide === this.data.guideList.length - 1) {
+        this.setData({
+          guideShow: false,
+        });
+        this.handleGuideClose();
+      }
+      this.setData({
+        guide: Number(this.data.guide) + 1,
+      });
+    },
+    handleGuideClose() {
+      this.setData({
+        guideShow: false,
+      });
+      wx.ajax({
+        method: "POST",
+        url: "?r=takeda/account/close-guide",
+        data: {},
+      });
+    },
   },
 });
 

src/echart/components/homeLevel4/index.wxml

@@ -41,7 +41,7 @@
           <view class="num">
             <view class="num-center">
               {{take.dealCaseCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.dealCaseCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipDealCase===1}}"></view>
             </view>
           </view>
         </view>
@@ -50,7 +50,7 @@
           <view class="num">
             <view class="num-center">
               {{take.notReadFeedBackCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.notReadFeedBackCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipCaseUpdate===1}}"></view>
             </view>
           </view>
         </view>
@@ -59,7 +59,7 @@
           <view class="num">
             <view class="num-center">
               {{take.notReadChatRoomCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.notReadChatRoomCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipChatRoom===1}}"></view>
             </view>
           </view>
         </view>
@@ -68,7 +68,7 @@
           <view class="num">
             <view class="num-center">
               {{take.toAuditDoctorCount*1 || '--'}}
-              <view class="dot" wx:if="{{take.toAuditDoctorCount*1}}"></view>
+              <view class="dot" wx:if="{{tips.tipDoctorWaitAudit===1}}"></view>
             </view>
           </view>
         </view>
@@ -288,3 +288,13 @@
     </view>
   </view>
 </view>
+
+<view wx:if="{{guideShow}}" class="preview" bind:touchmove="touchmovePreview" bind:tap="handleTapPreview">
+  <image
+    class="img {{index==guide && 'show'}}"
+    src="{{imageUrl}}guide{{item}}.png?t={{Timestamp}}"
+    wx:for="{{guideList}}"
+    wx:key="*this"
+    mode="widthFix"
+  ></image>
+</view>

src/module1/pages/applicationRecords/index.scss

@@ -5,37 +5,13 @@ page {
   .header {
     padding: 32rpx;
     background-color: #fff;
-    border-radius: 0 0 0 32rpx;
+    border-radius: 0 0 0 64rpx;
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-end;
     gap: 48rpx;
-    .range {
-      padding: 0 20rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      width: 390rpx;
-      background: #f6f6f6;
-      border-radius: 12rpx 12rpx 12rpx 12rpx;
-      .date {
-        flex: 1;
-        .date-content {
-          padding: 16rpx;
-          font-size: 28rpx;
-          color: #999999;
-          line-height: 1;
-          text-align: center;
-        }
-      }
-      .icon {
-        flex-shrink: 0;
-        width: 32rpx;
-        height: 32rpx;
-      }
-    }
     .status {
-      flex: 1;
+      width: 50%;
       display: flex;
       align-items: center;
       gap: 16rpx;

src/module1/pages/applicationRecords/index.ts

@@ -5,6 +5,22 @@ Page({
     feedbackTimeBegin: "",
     feedbackTimeEnd: "",
 
+    status: [
+      {
+        id: "0",
+        value: "待审核",
+      },
+      {
+        id: "1",
+        value: "审核通过",
+      },
+      {
+        id: "2",
+        value: "审核驳回",
+      },
+    ],
+    auditStatus: "",
+
     list: [],
     pagination: {
       page: 1,
@@ -17,12 +33,25 @@ Page({
       this.getList();
     });
   },
+  handleStatus(e) {
+    this.setData({
+      auditStatus: e.detail.value,
+    });
+    this.getList();
+  },
+  onClose() {
+    this.setData({
+      auditStatus: "",
+    });
+    this.getList();
+  },
   getList(newPage = 1) {
     wx.ajax({
       method: "GET",
       url: "?r=takeda/doctor/apply-list",
       data: {
         page: newPage,
+        auditStatus: this.data.auditStatus || -1,
       },
     }).then((res) => {
       const list = res.page === 1 ? res.list : [...this.data.list, ...res.list];

src/module1/pages/applicationRecords/index.wxml

@@ -1,36 +1,10 @@
 <view class="page">
   <view class="header">
-    <view class="range">
-      <picker
-        class="date"
-        end="{{feedbackTimeEnd}}"
-        model:value="{{feedbackTimeBegin}}"
-        mode="date"
-        bind:change="handleSearch"
-        bindcancel="handleCancel"
-        data-key="feedbackTimeBegin"
-      >
-        <view class="date-content">{{feedbackTimeBegin || '开始'}}</view>
-      </picker>
-      -
-      <picker
-        class="date"
-        start="{{feedbackTimeBegin}}"
-        model:value="{{feedbackTimeEnd}}"
-        mode="date"
-        bind:change="handleSearch"
-        bindcancel="handleCancel"
-        data-key="feedbackTimeEnd"
-      >
-        <view class="date-content">{{feedbackTimeEnd || '结束'}}</view>
-      </picker>
-      <image class="icon" src="{{imageUrl}}icon-date.png?t={{Timestamp}}"></image>
-    </view>
     <view class="status">
       <view class="label">状态</view>
-      <picker class="picker" mode="region" bindchange="onFinish" bindcancel="onClose" bind:tap="handleArea">
+      <picker class="picker" range="{{status}}" range-key="value" bind:change="handleStatus" bindcancel="onClose">
         <view class="picker-content">
-          <view class="content">{{cityName + countyName || '全部'}}</view>
+          <view class="content">{{status[auditStatus].value || '全部'}}</view>
           <van-icon name="arrow-down" />
         </view>
       </picker>

src/module1/pages/auditDoctorDetail/index.wxml

@@ -19,7 +19,7 @@
   </view>
   <view class="card">
     <view class="user">
-      <image class="avatar" src="{{detail.Img}}"></image>
+      <image class="avatar" mode="aspectFill" src="{{detail.Img}}"></image>
     </view>
     <view class="row">
       <view class="label">姓名</view>
@@ -34,6 +34,7 @@
       <view class="photo-wrap">
         <image
           class="photo"
+          wx:if="{{detail.RegisterImg}}"
           src="{{detail.RegisterImg}}"
           mode="aspectFill"
           catch:tap="handlePreview"
@@ -43,6 +44,7 @@
         </image>
         <image
           class="photo"
+          wx:if="{{detail.QualificationImg}}"
           src="{{detail.QualificationImg}}"
           mode="aspectFill"
           catch:tap="handlePreview"
@@ -52,6 +54,7 @@
         </image>
         <image
           class="photo"
+          wx:if="{{detail.PositionImg}}"
           src="{{detail.PositionImg}}"
           mode="aspectFill"
           catch:tap="handlePreview"

src/module1/pages/auditDoctorList/index.scss

@@ -35,12 +35,14 @@ page {
             line-height: 44rpx;
             .left {
               .name {
+                display: inline;
                 margin-right: 16rpx;
                 font-size: 32rpx;
                 color: rgba(20, 21, 21, 1);
                 font-weight: bold;
               }
               .label {
+                display: inline-block;
                 font-size: 28rpx;
                 color: rgba(20, 21, 21, 1);
               }
@@ -56,6 +58,7 @@ page {
             font-size: 28rpx;
             color: rgba(133, 133, 133, 1);
             .content {
+              display: inline;
               margin-right: 16rpx;
             }
             .tag {

src/module1/pages/auditDoctorList/index.ts

@@ -12,6 +12,7 @@ Page({
   },
   onShow() {
     app.waitLogin().then(() => {
+      this.getDoctorDict()
       this.getList();
     });
   },

src/module1/pages/auditDoctorList/index.wxml

@@ -4,7 +4,7 @@
   <view class="list">
     <view class="list-item" wx:for="{{list}}" wx:key="AuditId">
       <view class="user">
-        <image class="avatar" src="{{item.Img}}"></image>
+        <image class="avatar" mode="aspectFill" src="{{item.Img}}"></image>
         <view class="wrap">
           <view class="w-header">
             <view class="left">
@@ -22,6 +22,7 @@
       </view>
       <view class="photo-wrap">
         <image
+          wx:if="{{item.RegisterImg}}"
           class="photo"
           src="{{item.RegisterImg}}"
           mode="aspectFill"
@@ -29,6 +30,7 @@
           data-url="{{item.RegisterImg}}"
         ></image>
         <image
+          wx:if="{{item.QualificationImg}}"
           class="photo"
           src="{{item.QualificationImg}}"
           mode="aspectFill"
@@ -36,6 +38,7 @@
           data-url="{{item.QualificationImg}}"
         ></image>
         <image
+          wx:if="{{item.PositionImg}}"
           class="photo"
           src="{{item.PositionImg}}"
           mode="aspectFill"

src/module1/pages/setApplicationDoctor/index.ts

@@ -40,6 +40,8 @@ Page({
     DoctorId: "",
 
     show: false,
+
+    doctorRejectCount: 0,
   },
   onLoad(options) {
     if (options.hid) {
@@ -228,10 +230,11 @@ Page({
     const { list } = this.data;
     this.setData({
       DoctorId: (list as any)[index].doctorId,
+      doctorRejectCount: (list as any)[index].doctorRejectCount,
     });
   },
-  handleSubmit() {
+  handleSubmit({ exempt = false }) {
-    const { DoctorId } = this.data;
+    const { DoctorId, doctorRejectCount } = this.data;
     if (!DoctorId) {
       wx.showToast({
         title: "请选择医生",
@@ -239,7 +242,12 @@ Page({
       });
       return;
     }
-
+    if (doctorRejectCount > 0 && !exempt) {
+      this.setData({
+        show: true,
+      });
+      return;
+    }
     wx.ajax({
       method: "POST",
       url: "?r=takeda/doctor/apply-binding",
@@ -252,6 +260,16 @@ Page({
       });
     });
   },
+
+  handleOk() {
+    this.handleCancel();
+    this.handleSubmit({ exempt: true });
+  },
+  handleCancel() {
+    this.setData({
+      show: false,
+    });
+  },
   handleBack() {
     wx.navigateBack();
   },

src/module1/pages/setApplicationDoctor/index.wxml

@@ -102,10 +102,10 @@
     <image class="badge" src="{{imageUrl}}icon-reject.png?t={{Timestamp}}" mode="aspectFit"></image>
     <view class="p-container">
       <view class="title">该医生驳回过您的申请</view>
-      <view class="content">您选择的医生有驳回记录， 驳回3次后您将无法再次申请绑定此医生</view>
+      <view class="content">您选择的医生有驳回记录，驳回3次后您将无法再次申请绑定此医生</view>
       <view class="footer">
-        <view class="cancel" bind:tap="handleOk">取消申请</view>
+        <view class="cancel" bind:tap="handleCancel">取消申请</view>
-        <view class="ok" bind:tap="handleCancel">继续申请</view>
+        <view class="ok" bind:tap="handleOk">继续申请</view>
       </view>
     </view>
   </view>

src/pages/home/index.ts

@@ -30,8 +30,9 @@ Page({
       this.getDoctorDict();
       this.getHostipalDict();
       app.getUserInfo(this, (userInfo) => {
+        const level = userInfo.IsSuper === 1 ? 4 : userInfo.DoctorLevel;
         this.setData({
-          level: userInfo.IsSuper === 1 ? 4 : userInfo.DoctorLevel,
+          level,
         });
         this.getTabBar().setData({
           userInfo,