医生端联调

src/pages/d_interactive/index.ts

@@ -96,7 +96,7 @@ Page({
     wx.showModal({
       title: '提示',
       content: '确认清空消息吗？',
-      confirmColor: '#62bed0',
+      confirmColor: '#8c75d0',
       success: (res) => {
         if (res.confirm) {
           wx.ajax({

src/pages/d_interactiveDoctor/index.scss

@@ -40,6 +40,7 @@ page {
             color: rgba(255, 255, 255, 1);
             font-weight: normal;
             background-color: rgba(185, 130, 255, 1);
+            vertical-align: middle;
           }
         }
         .date {
@@ -521,7 +522,7 @@ page {
       background-color: #fff;
       &.active {
         color: #fff;
-        background-color: rgba(103, 186, 202, 1);
+        background-color: #B982FF;
       }
     }
   }
@@ -532,7 +533,7 @@ page {
     font-size: 36rpx;
     color: rgba(255, 255, 255, 1);
     font-weight: bold;
-    background: #67baca;
+    background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%);
     display: flex;
     align-items: center;
     justify-content: center;

src/pages/d_interactiveDoctor/index.ts

@@ -178,7 +178,7 @@ Page({
         title: '完善出诊时间？',
         content: '您还没有录入出诊时间',
         confirmText: '录入',
-        confirmColor: '#62bed0',
+        confirmColor: '#8c75d0',
         success: (res) => {
           if (res.confirm) {
             wx.navigateTo({
@@ -192,7 +192,7 @@ Page({
     wx.showModal({
       title: '提示',
       content: '将您的出诊时间发送给患者？',
-      confirmColor: '#62bed0',
+      confirmColor: '#8c75d0',
       success: (res) => {
         if (res.confirm) {
           this.setData({
@@ -275,7 +275,7 @@ Page({
     }[id]
     wx.showModal({
       title,
-      confirmColor: '#62bed0',
+      confirmColor: '#8c75d0',
       success: (res) => {
         if (res.confirm) {
           this.handleSendUser(id)
@@ -411,7 +411,7 @@ Page({
       title: '',
       content: '您将给患者发送复诊时间填写卡片？',
       confirmText: '发送',
-      confirmColor: '#62bed0',
+      confirmColor: '#8c75d0',
       success: (res) => {
         if (res.confirm) {
           wx.ajax({

src/pages/d_interactiveDoctor/index.wxml

@@ -1,5 +1,5 @@
 <navbar fixed title="互动" custom-style="background:{{background}}">
-    <van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
+  <van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
 </navbar>
 <view
   class="page"
@@ -12,10 +12,10 @@
         <view class="name">
           <view class="left">
             {{patientDetail.patientName}}
-            <view class="edc">EDC患者</view>
+            <view class="edc" wx:if="{{patientDetail.IsEDC==='1'}}">EDC患者</view>
           </view>
         </view>
-        <view class="date">上次就诊时间:2025-08-10</view>
+        <view class="date">入组时间:2025-08-10</view>
       </view>
       <view class="detail" bind:tap="handlePatientDetail">查看档案</view>
     </view>

src/pages/d_invite/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "重症肌无力医生端",
+  "navigationBarTitleText": " 我的医生码",
   "navigationStyle": "default",
   "usingComponents": {
     "customPoster": "/components/customPoster/index"

src/pages/d_invite/index.scss

@@ -1,5 +1,5 @@
 page{
-  background-color: #c65174;
+  background-color: #d68dfc;
 }
 .page {
   position: relative;

src/pages/d_invite/index.ts

@@ -21,7 +21,7 @@ Page({
       wx.showLoading({
         title: '加载中',
       })
-      app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORINVITEPATIENT' })
+      app.zdMpBehavior({ doctor: true, PageName: 'PG_DOCTORINVITEPATIENT' })
       this.getDetail()
     })
   },

src/pages/d_patient/index.scss

@@ -165,6 +165,7 @@ page {
               border-radius: 4rpx;
               font-weight: normal;
               background-color: rgba(185, 130, 255, 1);
+              vertical-align: middle;
             }
           }
         }

src/pages/d_patient/index.ts

@@ -61,6 +61,11 @@ Page({
     app.waitLogin().then((_res) => {
       app.zdMpBehavior({ doctor: true, PageName: 'PG_DOCTORPATIENTLIST' })
       this.getList()
+      app.getUserInfo(2).then((userInfo) => {
+        this.setData({
+          userInfo,
+        })
+      })
     })
   },
   handleReset() {

src/pages/d_patient/index.wxml

@@ -15,7 +15,7 @@
         bind:tap="handleTapSearch"
       />
     </view>
-    <view class="navbar">
+    <view class="navbar" wx:if="{{userInfo.IsEDC==='1'}}">
       <view class="nav {{active===0 && 'active'}}" bind:tap="handleNav" data-active="{{0}}">
         我的患者
         <view class="dot" wx:if="{{unReadCount>0}}">{{unReadCount}}</view>

src/pages/d_patientDetail/index.scss

@@ -42,8 +42,8 @@ page {
         }
         .icon {
           position: absolute;
-          bottom: 0;
+          bottom: 10rpx;
-          right: 0;
+          right: 10rpx;
           width: 40rpx;
           height: 40rpx;
         }
@@ -55,12 +55,11 @@ page {
           color: rgba(33, 29, 46, 1);
           font-weight: bold;
           .age {
+            margin-left: 10rpx;
             display: inline;
             color: rgba(173, 172, 178, 1);
             font-weight: normal;
-            .sub {
+            font-size: 28rpx;
-              font-size: 28rpx;
-            }
           }
         }
         .tel {
@@ -415,7 +414,7 @@ page {
     display: flex;
     justify-content: center;
     align-items: center;
-    background: #67baca;
+    background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%);
     font-size: 36rpx;
     color: #fff;
     border-radius: 64rpx 64rpx 64rpx 64rpx;
@@ -505,5 +504,3 @@ page {
     }
   }
 }
-
-

src/pages/d_patientDetail/index.ts

@@ -170,6 +170,11 @@ Page({
       app.zdMpBehavior({ doctor: true, PageName: 'PG_DOCTORPATIENTDETAIL' })
       this.getDoctorDetail()
       await this.getDetail()
+      app.getUserInfo(2).then((userInfo) => {
+        this.setData({
+          userInfo,
+        })
+      })
     })
   },
   getDoctorDetail() {

src/pages/d_patientDetail/index.wxml

@@ -46,8 +46,12 @@
       </view>
       <view class="content">{{detail.HasTedSurgeryName}}</view>
     </view>
+    <view class="row">
+      <view class="label">备注</view>
+      <view class="content">{{detail.remark}}</view>
+    </view>
   </view>
-  <view class="edc-card" bind:tap="handleEDC">
+  <view class="edc-card" bind:tap="handleEDC" wx:if="{{userInfo.IsEDC==='1'}}">
     <image wx:if="{{detail.IsEDC==1}}" class="icon" src="{{imageUrl}}icon50.png?t={{Timestamp}}"></image>
     <image wx:else class="icon" src="{{imageUrl}}icon66.png?t={{Timestamp}}"></image>
     <view class="content">标识为EDC患者</view>

src/pages/d_userInfo/index.scss

@@ -11,7 +11,6 @@ page {
     .row {
       padding: 32rpx 0;
       display: flex;
-      align-items: center;
       justify-content: space-between;
       border-bottom: 1px solid rgba(173, 172, 178, 0.1);
       &:last-of-type {
@@ -42,6 +41,7 @@ page {
         flex: 1;
         font-size: 32rpx;
         color: rgba(33, 29, 46, 1);
+        white-space: pre-line;
       }
       .option {
         flex-shrink: 0;
@@ -121,7 +121,7 @@ page {
         display: flex;
         align-items: center;
         justify-content: center;
-        background-color: rgba(103, 186, 202, 1);
+        background-color: rgba(185, 130, 255, 1);
       }
       .item {
         position: relative;
@@ -140,7 +140,8 @@ page {
           display: none;
         }
         &.active {
-          background-color: rgba(237, 252, 255, 1);
+          background-color: rgba(214, 181, 255, 1);
+          color: #fff;
           .icon {
             display: block;
           }
@@ -154,7 +155,7 @@ page {
     display: flex;
     justify-content: center;
     align-items: center;
-    background: #67baca;
+    background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%);
     font-size: 36rpx;
     color: #fff;
     border-radius: 64rpx 64rpx 64rpx 64rpx;
@@ -187,7 +188,7 @@ page {
     display: flex;
     justify-content: center;
     align-items: center;
-    background: #67baca;
+    background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%);
     font-size: 36rpx;
     color: #fff;
     border-radius: 64rpx 64rpx 64rpx 64rpx;

src/pages/d_userInfo/index.ts

@@ -209,7 +209,7 @@ Page({
   handleLoginOut() {
     wx.showModal({
       title: '确认退出?',
-      confirmColor: '#62bed0',
+      confirmColor: '#8c75d0',
       success: (res) => {
         if (res.confirm) {
           wx.ajax({

src/pages/d_userInfo/index.wxml

@@ -15,24 +15,24 @@
     <view class="row" bind:tap="handleChangePhone">
       <view class="label">电话</view>
       <view class="content">{{doctor.Telephone}}</view>
-      <view class="option"><view class="change">更换</view></view>
+      <!-- <view class="option"><view class="change">更换</view></view> -->
     </view>
     <view class="row">
       <view class="label">医院</view>
       <view class="content">{{hospital.Name}}</view>
       <view class="option"></view>
     </view>
-    <view class="row">
+    <!-- <view class="row"> -->
-      <view class="label">多院区出诊</view>
+    <!--   <view class="label">多院区出诊</view> -->
-      <view class="switch-row">
+    <!--   <view class="switch-row"> -->
-        <switch
+    <!--     <switch -->
-          class="switch"
+    <!--       class="switch" -->
-          checked="{{doctor.ClinicType==2}}"
+    <!--       checked="{{doctor.ClinicType==2}}" -->
-          color="#b683fe"
+    <!--       color="#b683fe" -->
-          bind:change="handleChangeClinicType"
+    <!--       bind:change="handleChangeClinicType" -->
-        ></switch>
+    <!--     ></switch> -->
-      </view>
+    <!--   </view> -->
-    </view>
+    <!-- </view> -->
     <view class="row" bind:tap="handleWeek">
       <view class="label">门诊时间</view>
       <view class="content pre-line">{{doctor.weekName || '暂无'}}</view>

src/pages/home/index.scss

@@ -104,6 +104,11 @@ page {
               color: rgba(173, 172, 178, 1);
             }
           }
+          .content{
+            margin-top: 16rpx;
+            font-size: 28rpx;
+            color: rgba(173, 172, 178, 1);
+          }
         }
       }
     }

src/pages/home/index.ts

@@ -18,6 +18,8 @@ Page({
     userInfo: {},
     current: 0,
 
+    stat: {},
+
     notice: [],
 
     bannerList: [],
@@ -44,6 +46,7 @@ Page({
       this.getBriefingList()
       this.getSopList()
       this.getList()
+      this.getStat()
       app.getUserInfo(2).then((userInfo) => {
         this.setData({
           userInfo,
@@ -70,6 +73,17 @@ Page({
       }
     })
   },
+  getStat() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=zd/doctor/index/get-latest-static',
+      data: {},
+    }).then((res) => {
+      this.setData({
+        stat: res,
+      })
+    })
+  },
   handleWebview() {
     // wx.showToast({
     //   title: '访问路径：公众号“TED关爱中心”底部菜单栏',

src/pages/home/index.wxml

@@ -18,7 +18,7 @@
       </view>
     </view>
   </view>
-  <view class="banner">
+  <view class="banner" wx:if="{{userInfo.IsEDC==='1'}}">
     <view class="edc" bind:tap="handleWebview">
       <image class="e-img" src="{{imageUrl}}card1.png?t={{Timestamp}}"></image>
     </view>
@@ -152,11 +152,11 @@
         <image class="icon" src="{{imageUrl}}icon52.png?t={{Timestamp}}"></image>
         <view class="content">
           <view class="text">
-            总病例数
+            累计邀约
             <image class="question" src="{{imageUrl}}icon46.png?t={{Timestamp}}"></image>
           </view>
           <view class="num">
-            100
+            {{stat.TotalPatientNum}}
             <text class="sub">人</text>
           </view>
         </view>
@@ -165,39 +165,36 @@
         <image class="icon" src="{{imageUrl}}icon53.png?t={{Timestamp}}"></image>
         <view class="content">
           <view class="text">
-            总病例数
+            本月新增
             <image class="question" src="{{imageUrl}}icon46.png?t={{Timestamp}}"></image>
           </view>
           <view class="num">
-            10
+            {{stat.NewPatientNum}}
             <text class="sub">人</text>
           </view>
         </view>
       </view>
-      <view class="card">
+      <view class="card" wx:if="{{userInfo.IsEDC==='1'}}">
         <image class="icon" src="{{imageUrl}}icon45.png?t={{Timestamp}}"></image>
         <view class="content">
           <view class="text">
-            总病例数
+            EDC参与
             <image class="question" src="{{imageUrl}}icon46.png?t={{Timestamp}}"></image>
           </view>
           <view class="num">
-            100
+            {{stat.TotalEdcPatientNum}}
             <text class="sub">人</text>
           </view>
         </view>
       </view>
-      <view class="card">
+      <view class="card" wx:if="{{userInfo.IsEDC==='1'}}">
-        <image class="icon" src="{{imageUrl}}icon54.png?t={{Timestamp}}"></image>
+        <image class="icon" src="{{imageUrl}}icon68.png?t={{Timestamp}}"></image>
         <view class="content">
           <view class="text">
-            总病例数
+            需随访
             <image class="question" src="{{imageUrl}}icon46.png?t={{Timestamp}}"></image>
           </view>
-          <view class="num">
+          <view class="content">建设中...</view>
-            100
-            <text class="sub">人</text>
-          </view>
         </view>
       </view>
     </view>
@@ -221,7 +218,7 @@
       </swiper-item>
     </swiper>
   </view>
-  <view class="briefing" wx:if="{{briefingList.length > 0}}">
+  <view class="briefing" wx:if="{{briefingList.length > 0 && userInfo.IsEDC==='1'}}">
     <view class="b-header">
       <image class="title" src="{{imageUrl}}title4.png?t={{Timestamp}}"></image>
     </view>
@@ -245,7 +242,7 @@
     </view>
   </view>
 
-  <view class="sop" wx:if="{{sopList.length > 0}}">
+  <view class="sop" wx:if="{{sopList.length > 0 && userInfo.IsEDC==='1'}}">
     <view class="s-header">
       <image class="title" src="{{imageUrl}}title5.png?t={{Timestamp}}"></image>
     </view>

src/pages/login/index.json

@@ -2,6 +2,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "van-divider": "@vant/weapp/divider/index",
-    "popup": "/components/popup/index"
+    "popup": "/components/popup/index",
+    "navbar": "/components/navbar/index"
   }
 }

src/pages/login/index.scss

@@ -29,7 +29,7 @@ page {
       color: rgba(105, 104, 110, 1);
       line-height: 64rpx;
       .link {
-        color: rgba(140, 117, 208, 1);
+        color: rgba(185, 130, 255, 1);
       }
     }
   }
@@ -41,7 +41,7 @@ page {
     display: flex;
     align-items: center;
     justify-content: center;
-    background: linear-gradient(89deg, #8c75d0 0%, #b7bdff 100%);
+    background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%);
     border-radius: 84rpx 84rpx 84rpx 84rpx;
   }
   .divider {
@@ -130,10 +130,10 @@ page {
       }
     }
     .link {
-      color: rgba(140, 117, 208, 1);
+      color: rgba(185, 130, 255, 1);
     }
   }
-  .tip {
+  .switch {
     margin-top: 60rpx;
     font-size: 28rpx;
     text-align: center;

src/pages/login/index.ts

@@ -16,8 +16,14 @@ Page({
     codeText: '发送验证码',
 
     check1: false,
+
+    back: '',
+  },
+  onLoad(options) {
+    this.setData({
+      back: options.back,
+    })
   },
-  onLoad() {},
   getCode() {
     if (timer) return
     const mobile = this.data.mobile
@@ -163,7 +169,7 @@ Page({
     })
   },
   handlePatient() {
-    wx.reLaunch({
+    wx.redirectTo({
       url: '/patient/pages/login/index',
     })
   },
@@ -191,6 +197,9 @@ Page({
       popupShow: false,
     })
   },
+  handleBack(){
+    wx.navigateBack()
+  }
 })
 
 export {}

src/pages/login/index.wxml

@@ -1,3 +1,7 @@
+<navbar wx:if="{{back==='1'}}" fixed title="" custom-style="background:{{background}}" z-index="10">
+  <van-icon name="arrow-left" slot="left" color="#000" bind:tap="handleBack" />
+</navbar>
+
 <view
   class="page"
   style="padding-top: {{pageTop + 60}}px;background:url('{{imageUrl}}bg1.png?t={{Timestamp}}') no-repeat top center/100% 484rpx;"
@@ -71,7 +75,10 @@
       </view>
     </view>
   </view>
-  <view class="tip">*仅限特定人群登录并进行登录账号鉴权</view>
+  <view wx:if="{{back!=='1'}}" class="switch" bind:tap="handlePatient">
+    切换到患者端
+    <van-icon name="arrow" />
+  </view>
 </view>
 
 <popup

src/patient/pages/liveDetail/index.wxml

@@ -10,7 +10,7 @@
   <view class="page-container">
     <view class="title">{{detail.Name}}</view>
     <view class="info">
-      <view class="date">2025.7.15</view>
+      <view class="date">{{detail.BeginTime}}</view>
       <view class="stat">
         <view class="s-item" wx:if="{{detail.ActivityBasicNum * 1 + detail.OpenNum * 1}}">
           <image class="icon" src="{{imageUrl}}icon40.png?t={{Timestamp}}"></image>
@@ -70,7 +70,7 @@
         <view class="btn active" wx:if="{{detail.SignUpStatus==1}}" bind:tap="handleResult">审核中</view>
         <block wx:elif="{{detail.SignUpStatus==2}}">
           <view class="btn" wx:if="{{detail.BeginTimeValue * 1 < dateValue * 1}}" bind:tap="handleLive">参会</view>
-          <view class="btn active" wx:else bind:tap="handleResult">已报名</view>
+          <view class="btn active" wx:else bind:tap="handleResult">已报名,查看活动码</view>
         </block>
         <block wx:elif="{{detail.SignUpStatus==3}}">
           <view

src/patient/pages/login/index.json

@@ -1,7 +1,7 @@
-{
+{
-  "navigationStyle": "custom",
+  "navigationStyle": "custom",
-  "usingComponents": {
+  "usingComponents": {
-    "van-icon": "@vant/weapp/icon/index",
+    "van-icon": "@vant/weapp/icon/index",
-    "van-divider": "@vant/weapp/divider/index"
+    "van-divider": "@vant/weapp/divider/index"
-  }
+  }
-}
+}

src/patient/pages/login/index.ts

@@ -135,7 +135,7 @@ Page({
     })
   },
   handleDoctor() {
-    wx.reLaunch({
+    wx.redirectTo({
       url: '/pages/login/index',
     })
   },

src/patient/pages/login/index.wxml

@@ -21,7 +21,13 @@
           bind:tap="handleCheck"
           data-key="check1"
         ></image>
-        <image wx:else class="icon" src="{{imageUrl}}icon24.png?t={{Timestamp}}" bind:tap="handleCheck" data-key="check1"></image>
+        <image
+          wx:else
+          class="icon"
+          src="{{imageUrl}}icon24.png?t={{Timestamp}}"
+          bind:tap="handleCheck"
+          data-key="check1"
+        ></image>
         <view class="a-content">
           我已阅读并同意
           <text class="link" bind:tap="handleLink" data-url="/doc/patient/pages/doc2/index">《用户协议》</text>
@@ -37,7 +43,13 @@
           bind:tap="handleCheck"
           data-key="check2"
         ></image>
-        <image wx:else class="icon" src="{{imageUrl}}icon24.png?t={{Timestamp}}" bind:tap="handleCheck" data-key="check2"></image>
+        <image
+          wx:else
+          class="icon"
+          src="{{imageUrl}}icon24.png?t={{Timestamp}}"
+          bind:tap="handleCheck"
+          data-key="check2"
+        ></image>
         <view class="a-content">
           我同意依照此
           <text class="link" bind:tap="handleLink" data-url="/doc/patient/pages/doc2/index">《隐私政策》</text>

src/patient/pages/personalInformation/index.wxml

@@ -39,6 +39,25 @@
       </view>
       <view class="row">
         <view class="row-header">
+          <view class="label">性别</view>
+        </view>
+        <view class="row-content">
+          <view class="radio-btns">
+            <view
+              class="btn {{ zdUserInfo.Gender === item.id && 'active'}}"
+              wx:for="{{GenderList}}"
+              wx:key="index"
+              bind:tap="handleRedioSelect"
+              data-key="Gender"
+              data-id="{{item.id}}"
+            >
+              {{item.value}}
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="row">
+        <view class="row-header">
           <view class="label">年龄范围</view>
         </view>
         <view class="row-content">
@@ -95,7 +114,7 @@
         </view>
       </view>
     </view>
-    <view class="cancellation" bind:tap="routerTo" data-url="/pages/login/index">切换医生端</view>
+    <view class="cancellation" bind:tap="routerTo" data-url="/pages/login/index?back=1">切换医生端</view>
     <view wx:if="{{zdUserInfo.IsRootUser==1}}" class="cancellation" bind:tap="handleLogout">注销账号</view>
   </view>
 </view>