2.2.0 stash

src/app.ts

@@ -196,13 +196,13 @@ App<IAppOption>({
       if (type.includes(0) && [0, 1, 2].includes(loginType)) {
         return true
       }
-      if ([0, 1].includes(loginType)) {
+      if (type.includes(0) || type.includes(1)) {
         wx.reLaunch({
           url: '/patient/pages/login/index',
         })
         return false
       }
-      if (loginType === 2) {
+      if (type.includes(2)) {
         wx.reLaunch({
           url: '/pages/login/index',
         })

src/components/toast/index.scss

@@ -2751,20 +2751,13 @@
 .popup-qw {
   .popup-container {
     width: 630rpx;
-    height: 788rpx;
+    height: 802rpx;
     overflow: hidden;
     .code {
-      margin: 264rpx auto 0;
+      margin: 342rpx auto 0;
       display: block;
-      width: 284rpx;
-      height: 284rpx;
-    }
-    .tip {
-      margin-top: 48rpx;
-      font-size: 32rpx;
-      color: #211d2e;
-      text-align: center;
-      line-height: 44rpx;
+      width: 264rpx;
+      height: 264rpx;
     }
   }
 }

src/components/toast/index.wxml

@@ -801,7 +801,15 @@
   <view class="popup-question-toast" wx:if="{{type == 'question-toast'}}">
     <view class="popup-container">
       <view class="title">{{params.title}}</view>
-      <view class="scroll">{{params.content}}</view>
+      <view class="scroll" wx:if="{{params.type==1}}">
+        GO-QOL生活质量量表，是《中国甲状腺相关眼病诊断和治疗指南(2022年)》中提及的唯一可居家自测的甲状腺眼病评估量表，反映了疾病对患者生活质量的影响。得分越低影响越大，让患者主观感受清晰可见。
+      </view>
+      <view class="scroll" wx:elif="{{params.type==2}}">
+        《中国甲状腺相关眼病诊断和治疗指南（2022年）》指出，剂量越高短期效果可能越好，但不良反应也会更大，并且同一疗程需严格控制累积剂量。
+        且风险与用药剂量和用药时间相关。
+        <view></view>
+        规范记录每次用药时间、剂量与不适反应，可帮助及时发现风险线索，便于医生综合评估疗效与安全性并调整方案；这是用药安全管理的关键一步。
+      </view>
     </view>
   </view>
   <view class="popup-enter-info" wx:if="{{type==='guideEnterInfo'}}">
@@ -836,11 +844,6 @@
       style="background: url('{{imageUrl}}bg49.png?t={{Timestamp}}') no-repeat top center/100%"
     >
       <image class="code" src="{{params.ConsultQwImg}}" show-menu-by-longpress></image>
-      <view class="tip">
-        长按识别二维码
-        <view></view>
-        添加客服人员
-      </view>
     </view>
   </view>
 

src/pages/d_patientDetail/index.ts

@@ -210,10 +210,10 @@ Page({
   },
   handleAnchor(anchor) {
     if (anchor == 'qol') {
-      wx.pageScrollTo({ selector: '#qol' })
+      wx.pageScrollTo({ selector: '#qol', offsetTop: -80 })
     }
     if (anchor == 'hormone') {
-      wx.pageScrollTo({ selector: '#hormone' })
+      wx.pageScrollTo({ selector: '#hormone', offsetTop: -80 })
     }
   },
   getQolDetail() {

src/pages/d_patientDetail/index.wxml

@@ -40,6 +40,14 @@
     </view>
     <view class="b-container">
       <view class="row">
+        <view class="label">甲状腺眼病分级</view>
+        <view class="col">{{detail.DiseaseStageName}}</view>
+      </view>
+      <view class="row">
+        <view class="label">甲状腺眼病分期</view>
+        <view class="col">{{detail.DiseasePeriodName}}</view>
+      </view>
+      <view class="row">
         <view class="label">Graves病病史</view>
         <view class="col">{{detail.IsGravesName}}</view>
       </view>
@@ -145,8 +153,9 @@
       </view>
     </view>
   </view>
+  <view id="qol"></view>
   <view class="chart-list">
-    <view class="chart-card" id="qol">
+    <view class="chart-card">
       <view class="chart-card-title">生活质量评分趋势</view>
       <view class="chart-filter">
         <picker class="type" mode="selector" range="{{typeRange}}" range-key="value" bind:change="handleTypeChange">

src/pages/d_qolDetail/index.scss

@@ -248,7 +248,7 @@ page {
             &.green {
               color: #1ec580;
             }
-            &:first-of-type {
+            &:not(:last-of-type) {
               color: #211d2e !important;
             }
           }

src/pages/d_qolDetail/index.wxml

@@ -26,15 +26,15 @@
               <view class="td">{{item.CreateDate}}</view>
               <block wx:if="{{tab==0}}">
                 <view class="td">{{item.TotalScore}}</view>
-                <view class="td {{item.changeTotalScore >= 0 ? 'green' : 'red'}}">{{item.changeTotalScore}}</view>
+                <view class="td {{item.changeTotalScore >= 0 ? 'red' : 'green'}}">{{item.changeTotalScore}}</view>
               </block>
               <block wx:elif="{{tab==1}}">
                 <view class="td">{{item.VisionScore}}</view>
-                <view class="td {{item.changeVisionScore >= 0 ? 'green' : 'red'}}">{{item.changeVisionScore}}</view>
+                <view class="td {{item.changeVisionScore >= 0 ? 'red' : 'green'}}">{{item.changeVisionScore}}</view>
               </block>
               <block wx:elif="{{tab==2}}">
                 <view class="td">{{item.AppearanceScore}}</view>
-                <view class="td {{item.changeAppearanceScore >= 0 ? 'green' : 'red'}}">
+                <view class="td {{item.changeAppearanceScore >= 0 ? 'red' : 'green'}}">
                   {{item.changeAppearanceScore}}
                 </view>
               </block>
@@ -123,7 +123,7 @@
           <view class="tbody">
             <view class="tr">
               <view
-                class="td {{item.Question1 >= list2[index-1].Question1 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion1Score > 0 ? 'green' : (item.changeQuestion1Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -132,7 +132,7 @@
             </view>
             <view class="tr">
               <view
-                class="td {{item.Question2 >= list2[index-1].Question2 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion2Score > 0 ? 'green' : (item.changeQuestion2Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -141,7 +141,7 @@
             </view>
             <view class="tr">
               <view
-                class="td {{item.Question3 >= list2[index-1].Question3 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion3Score > 0 ? 'green' : (item.changeQuestion3Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -150,7 +150,7 @@
             </view>
             <view class="tr">
               <view
-                class="td {{item.Question4 >= list2[index-1].Question4 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion4Score > 0 ? 'green' : (item.changeQuestion4Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -159,7 +159,7 @@
             </view>
             <view class="tr">
               <view
-                class="td {{item.Question5 >= list2[index-1].Question5 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion5Score > 0 ? 'green' : (item.changeQuestion5Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -168,7 +168,7 @@
             </view>
             <view class="tr">
               <view
-                class="td {{item.Question6 >= list2[index-1].Question6 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion6Score > 0 ? 'green' : (item.changeQuestion6Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -177,7 +177,7 @@
             </view>
             <view class="tr">
               <view
-                class="td {{item.Question7 >= list2[index-1].Question7 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion7Score > 0 ? 'green' : (item.changeQuestion7Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -186,7 +186,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question8 >= list2[index-1].Question8 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion8Score > 0 ? 'green' : (item.changeQuestion8Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -195,7 +195,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question9 >= list2[index-1].Question9 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion9Score > 0 ? 'green' : (item.changeQuestion9Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -204,7 +204,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question10 >= list2[index-1].Question10 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion10Score > 0 ? 'green' : (item.changeQuestion10Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -213,7 +213,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question11 >= list2[index-1].Question11 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion11Score > 0 ? 'green' : (item.changeQuestion11Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -222,7 +222,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question12 >= list2[index-1].Question12 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion12Score > 0 ? 'green' : (item.changeQuestion12Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -231,7 +231,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question13 >= list2[index-1].Question13 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion13Score > 0 ? 'green' : (item.changeQuestion13Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -240,7 +240,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question14 >= list2[index-1].Question14 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion14Score > 0 ? 'green' : (item.changeQuestion14Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -249,7 +249,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question15 >= list2[index-1].Question15 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion15Score > 0 ? 'green' : (item.changeQuestion15Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >
@@ -258,7 +258,7 @@
             </view>
             <view class="tr mtr">
               <view
-                class="td {{item.Question16 >= list2[index-1].Question16 ? 'green' : 'red'}}"
+                class="td {{item.changeQuestion16Score > 0 ? 'green' : (item.changeQuestion16Score < 0 ? 'red' : '')}}"
                 wx:for="{{list2}}"
                 wx:key="index"
               >

src/patient/pages/doctor/index.scss

@@ -133,16 +133,33 @@ page {
             line-height: 48rpx;
           }
           .tag {
-            flex-shrink: 0;
+            margin-right: 12rpx;
             display: inline-block;
             vertical-align: 2rpx;
-            padding: 2rpx 12rpx;
+            padding: 0 12rpx;
             font-size: 24rpx;
-            line-height: 32rpx;
+            line-height: 36rpx;
             color: #ffffff;
             background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%);
             border-radius: 6rpx;
           }
+          .medical {
+            display: inline-block;
+            box-sizing: border-box;
+            padding: 0 12rpx 0 8rpx;
+            font-size: 24rpx;
+            line-height: 36rpx;
+            color: #ffffff;
+            border-radius: 6rpx;
+            gap: 2rpx;
+            background: linear-gradient(210deg, #1ec580 0%, #4feaaa 100%);
+            .m-icon {
+              vertical-align: -4rpx;
+              display: inline-block;
+              width: 28rpx;
+              height: 28rpx;
+            }
+          }
         }
         .content {
           margin-top: 16rpx;
@@ -181,23 +198,6 @@ page {
               border: 1px solid #b982ff;
               box-sizing: border-box;
             }
-            .medical {
-              margin-right: 22rpx;
-              box-sizing: border-box;
-              padding: 0 12rpx 0 8rpx;
-              font-size: 24rpx;
-              line-height: 36rpx;
-              color: #ffffff;
-              border-radius: 6rpx;
-              display: flex;
-              align-items: center;
-              gap: 2rpx;
-              background: linear-gradient(210deg, #1ec580 0%, #4feaaa 100%);
-              .m-icon {
-                width: 28rpx;
-                height: 28rpx;
-              }
-            }
             .drug {
               padding-right: 8rpx;
               display: inline-flex;

src/patient/pages/doctor/index.wxml

@@ -69,6 +69,10 @@
           <view class="tag" wx:if="{{item.HospitalClassificationName ||  item.HospitalLevelName}}">
             {{item.HospitalClassificationName}}{{item.HospitalLevelName}}
           </view>
+          <view class="medical" wx:if="{{item.isReimbursement==1}}">
+            <image class="m-icon" src="{{imageUrl}}icon132.png?t={{Timestamp}}"></image>
+            医保
+          </view>
         </view>
         <view class="content">
           <view class="inner">
@@ -86,10 +90,6 @@
           </view>
           <view class="tags">
             <view class="tag" wx:if="{{item.DoctorNum>0}}">{{item.DoctorNum}}名医生</view>
-            <view class="medical" wx:if="{{item.isReimbursement==1}}">
-              <image class="m-icon" src="{{imageUrl}}icon132.png?t={{Timestamp}}"></image>
-              医保
-            </view>
             <view class="drug" wx:if="{{item.IsHaveDrug==1}}">
               <image class="drug-icon" src="{{imageUrl}}za-images//nrdl/drug.png"></image>
               院内有药

src/patient/pages/index/index.scss

@@ -106,7 +106,7 @@ page {
       grid-template-columns: repeat(2, 1fr);
       gap: 30rpx;
       .k-qol {
-        padding: 48rpx 0rpx 22rpx 32rpx;
+        padding: 0 0rpx 22rpx 32rpx;
         background: linear-gradient(
           180deg,
           rgba(239, 226, 255, 0.52) 0%,
@@ -116,6 +116,7 @@ page {
         border-radius: 32rpx 32rpx 32rpx 32rpx;
         border: 2rpx solid #ffffff;
         .title {
+          padding-top: 48rpx;
           font-size: 36rpx;
           color: #211d2e;
           line-height: 48rpx;
@@ -191,7 +192,7 @@ page {
       }
       .k-hormones {
         position: relative;
-        padding: 48rpx 0rpx 22rpx 32rpx;
+        padding: 0 0rpx 22rpx 32rpx;
         background: linear-gradient(
           180deg,
           rgba(255, 227, 253, 0.52) 0%,
@@ -208,6 +209,7 @@ page {
           height: 104rpx;
         }
         .title {
+          padding-top: 48rpx;
           position: relative;
           z-index: 1;
           font-size: 36rpx;

src/patient/pages/index/index.ts

@@ -46,7 +46,7 @@ Page({
 
     toastShow: false,
     toastType: '',
-    toastParams: {close:true} as any,
+    toastParams: { close: true } as any,
 
     sliderTop: 0,
 
@@ -577,10 +577,7 @@ Page({
           1: '生活质量自评',
           2: '激素记录',
         }[type],
-        content: {
-          1: 'GO-QOL生活质量量表，是《中国甲状腺相关眼病诊断和治疗指南(2022年)》中提及的唯一可居家自测的甲状腺眼病评估量表，反映了疾病对患者生活质量的影响。得分越低影响越大，让患者主观感受清晰可见。',
-          2: '激素治疗不是“越多越好”。《中国甲状腺相关眼病诊断和治疗指南（2022年）》指出，剂量越高短期效果可能越好，但不良反应也会更大，并且同一疗程需严格控制累积剂量。 激素相关风险包括肝损伤、血压升高、血糖升高、电解质紊乱、消化道出血和感染等，且风险与用药剂量和用药时间相关。 规范记录每次用药时间、剂量与不适反应，可帮助及时发现风险线索，便于医生综合评估疗效与安全性并调整方案；这是用药安全管理的关键一步。',
-        }[type],
+        type,
         close: true,
       },
     })

src/patient/pages/liveDetail/index.scss

@@ -62,7 +62,7 @@
       }
     }
     .qw {
-      margin-top: 22rpx;
+      margin-top: 32rpx;
       .q-img {
         display: block;
         width: 100%;
@@ -70,7 +70,7 @@
     }
     .screen {
       position: relative;
-      margin-top: 30rpx;
+      margin-top: 32rpx;
       padding: 16rpx 32rpx 16rpx;
       background: rgba(246, 248, 249, 1);
       box-sizing: border-box;
@@ -190,7 +190,7 @@
       }
     }
     .content {
-      margin-top: 24rpx;
+      margin-top: 32rpx;
       .c-title {
         font-size: 36rpx;
         color: #333333;
@@ -225,11 +225,12 @@
         align-items: center;
         justify-content: center;
         font-size: 24rpx;
-        color: #b982ff;
         gap: 8rpx;
         white-space: nowrap;
+        color: #211d2e;
         .c-item {
           padding: 0 8rpx;
+          color: #b982ff;
           line-height: 48rpx;
           background-color: #fff;
           min-width: 50rpx;

src/patient/pages/liveDetail/index.wxml

@@ -43,7 +43,7 @@
     <view class="qw" bind:tap="handleQw" wx:if="{{detail.consultConfig.ConsultBanner}}">
       <image class="q-img" mode="widthFix" src="{{detail.consultConfig.ConsultBanner}}"></image>
     </view>
-    <view class="screen" wx:if="{{detail.SignUpRecord.length}}">
+    <view class="screen" wx:elif="{{detail.SignUpRecord.length}}">
       <swiper
         class="screen-list"
         autoplay="{{detail.SignUpRecord.length>2}}"
@@ -81,7 +81,6 @@
       </view>
     </view>
     <view class="content">
-      <view class="c-title">详情介绍</view>
       <image class="c-img" mode="widthFix" src="{{item.url}}" wx:for="{{detail.DetailJson}}" wx:key="name"></image>
     </view>
     <view
@@ -103,7 +102,7 @@
     >
       <view class="count-down">
         倒计时
-        <block>
+        <block wx:if="{{timeData.days>0}}">
           <view class="c-item">{{timeData.days}}</view>
           天
         </block>

src/patient/pages/liveResult/index.scss

@@ -96,7 +96,7 @@ page {
     }
     .go-live {
       position: fixed;
-      bottom: 116rpx;
+      bottom: 166rpx;
       left: 50%;
       transform: translateX(-50%);
       width: 670rpx;
@@ -112,7 +112,7 @@ page {
     }
     .go-share {
       position: fixed;
-      bottom: 116rpx;
+      bottom: 166rpx;
       left: 50%;
       padding: 0 32rpx 0 12rpx;
       transform: translateX(-50%);

src/patient/pages/medical/index.scss

@@ -63,6 +63,9 @@ page {
           width: 100%;
           height: 100%;
         }
+        &.active {
+          color: #211d2e;
+        }
       }
     }
     .submit-btn {

src/patient/pages/medical/index.wxml

@@ -25,7 +25,7 @@
         cname="{{cityName}}"
         bind:ok="handleChangeSite"
       >
-        <view class="picker-content" bind:tap="handleSite">
+        <view class="picker-content {{provinceName && 'active'}}" bind:tap="handleSite">
           <block wx:if="{{provinceName}}">{{provinceName}}{{provinceName == cityName ? '' : cityName}}</block>
           <block wx:else>选择省份城市</block>
           <van-icon name="arrow-down" />
@@ -37,7 +37,7 @@
         <image class="icon" src="{{imageUrl}}icon111.png?t={{Timestamp}}"></image>
         我就诊的医院
       </view>
-      <view class="picker-content" bind:tap="handleHostipal">
+      <view class="picker-content {{hostipalName && 'active'}}" bind:tap="handleHostipal">
         <block wx:if="{{hostipalName}}">{{hostipalName}}</block>
         <block wx:else>选择就诊医院</block>
         <van-icon name="arrow-down" />

src/utils/page.ts

@@ -39,7 +39,8 @@ function page(config: WechatMiniprogram.Page.Instance<WechatMiniprogram.IAnyObje
   config.onShareAppMessage = function (options) {
     if (originalOnShareAppMessage) {
       return originalOnShareAppMessage.call(this, options)
-    } else {
+    }
+    else {
       const date = new Date()
       const Timestamp = date.getTime()
 
@@ -61,9 +62,16 @@ function page(config: WechatMiniprogram.Page.Instance<WechatMiniprogram.IAnyObje
       if (isNoShare) {
         url = 'pages/start/index'
       }
+      if (url.includes('doctor/pages')) {
         return {
           title: 'TED规范化诊治中心',
           path: url,
+          imageUrl: `${getApp().globalData.imageUrl}doctor-share.png?t=${Timestamp}`,
+        }
+      }
+      return {
+        title: 'TED关爱小助手',
+        path: url,
         imageUrl: `${getApp().globalData.imageUrl}share.png?t=${Timestamp}`,
       }
     }