众测各种问题处理

src/components/freeAudio/index.js

@@ -22,6 +22,8 @@ Component({
           }
           this.audioContext.destroy()
         }
+        this._lastTime = 0
+        this._pausedByHide = false
         if (val) {
           this.audioAddEventListener(val)
         }
@@ -67,15 +69,18 @@ Component({
   },
   pageLifetimes: {
     show: function () {
-      if (this.data._pausedByHide && this.audioContext) {
-        this.data._pausedByHide = false
+      if (this._pausedByHide && this.audioContext) {
+        this._pausedByHide = false
+        if (this._lastTime > 0) {
+          this.audioContext.seek(this._lastTime)
+        }
         this.audioContext.play()
       }
     },
     hide: function () {
       const { play } = this.data
       if (play) {
-        this.data._pausedByHide = true
+        this._pausedByHide = true
         this.audioContext.pause()
       }
     },
@@ -94,6 +99,9 @@ Component({
       if (play) {
         this.audioContext.pause()
       } else {
+        if (this._lastTime > 0 && this.audioContext.currentTime < this._lastTime - 0.5) {
+          this.audioContext.seek(this._lastTime)
+        }
         this.audioContext.play()
       }
     },
@@ -138,12 +146,18 @@ Component({
         })
       })
       that.audioContext.onPause(() => {
-        console.log(1111111)
+        that._lastTime = that.audioContext.currentTime || that._lastTime || 0
+        that.setData({
+          play: false,
+        })
+      })
+      that.audioContext.onStop(() => {
         that.setData({
           play: false,
         })
       })
       that.audioContext.onEnded(() => {
+        that._lastTime = 0
         that.audioContext.seek(0)
         that.setData({
           play: false,
@@ -158,6 +172,7 @@ Component({
         if (duration == Infinity) {
           return
         }
+        that._lastTime = currentTime
         that.setData({
           play: true,
           duration: that.formatTime(duration),

src/components/pagination/index.scss

@@ -1,10 +1,12 @@
 /* components/pagination/index.wxss */
 .none {
   display: block;
-  margin: 30rpx auto;
-  width: 80%;
+  margin: 60rpx auto 0;
+  width: 440rpx;
+  height: 388rpx;
 }
 .empty-title {
+  margin-top: -50rpx;
   text-align: center;
   font-size: 32rpx;
   color: #b0b0b0;

src/components/toast/index.scss

@@ -2342,7 +2342,7 @@
     .btn {
       margin-top: 58rpx;
       height: 96rpx;
-      font-size: 32rpx;
+      font-size: 36rpx;
       color: rgba(255, 255, 255, 1);
       text-align: center;
       line-height: 96rpx;
@@ -2360,11 +2360,11 @@
     .popup-container {
       .content {
         .high {
-          color: rgba(22, 121, 203, 1);
+          color: rgba(89, 86, 233, 1);
         }
       }
       .btn {
-        background: linear-gradient(90deg, rgba(41, 59, 159, 1) 0%, rgba(22, 121, 203, 1) 100%);
+        background: linear-gradient(to right, rgba(179, 132, 244, 1) 0%, rgba(89, 86, 233, 1) 100%);
       }
     }
   }

src/doctor/pages/d_home/index.scss

@@ -3,7 +3,7 @@ page {
 }
 .page {
   .user {
-    padding: 72rpx 30rpx 0;
+    padding: 72rpx 40rpx 0;
     display: flex;
     gap: 20rpx;
     .avatar {
@@ -39,6 +39,12 @@ page {
         }
       }
     }
+    .code{
+      margin-top: 16rpx;
+      flex-shrink: 0;
+      width: 56rpx;
+      height: 56rpx;
+    }
   }
   .new-banner {
     margin: 60rpx 40rpx 0;
@@ -82,7 +88,7 @@ page {
     }
   }
   .page-container {
-    margin: 0 30rpx;
+    margin: 0 40rpx;
     .card {
       margin: 44rpx 0 0;
       padding-top: 15px;

src/doctor/pages/d_home/index.ts

@@ -202,12 +202,16 @@ Page({
       confirmButtonColor: '#62bed0',
     } as any)
   },
-
   handlePatient(e) {
     const { type, name } = e.currentTarget.dataset
 
     wx.navigateTo({
-      url: `/doctor/pages/d_patientList/index?type=${type}&name=${name}`,
+      url: `/doctor/pages/d_patient/index?type=${type}&name=${name}`,
+    })
+  },
+  handleInvite() {
+    wx.navigateTo({
+      url: '/doctor/pages/d_invite/index',
     })
   },
 })

src/doctor/pages/d_home/index.wxml

@@ -5,11 +5,14 @@
     <view class="wrap">
       <view class="name">{{doctor.Name}}</view>
       <view class="site">
-        <div class="site-content">{{hospital.Name}}</div>
-        <view wx:if="{{hospital.HospitalClassificationName || hospital.HospitalLevelName}}" class="tag">{{hospital.HospitalClassificationName}}{{hospital.HospitalLevelName}}</view>
+        <view class="site-content">{{hospital.Name}}</view>
+        <view wx:if="{{hospital.HospitalClassificationName || hospital.HospitalLevelName}}" class="tag">
+          {{hospital.HospitalClassificationName}}{{hospital.HospitalLevelName}}
         </view>
       </view>
     </view>
+    <image class="code" src="{{imageUrl}}icon93.png?t={{Timestamp}}" bind:tap="handleInvite"></image>
+  </view>
   <view class="new-banner">
     <view class="item" bind:tap="handlePatient" data-type="1" data-name="累计邀约患者">
       <image class="icon" src="{{imageUrl}}icon53.png?t={{Timestamp}}"></image>

src/doctor/pages/d_interactiveDoctor/index.scss

@@ -113,9 +113,8 @@ page {
             background: rgba(22, 121, 203, 1);
             border: 2rpx solid #ffffff;
             .title {
-              font-size: 40rpx;
+              font-size: 36rpx;
               color: rgba(255, 255, 255, 1);
-              font-weight: bold;
             }
             .list {
               .l-item {

src/doctor/pages/d_invite/index.scss

@@ -17,7 +17,6 @@ page{
     padding: 18rpx 44rpx;
     font-size: 36rpx;
     line-height: 48rpx;
-    font-weight: bold;
     display: flex;
     align-items: center;
     justify-content: center;

src/doctor/pages/d_invite/index.ts

@@ -46,68 +46,6 @@ Page({
         doctorId: id,
       },
     }).then((res) => {
-      // res = {
-      //   info: { id: 'doctor_mini', title: '医生码海报', desc: '医生小程序码海报' },
-      //   body: {
-      //     bgImg:
-      //       '替换为我发你的图片',
-      //     width: '750',
-      //     height: '1448',
-      //   },
-      //   elements: [
-      //     {
-      //       id: 'avatar',
-      //       desc: '医生头像',
-      //       type: 0,
-      //       picType: 'avatar',
-      //       src: 'https://picsissiok-10049618.cos.ap-shanghai.myqcloud.com/6e61b32196f54f20f66dd45c33ade450_17693963483779.png',
-      //       width: '128',
-      //       height: '128',
-      //       left: '70',
-      //       top: '256',
-      //       shape: 'circle',
-      //     },
-      //     {
-      //       id: 'doctorName',
-      //       desc: '医生姓名',
-      //       type: 1,
-      //       text: '云南大学附属医院\n内分泌科医生',
-      //       font: '',
-      //       'font-size': '40',
-      //       'font-weight': 'bold',
-      //       width: '384',
-      //       color: 'rgba(33, 29, 46, 1)',
-      //       'single-line': true,
-      //       left: '234',
-      //       top: '256',
-      //     },
-      //     {
-      //       id: 'hospitalName',
-      //       desc: '医院名称',
-      //       type: 1,
-      //       text: '中南大学湘雅医院',
-      //       font: '',
-      //       'font-size': '32',
-      //       color: 'rgba(115, 114, 121, 1)',
-      //       'single-line': true,
-      //       left: '234',
-      //       width: '384',
-      //       top: '344',
-      //       lineHeight: '36',
-      //     },
-      //     {
-      //       id: 'minicode',
-      //       desc: '医生小程序码',
-      //       type: 0,
-      //       picType: 'minicode',
-      //       src: '这块为医生的邀约码url',
-      //       width: '238',
-      //       height: '238',
-      //       halign: 'center',
-      //       top: '640',
-      //     },
-      //   ],
-      // }
       this.setData({
         params: res,
       })

src/doctor/pages/d_my/index.scss

@@ -53,7 +53,7 @@ page {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      padding: 30rpx;
+      padding: 40rpx 30rpx;
       border-bottom: 1rpx solid #f2f4f5;
       &:last-child {
         border-bottom: none;

src/doctor/pages/d_patient/index.scss

@@ -164,6 +164,7 @@ page {
           display: flex;
           align-items: center;
           justify-content: space-between;
+          flex-wrap: wrap;
           .name {
             font-size: 40rpx;
             color: rgba(40, 48, 49, 1);

src/doctor/pages/d_patient/index.wxml

@@ -27,7 +27,7 @@
       <view class="container">
         <view class="title">
           <view class="name">{{item.Name}}</view>
-          <view class="disease">病程{{item.DiagnosisTimeRange == 1 ? '<1年' : item.DiagnosisTimeRange == 2 ? '1-3年' : '>3年'}}</view>
+          <view class="disease" wx:if="{{item.DiagnosisTimeRange}}">病程：{{item.DiagnosisTimeRange == 1 ? '6个月以内' : item.DiagnosisTimeRange == 2 ? '6个月-3年' : '3年以上'}}</view>
         </view>
         <view class="replay-date">邀约时间：{{tools.formatDate(item.InviteTime)}}</view>
         <view class="remark">备注：{{item.DoctorRemark || '无'}}</view>

src/doctor/pages/d_patientDetail/index.scss

@@ -24,12 +24,17 @@ page {
     .wrap {
       margin-left: 24rpx;
       .name {
+        display: flex;
+        align-items: center;
+        gap: 12rpx;
+        flex-wrap: wrap;
         font-size: 44rpx;
         color: rgba(33, 33, 32, 1);
         .tel-icon {
+          flex-shrink: 0;
           margin-left: 10rpx;
-          width: 32rpx;
-          height: 32rpx;
+          width: 40rpx;
+          height: 40rpx;
         }
       }
       .content {

src/doctor/pages/d_patientList/index.wxml

@@ -18,7 +18,7 @@
       <view class="container">
         <view class="title">
           <view class="name">{{item.Name}}</view>
-          <view class="disease">病程{{item.DiagnosisTimeRange == 1 ? '<1年' : item.DiagnosisTimeRange == 2 ? '1-3年' : '>3年'}}</view>
+          <view class="disease">病程{{item.DiagnosisTimeRange == 1 ? '6个月以内' : item.DiagnosisTimeRange == 2 ? '6个月-3年' : '3年以上'}}</view>
         </view>
         <view class="replay-date">邀约时间：{{tools.formatDate(item.InviteTime)}}</view>
         <view class="remark">备注：{{item.DoctorRemark || '无'}}</view>

src/pages/doctorDetail/index.scss

@@ -85,6 +85,7 @@ page {
       display: flex;
       flex-wrap: wrap;
       gap: 16rpx 28rpx;
+      white-space: pre-line;
       .tag {
         width: 200rpx;
         height: 52rpx;

src/pages/enterInfo/index.wxml

@@ -35,14 +35,14 @@
         <view class="age-item {{ageRange==5 && 'active'}}" data-id="5" bind:tap="handleSelectAge">{{"70-79岁"}}</view>
         <view class="age-item {{ageRange==6 && 'active'}}" data-id="6" bind:tap="handleSelectAge">{{"≥80岁"}}</view>
       </view>
-      <view class="row-title">输入真实姓名，便于医生识别随访</view>
+      <view class="row-title">输入姓名，便于医生识别随访</view>
       <view class="row">
         <input
           model:value="{{name}}"
           class="input"
           maxlength="{{8}}"
           placeholder-style="color:rgba(34,34,34,0.3)"
-          placeholder="输入真实姓名"
+          placeholder="输入姓名"
         />
       </view>
     </view>

src/pages/getUserInfo/index.scss

@@ -1,17 +1,14 @@
 page {
   min-height: 100vh;
-  background: linear-gradient(180deg, rgba(253, 253, 253, 0.49) 0%, #fafafa 100%);
-  background-color: #fff;
+  background-color: #f6f6f6;
 }
 .page {
   width: 100%;
   height: 100vh;
   overflow: hidden;
-  background-color: #fafafa;
   .page-container {
     margin-top: 100rpx;
     padding: 0 104rpx;
-    background: #fff;
     height: 100vh;
     border-radius: 32rpx 32rpx 0 0;
     .avatar-wrapper {
@@ -36,7 +33,7 @@ page {
       margin-top: -90rpx;
       text-align: center;
       font-size: 36rpx;
-      color: #aeb6cd;
+      color: rgba(34, 34, 34, 0.5);
     }
 
     .container {

src/pages/getUserInfo/index.wxml

@@ -1,8 +1,4 @@
-<view
-  class="page"
-  id="{{theme === 'DRUG' && 'drug-page'}}"
-  style="background: url({{imageUrl}}/1/adl-detail-bg.png?t={{Timestamp}}) no-repeat top center / 100% ;padding-top:{{bottom}}px"
->
+<view class="page" id="{{theme === 'DRUG' && 'drug-page'}}" style="padding-top:{{bottom}}px">
   <navBar back bind:back="handleBack" background="{{background}}" title="配置头像"></navBar>
   <view class="page-container">
     <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">

src/pages/hospital/index.scss

@@ -110,7 +110,7 @@ page {
           }
           .p {
             margin-top: 8rpx;
-            font-size: 24rpx;
+            font-size: 36rpx;
             color: rgba(34, 34, 34, 0.7);
             &.ellipsis {
               min-width: 0;

src/pages/hospital/index.wxml

@@ -23,7 +23,7 @@
       </view>
     </view>
   </view>
-  <view class="module">
+  <view class="module" wx:if="{{detail.doctors.length}}">
     <view class="module-container">
       <view class="m-title">门诊医生</view>
       <view
@@ -37,7 +37,11 @@
           <image class="avatar" mode="aspectFill" src="{{item.Img}}"></image>
           <view class="wrap">
             <view class="name">{{item.Name}}</view>
-            <view class="p ellipsis">{{item.JobTitle}}<text wx:if="{{item.JobTitle && item.Department}}"> | </text>{{item.Department}}</view>
+            <view class="p ellipsis">
+              {{item.JobTitle}}
+              <text wx:if="{{item.JobTitle && item.Department}}">|</text>
+              {{item.Department}}
+            </view>
           </view>
         </view>
         <view class="content" wx:if="{{item.weekName.length || item.ClinicType==2 && item.weekName}}">

src/pages/index/index.scss

@@ -18,7 +18,7 @@ page {
     .user {
       margin: 23rpx $page-margin 40rpx;
       display: flex;
-      align-items: center;
+      align-items: flex-end;
       justify-content: space-between;
       .content {
         margin-right: 10rpx;
@@ -33,11 +33,6 @@ page {
           .high {
             color: #0eb66d;
           }
-          .icon {
-            margin-left: 16rpx;
-            width: 64rpx;
-            height: 60rpx;
-          }
         }
         .slogan {
           margin-top: 14rpx;
@@ -45,31 +40,110 @@ page {
           height: 42rpx;
         }
       }
-      .day {
-        padding: 36rpx 0 20rpx;
-        width: 220rpx;
-        height: 194rpx;
-        text-align: center;
-        .d-title {
-          font-size: 16rpx;
-          color: #ffffff;
-          line-height: 1;
+      .badge {
+        width: 132rpx;
+        height: 132rpx;
       }
-        .d-content {
-          margin-top: 76rpx;
-          font-size: 26rpx;
-          color: rgba(34, 34, 34, 0.7);
+    }
+    .alert {
+      margin: 40rpx $page-margin;
+      .empty {
+        height: 200rpx;
+        background: #f5f7f6;
+        border-radius: 24rpx 24rpx 24rpx 24rpx;
+        border: 2rpx dashed #0eb66d;
         display: flex;
         align-items: center;
         justify-content: center;
-          line-height: 1;
-          gap: 10rpx;
-          .num {
+        .icon {
+          width: 92rpx;
+          height: 92rpx;
+        }
+        .content {
           font-size: 36rpx;
-            color: #0eb66d;
+          color: rgba(14, 182, 109, 1);
+        }
+      }
+      .a-container {
+        padding: 10rpx 20rpx 0 28rpx;
+        background: linear-gradient(98deg, #01d177 0%, #0eb66d 67.56%, #0eb66d 100%);
+        border-radius: 24rpx;
+        display: flex;
+        align-items: center;
+        gap: 18rpx;
+        .aside {
+          padding-top: 20rpx;
+          width: 176rpx;
+          height: 188rpx;
+          align-self: flex-end;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 28rpx;
+          color: rgba(34, 34, 34, 0.7);
+          .a-num {
+            font-size: 42rpx;
+            color: rgba(14, 182, 109, 1);
             font-weight: bold;
           }
         }
+        .wrap {
+          .title {
+            display: flex;
+            align-items: center;
+            gap: 16rpx;
+            font-size: 28rpx;
+            color: rgba(255, 255, 255, 0.97);
+            .icon {
+              width: 36rpx;
+              height: 36rpx;
+            }
+          }
+          .content {
+            margin-top: 16rpx;
+            display: flex;
+            align-items: start;
+            gap: 10rpx;
+            .year {
+              margin-top: 10rpx;
+              padding-right: 10rpx;
+              font-size: 28rpx;
+              color: rgba(255, 255, 255, 0.6);
+              line-height: 28rpx;
+              border-right: 1px dashed rgba(255, 255, 255, 0.47);
+            }
+            .yd {
+              display: flex;
+              align-items: start;
+              gap: 10rpx;
+              line-height: 72rpx;
+              .yd-num {
+                font-size: 64rpx;
+                color: rgba(255, 255, 255, 1);
+                font-weight: bold;
+              }
+              .sub {
+                margin-top: 10rpx;
+                font-size: 28rpx;
+                color: rgba(255, 255, 255, 1);
+              }
+            }
+            .week {
+              margin-top: 28rpx;
+              margin-left: 10rpx;
+              width: 96rpx;
+              height: 36rpx;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 24rpx;
+              color: rgba(255, 255, 255, 0.6);
+              background: rgba(255, 255, 255, 0.24);
+              border-radius: 88rpx 88rpx 88rpx 88rpx;
+            }
+          }
+        }
       }
     }
   }
@@ -371,12 +445,12 @@ page {
                     display: flex;
                     align-items: center;
                     gap: 6rpx;
-                    font-size: 22rpx;
+                    font-size: 32rpx;
                     color: #999999;
                     font-weight: normal;
                     .action-icon {
-                      width: 32rpx;
-                      height: 32rpx;
+                      width: 38rpx;
+                      height: 38rpx;
                     }
                     &.active {
                       color: #0eb66d;
@@ -507,6 +581,18 @@ page {
   .num {
     color: rgba(89, 86, 233, 1);
   }
+  .empty {
+    border-color: rgba(89, 86, 233, 1);
+    .content {
+      color: rgba(89, 86, 233, 1);
+    }
+  }
+  .a-container {
+    background: linear-gradient(274deg, #884ef9 0%, #d0b7f3 100%);
+    .a-num {
+      color: rgba(89, 86, 233, 1);
+    }
+  }
   .title {
     &::before {
       background: rgba(89, 86, 233, 1);

src/pages/index/index.ts

@@ -40,6 +40,11 @@ Page({
     firstLogin: '',
 
     nextVisitDays: '--',
+    nextVisitYearPrefix: '',
+    nextVisitYearSuffix: '',
+    nextVisitMonth: '',
+    nextVisitDay: '',
+    nextVisitWeek: '',
   },
   onLoad(options) {
     const systemInfo = wx.getSystemInfoSync()
@@ -105,14 +110,26 @@ Page({
   },
   updateNextVisitDays(userInfo: any) {
     if (userInfo.NextVisitDate) {
-      const diffMs = dayjs(userInfo.NextVisitDate).diff(dayjs())
-      if (diffMs <= 0) {
-        this.setData({ nextVisitDays: 0 })
-      } else {
-        this.setData({ nextVisitDays: Math.ceil(diffMs / (24 * 60 * 60 * 1000)) })
-      }
+      const date = dayjs(userInfo.NextVisitDate)
+      const diffMs = date.diff(dayjs())
+      const weekNames = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
+      this.setData({
+        nextVisitDays: diffMs <= 0 ? 0 : Math.ceil(diffMs / (24 * 60 * 60 * 1000)),
+        nextVisitYearPrefix: date.format('YYYY').substring(0, 2),
+        nextVisitYearSuffix: date.format('YYYY').substring(2),
+        nextVisitMonth: date.format('MM'),
+        nextVisitDay: date.format('DD'),
+        nextVisitWeek: weekNames[date.day()],
+      })
     } else {
-      this.setData({ nextVisitDays: '--' })
+      this.setData({
+        nextVisitDays: '--',
+        nextVisitYearPrefix: '',
+        nextVisitYearSuffix: '',
+        nextVisitMonth: '',
+        nextVisitDay: '',
+        nextVisitWeek: '',
+      })
     }
   },
   updateGreeting() {
@@ -317,6 +334,13 @@ Page({
       },
     })
   },
+  handleNextVisit() {
+    app.permissionVerification(3, 0, '').then(() => {
+      wx.navigateTo({
+        url: '/pages/signIn/index',
+      })
+    })
+  },
   handleReg() {
     app.permissionVerification(3, 0, '')
   },

src/pages/index/index.wxml

@@ -6,29 +6,61 @@
         <view class="name">
           <text class="high">{{userInfo.PatientName || 'HI'}}，</text>
           {{greeting}}
-          <image class="icon" src="{{imageUrl}}{{greetingIcon}}.png?t={{Timestamp}}"></image>
         </view>
         <image class="slogan" src="{{imageUrl}}title2.png?t={{Timestamp}}"></image>
       </view>
+      <image class="badge" src="{{imageUrl}}{{greetingIcon}}.png?t={{Timestamp}}"></image>
+    </view>
+    <view class="alert" bind:tap="handleNextVisit">
+      <view class="empty" wx:if="{{nextVisitDays === '--'}}">
+        <image class="icon" src="{{imageUrl}}{{theme === 'DRUG' ? 'icon92' : 'icon90'}}.png?t={{Timestamp}}"></image>
+        <view class="content">设置复诊提醒</view>
+      </view>
+      <view class="a-container" wx:if="{{nextVisitDays !== '--'}}">
         <view
-        wx:if="{{userInfo.UserType>=3}}"
-        class="day"
-        bind:tap="routerTo"
-        data-url="/pages/signIn/index"
+          class="aside"
           style="background: url('{{imageUrl}}{{theme === 'DRUG' ? 'bg22' : 'bg15'}}.png?t={{Timestamp}}') no-repeat top center/100%"
         >
-        <view class="d-content">
-          <view class="num">{{nextVisitDays === 0 ? '今天' : nextVisitDays}}</view>
+          <view class="a-num">{{nextVisitDays === 0 ? '今天' : nextVisitDays}}</view>
           <text wx:if="{{nextVisitDays !== 0}}">天</text>
         </view>
+        <view class="wrap">
+          <view class="title">
+            <image class="icon" src="{{imageUrl}}icon91.png?t={{Timestamp}}"></image>
+            复诊时间
+          </view>
+          <view class="content">
+            <view class="year">
+              {{nextVisitYearPrefix}}
+              <view></view>
+              {{nextVisitYearSuffix}}
+            </view>
+            <view class="yd">
+              <view class="yd-num">{{nextVisitMonth}}</view>
+              <view class="sub">月</view>
+              <view class="yd-num">{{nextVisitDay}}</view>
+              <view class="sub">日</view>
             </view>
+            <view class="week">{{nextVisitWeek}}</view>
           </view>
         </view>
+      </view>
+    </view>
+  </view>
+  <!-- <view -->
+  <!--   wx:if="{{userInfo.UserType>=3}}" -->
+  <!--   class="day" -->
+  <!--   bind:tap="routerTo" -->
+  <!--   data-url="/pages/signIn/index" -->
+  <!--   style="background: url('{{imageUrl}}{{theme === 'DRUG' ? 'bg22' : 'bg15'}}.png?t={{Timestamp}}') no-repeat top center/100%" -->
+  <!-- > -->
+  <!--   <view class="d-content"> -->
+  <!--     <view class="num">{{nextVisitDays === 0 ? '今天' : nextVisitDays}}</view> -->
+  <!--     <text wx:if="{{nextVisitDays !== 0}}">天</text> -->
+  <!--   </view> -->
+  <!-- </view> -->
   <view class="page-container">
     <block wx:if="{{userInfo.ExclusiveDoctorId}}">
-      <view class="module-title">
-        <view class="title">我的医生</view>
-      </view>
       <view class="doctor" bind:tap="routerTo" data-url="/pages/interactivePatient/index">
         <view
           class="container"
@@ -179,7 +211,6 @@
         data-url="/pages/doctor/index"
       ></image>
     </view>
-
   </view>
 
   <view class="reg" wx:if="{{regGuide && anyWhere && userInfo.UserType==1}}" bind:tap="handleReg">

src/pages/interactivePatient/index.scss

@@ -68,6 +68,7 @@ page {
         padding: 15rpx 30rpx;
         display: flex;
         .avatar {
+          position: relative;
           padding-right: 16rpx;
           flex-shrink: 0;
           .a-img {
@@ -75,6 +76,19 @@ page {
             height: 80rpx;
             border-radius: 50%;
           }
+          .ai {
+            position: absolute;
+            top: 60rpx;
+            left: 6rpx;
+            font-size: 16rpx;
+            color: #ffffff;
+            width: 64rpx;
+            height: 24rpx;
+            line-height: 24rpx;
+            text-align: center;
+            background: linear-gradient( 94deg, #0EB66D 0%, #00D277 100%);
+            border-radius: 120rpx 120rpx 120rpx 120rpx;
+          }
         }
         .d-container {
           flex: 1;
@@ -89,9 +103,8 @@ page {
             background: rgba(248, 248, 248, 1);
             border: 2rpx solid #ffffff;
             .title {
-              font-size: 40rpx;
+              font-size: 36rpx;
               color: rgba(33, 33, 32, 1);
-              font-weight: bold;
             }
             .list {
               .l-item {
@@ -282,7 +295,7 @@ page {
       background-color: #fff;
     }
     &.expend {
-      height: 45vh;
+      height: 60vh;
       background-color: #f6f6f6;
       &.min-expend {
         height: 32vh;
@@ -327,11 +340,11 @@ page {
         flex: 1;
         width: 192rpx;
         height: 96rpx;
-        background: rgba(237, 247, 243, 1);
+        background: linear-gradient(94deg, #0eb66d 0%, #00d277 100%);
         border-radius: 16rpx;
         border: 2rpx solid #f6f8f9;
         font-size: 32rpx;
-        color: rgba(14, 182, 109, 1);
+        color: #fff;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -345,14 +358,14 @@ page {
       padding: 24rpx 0;
       display: flex;
       align-items: center;
-      gap: 22rpx;
+      gap: 12rpx;
       overflow-x: auto;
       &::-webkit-scrollbar {
         display: none;
       }
       .tab {
         flex-shrink: 0;
-        padding: 13rpx 44rpx;
+        padding: 13rpx 24rpx;
         font-size: 36rpx;
         color: rgba(33, 29, 46, 1);
         border-radius: 80rpx;
@@ -384,7 +397,7 @@ page {
       }
     }
     .list {
-      max-height: 35vh;
+      max-height: 45vh;
       overflow-y: auto;
       .l-item {
         padding: 32rpx;
@@ -507,8 +520,7 @@ page {
 
 #drug-page {
   .shortcut {
-    background-color: rgba(245, 244, 255, 1);
-    color: rgba(109, 106, 236, 1);
+    background: linear-gradient(270deg, #b384f4 0%, #5956e9 100%);
   }
   .tabs {
     .tab {
@@ -520,6 +532,9 @@ page {
       }
     }
   }
+  .ai{
+    background: linear-gradient( 270deg, #B384F4 0%, #5956E9 100%);
+  }
   .list {
     .order {
       background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%);

src/pages/interactivePatient/index.ts

@@ -221,7 +221,7 @@ Page({
           ...this.data.messageList,
           {
             msgId: '',
-            msgContentType: '1',
+            msgContentType: '12',
             msgContent: res,
             msgVisitTime: '',
             msgFromType: '2',

src/pages/interactivePatient/index.wxml

@@ -28,6 +28,7 @@
         <view class="doctor" wx:if="{{message.msgFromType==='2'}}">
           <view class="avatar">
             <image class="a-img" mode="aspectFill" src="{{doctorDetail.doctorAvatar}}"></image>
+            <view class="ai" wx:if="{{message.msgContentType==='12'}}">机器人</view>
           </view>
           <view class="d-container">
             <view class="guide" wx:if="{{message.msgContentType==='5'}}">

src/pages/login/index.scss

@@ -10,7 +10,7 @@ pgae {
   .container {
     position: absolute;
     left: 0;
-    top: 300rpx;
+    top: 230rpx;
     width: 100%;
     .frame {
       display: block;
@@ -19,7 +19,7 @@ pgae {
       height: 390rpx;
     }
     .phone-btn {
-      margin: 48rpx 50rpx 0;
+      margin: 168rpx 50rpx 0;
       height: 88rpx;
       line-height: 88rpx;
       text-align: center;
@@ -76,7 +76,7 @@ pgae {
         }
         .a-content {
           font-size: 28rpx;
-          color: #222222;
+          color: rgba(34, 34, 34, 0.7);
           .link {
             color: #0eb66d;
           }

src/pages/my/index.scss

@@ -37,6 +37,7 @@ page {
             color: #222222;
 
             .day {
+              margin: 0 4rpx;
               color: #0eb66d;
               font-weight: bold;
             }
@@ -122,11 +123,11 @@ page {
       }
     }
     .common-operations {
-      margin-top: 32rpx;
+      margin-top: 48rpx;
       display: flex;
       .item {
         flex: 1;
-        padding: 30rpx;
+        padding: 40rpx 30rpx;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -149,13 +150,13 @@ page {
       }
     }
     .options-list {
-      margin-top: 32rpx;
+      margin-top: 48rpx;
       padding: 0 28rpx;
       background: #ffffff;
       box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05);
       border-radius: 24rpx;
       .row {
-        padding: 30rpx 0;
+        padding: 40rpx 0;
         display: flex;
         align-items: center;
         justify-content: space-between;

src/pages/mySave/index.scss

@@ -52,12 +52,12 @@
           .f-item {
             display: flex;
             align-items: center;
-            font-size: 22rpx;
+            font-size: 32rpx;
             color: #b6b7ba;
             .icon {
               margin-right: 8rpx;
-              width: 32rpx;
-              height: 32rpx;
+              width: 38rpx;
+              height: 38rpx;
             }
             &.active {
               color: #0eb66d;

src/pages/personalInformation/index.scss

@@ -43,7 +43,7 @@
           }
           &.active {
             border-color: #0eb66d;
-            background: #fff;
+            background: #ecfff7;
             .name {
               color: #0eb66d;
             }
@@ -180,7 +180,7 @@
     background: rgba(246, 246, 246, 1);
   }
   .switch .item.active {
-    background-color: #fff;
+    background-color: rgba(245, 244, 255, 1);
     border-color: rgba(89, 86, 233, 1);
     .name {
       color: rgba(89, 86, 233, 1);
@@ -193,7 +193,7 @@
     }
     .active {
       border-color: rgba(89, 86, 233, 1);
-      background-color: #fff;
+      background-color: rgba(245, 244, 255, 1);
       color: rgba(89, 86, 233, 1);
     }
   }

src/pages/personalInformation/index.wxml

@@ -90,39 +90,12 @@
           ≥80岁
         </view>
       </view>
-      <view class="row-title">从首次确诊IgG4相关性疾病，到现在多久了</view>
-      <view class="row row-age">
-        <view
-          class="age-item {{userInfo.DiagnosisTimeRange == 1 && 'active'}}"
-          data-key="DiagnosisTimeRange"
-          data-id="1"
-          bind:tap="handleRadio"
-        >
-          6个月以内
-        </view>
-        <view
-          class="age-item {{userInfo.DiagnosisTimeRange == 2 && 'active'}}"
-          data-key="DiagnosisTimeRange"
-          data-id="2"
-          bind:tap="handleRadio"
-        >
-          6个月-3年
-        </view>
-        <view
-          class="age-item {{userInfo.DiagnosisTimeRange == 3 && 'active'}}"
-          data-key="DiagnosisTimeRange"
-          data-id="3"
-          bind:tap="handleRadio"
-        >
-          3年以上
-        </view>
-      </view>
-      <view class="row-title">真实姓名</view>
+      <view class="row-title">患者姓名</view>
       <view class="row">
         <input
           class="input"
           placeholder-style="color:rgba(34,34,34,0.3)"
-          placeholder="输入真实姓名"
+          placeholder="输入姓名"
           value="{{userInfo.PatientName}}"
           maxlength="{{8}}"
           bindinput="handleInput"

src/pages/qaForm/index.scss

@@ -1,6 +1,12 @@
 page {
   background-color: #f6f6f6;
 }
+.page-tip {
+  padding: 16rpx 32rpx;
+  font-size: 32rpx;
+  color: rgba(248, 167, 28, 1);
+  background-color: rgba(255, 248, 236, 1);
+}
 .page {
   padding: 32rpx 32rpx 80rpx;
   .card {
@@ -166,6 +172,7 @@ page {
       padding: 26rpx 32rpx;
       background-color: rgba(248, 248, 248, 1);
       border-radius: 24rpx;
+      font-size: 36rpx;
     }
     .place-input {
       color: rgba(34, 34, 34, 0.4);

src/pages/qaForm/index.ts

@@ -272,17 +272,18 @@ Page({
     })
 
     this.setData({ isSubmitting: true })
+    wx.showLoading({ title: '提交中...', mask: true })
     wx.ajax({
       method: 'POST',
       url: '?r=igg4/health-question/submit-questionnaire',
       data: { answers },
-      loading: true,
     })
       .then(() => {
         app.startLogin().then(() => {
           app.getUserInfo(this, true, () => {
             app.getTheme().then((res) => {
               this.setData({ theme: res })
+              wx.hideLoading()
               wx.showToast({ title: '提交成功', icon: 'success' })
               const { backPage } = this.data
               if (backPage) {
@@ -294,6 +295,9 @@ Page({
           })
         })
       })
+      .catch(() => {
+        wx.hideLoading()
+      })
       .finally(() => {
         this.setData({ isSubmitting: false })
       })

src/pages/qaForm/index.wxml

@@ -1,4 +1,5 @@
 <wxs src="../../utils/tools.wxs" module="tools" />
+<view class="page-tip">完善健康档案，记录自身病情变化。可帮助医护更准确了解情况，守护您的身体健康。</view>
 <view class="page" id="{{theme === 'DRUG' && 'drug-page'}}">
   <block wx:for="{{questions}}" wx:for-index="qIndex" wx:key="QuestionNo">
     <view class="card" wx:if="{{item.visible}}">

src/pages/qaFormDetail/index.scss

@@ -80,7 +80,7 @@ page {
     justify-content: center;
     background: linear-gradient(94deg, #0eb66d 0%, #00d277 100%);
     border-radius: 16rpx;
-    font-size: 40rpx;
+    font-size: 36rpx;
     color: rgba(255, 255, 255, 1);
   }
 }

src/pages/repository/index.scss

@@ -131,12 +131,12 @@
           .f-item {
             display: flex;
             align-items: center;
-            font-size: 22rpx;
+            font-size: 32rpx;
             color: #b6b7ba;
             .icon {
               margin-right: 8rpx;
-              width: 32rpx;
-              height: 32rpx;
+              width: 38rpx;
+              height: 38rpx;
             }
             &.active {
               color: #0eb66d;
@@ -198,12 +198,12 @@
           .f-item {
             display: flex;
             align-items: center;
-            font-size: 22rpx;
+            font-size: 32rpx;
             color: #b6b7ba;
             .icon {
               margin-right: 8rpx;
-              width: 36rpx;
-              height: 36rpx;
+              width: 38rpx;
+              height: 38rpx;
             }
             &.active {
               color: #0eb66d;

src/pages/repositoryDetail/index.scss

@@ -89,15 +89,15 @@
               .f-item {
                 display: flex;
                 align-items: center;
-                font-size: 22rpx;
+                font-size: 32rpx;
                 color: #b6b7ba;
                 .icon {
                   margin-right: 8rpx;
-                  width: 32rpx;
-                  height: 32rpx;
+                  width: 38rpx;
+                  height: 38rpx;
                 }
                 &.active {
-                  color: rgba(249, 163, 14, 1);
+                  color: #0eb66d;
                 }
                 &:not(:last-of-type)::after {
                   margin: 18rpx;
@@ -175,7 +175,7 @@
       align-items: center;
       justify-content: center;
       gap: 6rpx;
-      font-size: 30rpx;
+      font-size: 32rpx;
       color: rgba(34, 34, 34, 0.7);
       margin: 0;
       padding: 0;