登录模块bug处理

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 src/images/.svn
 miniprogram_npm
+.idea

src/module1/pages/cHostipal/index.scss

@@ -12,6 +12,13 @@ page {
     vertical-align: -6rpx;
   }
 }
+.wait {
+  padding: 16rpx;
+  font-size: 28rpx;
+  color: #f77900;
+  text-align: center;
+  background-color: #FFF7E8;
+}
 .page {
   padding: 32rpx;
   border-radius: 16rpx;
@@ -30,12 +37,12 @@ page {
         color: rgba(133, 133, 133, 1);
         &.required::before {
           margin-right: 10rpx;
-          content: '*';
+          content: "*";
           color: rgba(206, 52, 31, 1);
         }
         &::before {
           margin-right: 28rpx;
-          content: '';
+          content: "";
         }
       }
       .content {

src/module1/pages/cHostipal/index.ts

@@ -37,7 +37,7 @@ Page({
       url: "?r=takeda/reg/last-apply-hospital",
       data: {},
     }).then((res) => {
-      if (!Array.isArray(res)) {
+      if (!Array.isArray(res) && res.AuditStatus !== 1) {
         this.setData({
           applyHostipal: res,
 

src/module1/pages/cHostipal/index.wxml

@@ -1,6 +1,9 @@
 <view class="reject" wx:if="{{applyHostipal && applyHostipal.AuditStatus===2}}">
   <image class="icon" src="{{imageUrl}}icon-error.png?t={{Timestamp}}"></image>
-  审核不通过原因：{{applyHostipal.RejectReason}}。
+  审核不通过原因：{{applyHostipal.RejectReason}}
+</view>
+<view class="wait" wx:if="{{applyHostipal && applyHostipal.AuditStatus===0}}">
+  您提交的{{applyHostipal.Name}}医院信息正在审核中
 </view>
 <view class="page">
   <view class="form">
@@ -89,7 +92,6 @@
 
 <van-popup show="{{ showArea }}" round position="bottom">
   <van-cascader
-    wx:if="{{ showArea }}"
     value="{{ cascaderValue }}"
     title="请选择所在地区"
     options="{{ area }}"

src/module1/pages/login/index.ts

@@ -115,7 +115,7 @@ Page({
   submitCallback() {
     app.globalData.isLogin = 1;
     app.waitLogin().then(() => {
-      wx.reLaunch({ url: "/module1/pages/index/index" });
+      wx.reLaunch({ url: "/module1/pages/setInfo/index" });
     });
   },
   handleProtool() {

src/module1/pages/sHostipal/index.scss

@@ -63,6 +63,7 @@ page {
           font-weight: bold;
         }
         .tag {
+          margin-left: 12rpx;
           vertical-align: 2px;
           padding: 0 8rpx;
           line-height: 32rpx;
@@ -98,7 +99,7 @@ page {
       font-size: 28rpx;
       line-height: 72rpx;
       color: rgba(255, 255, 255, 1);
-      border-radius: 32rpx;
+      border-radius: 82rpx;
       background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%);
     }
   }

src/module1/pages/sHostipal/index.ts

@@ -2,8 +2,6 @@ const app = getApp<IAppOption>();
 
 Page({
   data: {
-    prev: "",
-
     showArea: false,
     fieldNames: { text: "label", value: "value", children: "children" },
 
@@ -26,12 +24,7 @@ Page({
 
     area: [],
   },
-  onLoad(options) {
+  onLoad() {
-    if (options.prev) {
-      this.setData({
-        prev: decodeURIComponent(options.prev),
-      });
-    }
     app.waitLogin(true).then(() => {
       this.getHostipalDict();
       this.getList();
@@ -121,21 +114,14 @@ Page({
 
   handleSelect(e: any) {
     const { index } = e.currentTarget.dataset;
-    const { prev, list } = this.data;
+    const { list } = this.data;
     const item: any = list[index];
-    if (prev) {
+    const eventChannel = this.getOpenerEventChannel();
-      const isParams = this.data.prev.includes("?");
+    eventChannel.emit("acceptDataFromOpenedPage", {
-      wx.redirectTo({
+      hid: item.HospitalId,
-        url: `${this.data.prev}${isParams ? "&" : "?"}hid=${item.HospitalId}&hname=${item.ShortName || item.Name}`,
+      hname: item.ShortName || item.Name,
-      });
+    });
-    } else {
+    wx.navigateBack();
-      const eventChannel = this.getOpenerEventChannel();
-      eventChannel.emit("acceptDataFromOpenedPage", {
-        hid: item.HospitalId,
-        hname: item.ShortName || item.Name,
-      });
-      wx.navigateBack();
-    }
   },
   handlePushDoctor() {
     wx.navigateTo({

src/module1/pages/sHostipal/index.wxml

@@ -9,9 +9,9 @@
       <input
         model:value="{{search}}"
         class="input"
-        placeholder-class="搜索医院名称"
+        placeholder-class="place-input"
         type="text"
-        placeholder="搜索"
+        placeholder="搜索医院名称"
         confirm-type="search"
         bindconfirm="handleSearch"
       />
@@ -24,11 +24,9 @@
   <view class="list">
     <view class="list-item" wx:for="{{list}}" wx:key="HospitalId" bind:tap="handleSelect" data-index="{{index}}">
       <view class="title">
-        <view class="name">
+        <view class="name">{{item.ShortName || item.Name}}</view>
-          {{item.ShortName || item.Name}}
+        <view class="tag">
-          <view class="tag">
+          {{hospitalClassification[item.HospitalClassification]}}{{hospitalLevel[item.HospitalLevel]}}
-            {{hospitalClassification[item.HospitalClassification]}}{{hospitalLevel[item.HospitalLevel]}}
-          </view>
         </view>
       </view>
       <view class="site">
@@ -47,7 +45,6 @@
 
 <van-popup show="{{ showArea }}" round position="bottom">
   <van-cascader
-    wx:if="{{ showArea }}"
     value="{{ cascaderValue }}"
     title="请选择所在地区"
     options="{{ area }}"

src/module1/pages/setCaseDoctor/index.wxml

@@ -81,7 +81,6 @@
 
 <van-popup show="{{ showArea }}" round position="bottom">
   <van-cascader
-    wx:if="{{ showArea }}"
     value="{{ cascaderValue }}"
     title="请选择所在地区"
     options="{{ area }}"

src/module1/pages/setDoctor/index.wxml

@@ -88,7 +88,6 @@
 
 <van-popup show="{{ showArea }}" round position="bottom">
   <van-cascader
-    wx:if="{{ showArea }}"
     value="{{ cascaderValue }}"
     title="请选择所在地区"
     options="{{ area }}"

src/module1/pages/setInfo/index.scss

@@ -1,5 +1,18 @@
 .page {
   overflow: hidden;
+  .reject {
+    padding: 20rpx 32rpx;
+    background-color: #ffedea;
+    font-size: 28rpx;
+    color: #ed4f39;
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    .icon {
+      width: 32rpx;
+      height: 32rpx;
+    }
+  }
   .container {
     margin-top: 244rpx;
     padding: 32rpx 32rpx 250rpx;
@@ -22,7 +35,10 @@
         display: flex;
         align-items: top;
         border-bottom: 1px solid rgba(224, 224, 224, 0.5);
-          line-height: 1;
+        line-height: 1;
+        &.row-center{
+          align-items: center;
+        }
         .label {
           padding-right: 10rpx;
           flex-shrink: 0;

src/module1/pages/setInfo/index.ts

@@ -5,6 +5,7 @@ Page({
     applyDoctorInfo: null,
     applyHostipalInfo: null,
     inviteName: "",
+    RejectReason: "",
     DoctorLevel: {},
     DoctorTitleType: {},
 
@@ -19,18 +20,13 @@ Page({
     RegisterImg: "",
     PositionImg: "",
   },
-  onLoad(options) {
+  onLoad() {
-    if (options.hid) {
-      this.setData({
-        HospitalId: options.hid,
-        HospitalName: options.hname,
-      });
-    }
     app.waitLogin(true).then(() => {
       this.getApplyDoctor();
       this.getLoastApplyHostipal();
       this.getDoctorDict();
       const doctorId = app.globalData.scene?.doctorId;
+
       if (doctorId) {
         this.getDoctorInfo(doctorId);
       }
@@ -55,6 +51,8 @@ Page({
           QualificationImg: res.QualificationImg,
           RegisterImg: res.RegisterImg,
           PositionImg: res.PositionImg,
+
+          RejectReason: res.AuditStatus === 2 ? res.RejectReason : "",
         });
       }
     });
@@ -102,8 +100,17 @@ Page({
     });
   },
   handleHostipal() {
-    wx.redirectTo({
+    wx.navigateTo({
-      url: `/module1/pages/sHostipal/index?prev=${encodeURIComponent("/module1/pages/setInfo/index")}`,
+      url: "/module1/pages/sHostipal/index",
+      events: {
+        acceptDataFromOpenedPage: (data) => {
+          this.setData({
+            HospitalId: data.hid,
+            HospitalName: data.hname,
+          });
+        },
+      },
+      success: () => {},
     });
   },
   handleTitleType(e) {
@@ -113,7 +120,7 @@ Page({
     });
   },
   handleSubmit() {
-    const {
+    let {
       AuditId,
       Name,
       HospitalId,
@@ -125,6 +132,11 @@ Page({
       RegisterImg,
       PositionImg,
     } = this.data;
+    const scene = app.globalData.scene;
+    if (scene?.doctorId) {
+      InviteDoctorId = scene.doctorId;
+    }
+
     if (!Name) {
       wx.showToast({
         title: "请输入姓名",
@@ -189,11 +201,17 @@ Page({
         PositionImg,
       },
     }).then((res) => {
-      wx.navigateTo({
+      app.globalData.scene = null;
+      wx.reLaunch({
         url: `/module1/pages/setInfoResult/index?isf=${res.isFollow}&iname=${res.InviteDoctorName}`,
       });
     });
   },
+  handleChangeHostipal() {
+    wx.navigateTo({
+      url: "/module1/pages/cHostipal/index",
+    });
+  },
 });
 
 export {};

src/module1/pages/setInfo/index.wxml

@@ -2,22 +2,28 @@
   class="page"
   style="background: url({{imageUrl}}set-info-bg.png?r={{Timestamp}}) no-repeat top center/100% 356rpx;"
 >
+  <view class="reject" wx:if="{{RejectReason}}">
+    <image class="icon" src="{{imageUrl}}icon-error.png?t={{Timestamp}}"></image>
+    审核不通过原因：{{RejectReason}}
+  </view>
   <view class="container">
     <view class="invite" wx:if="{{inviteName}}">{{inviteName}}医生为您的邀约医生</view>
+    <view class="invite" wx:else>您没有邀约医生，可能会影响您的审核</view>
     <view class="card">
-      <view class="row">
+      <view class="row row-center">
         <view class="label required">您的姓名</view>
         <view class="content">
           <input
             model:value="{{Name}}"
             class="input"
+            maxlength="12"
             placeholder-class="place-input"
             placeholder="请输入您的真实姓名"
             type="text"
           />
         </view>
       </view>
-      <view class="row">
+      <view class="row row-center">
         <view class="label required">所在医院</view>
         <view class="error-wrap">
           <view class="select-wrap" bind:tap="handleHostipal">
@@ -27,7 +33,11 @@
           <view class="error" wx:if="{{applyHostipalInfo && applyHostipalInfo.AuditStatus===0}}">
             您提交的{{applyHostipalInfo.ShortName || applyHostipalInfo.Name}}医院信息待审核
           </view>
-          <view class="error" wx:if="{{applyHostipalInfo && applyHostipalInfo.AuditStatus===2}}">
+          <view
+            class="error"
+            wx:if="{{applyHostipalInfo && applyHostipalInfo.AuditStatus===2}}"
+            bind:tap="handleChangeHostipal"
+          >
             您提交的{{applyHostipalInfo.ShortName || applyHostipalInfo.Name}}医院信息已驳回 去修改>
           </view>
         </view>
@@ -53,6 +63,7 @@
             type="text"
             placeholder="请输入"
             model:value="{{OtherTitle}}"
+            maxlength="10"
           />
         </view>
       </view>
@@ -63,7 +74,7 @@
         <view class="credentials">
           <view class="c-title">
             <view class="tip">请上传高清图片</view>
-            <view class="ex">查看示例</view>
+            <!-- <view class="ex">查看示例</view> -->
           </view>
           <view class="files">
             <uploadFile class="upload" bind:file="handleFile" data-key="RegisterImg">

src/module1/pages/setInfoResult/index.wxml

@@ -9,7 +9,7 @@
     <view class="notice">
       <view wx:if="{{InviteDoctorName}}">
         已将信息提交给
-        <text class="link">王大志医生</text>
+        <text class="link">{{InviteDoctorName}}医生</text>
       </view>
       审核通过后，您可进入罕心守护项目
     </view>

src/module1/pages/userInfo/index.ts

@@ -1,4 +1,4 @@
-const _app = getApp<IAppOption>()
+const _app = getApp<IAppOption>();
 
 Page({
   data: {
@@ -8,12 +8,29 @@ Page({
   onLoad() {},
   changePhone() {
     wx.navigateTo({
-      url: '/module1/pages/changePhone/index',
+      url: "/module1/pages/changePhone/index",
-    })
+    });
   },
   handleBrief() {
     this.setData({
       popupBriefShow: true,
-    })
+    });
   },
-})
+  handleLoginOut() {
+    wx.showModal({
+      title: "确认退出登录？",
+      success(res) {
+        if (res.confirm) {
+          wx.ajax({
+            method: "POST",
+            url: "?r=takeda/account/reg-logout",
+          }).then((res) => {
+            wx.reLaunch({
+              url: "/module1/pages/login/index",
+            });
+          });
+        }
+      },
+    });
+  },
+});

src/pages/cases/index.wxml

@@ -51,7 +51,7 @@
                 mode="date"
                 bind:change="handleSearch"
               >
-                <view class="date-content">{{submitTimeBegin||'开始'}}</view>
+                <view class="date-content">{{submitTimeBegin || '开始'}}</view>
               </picker>
               -
               <picker
@@ -80,7 +80,7 @@
                 mode="date"
                 bind:change="handleSearch"
               >
-                <view class="date-content">{{feedbackTimeBegin||'开始'}}</view>
+                <view class="date-content">{{feedbackTimeBegin || '开始'}}</view>
               </picker>
               -
               <picker
@@ -107,7 +107,7 @@
       <view class="row">
         <view class="label">地区</view>
         <view class="picker-content" bind:tap="handleArea">
-          <view class="content">{{cityName+countyName || '地区'}}</view>
+          <view class="content">{{cityName + countyName || '地区'}}</view>
           <van-icon name="arrow-down" />
         </view>
       </view>
@@ -293,7 +293,7 @@
             </view>
           </view>
           <view class="site">
-            {{item.ProvinceName === item.CityName ? '':item.ProvinceName}}
+            {{item.ProvinceName === item.CityName ? '' : item.ProvinceName}}
             {{item.CityName}}{{item.CountyName}}{{item.Address}}
           </view>
         </view>
@@ -344,7 +344,6 @@
 
 <van-popup show="{{ showArea }}" round position="bottom">
   <van-cascader
-    wx:if="{{ showArea }}"
     value="{{ cascaderValue }}"
     title="请选择所在地区"
     options="{{ area }}"

src/pages/home/index.ts

@@ -36,4 +36,9 @@ Page({
       });
     }
   },
+  handleSure() {
+    this.setData({
+      show1: false,
+    });
+  },
 });

src/pages/home/index.wxml

@@ -24,7 +24,7 @@
         <view></view>
         后续病例可邀约对方参与
       </view>
-      <view class="sure">确认</view>
+      <view class="sure" bind:tap="handleSure">确认</view>
     </view>
   </view>
 </van-popup>