Przeglądaj źródła

修复中医调养

张田田 10 miesięcy temu
rodzic
commit
f3e89f066f

BIN
miniprogram/module/health/assets/icon/icon_treatment@3x.png


+ 5 - 4
miniprogram/module/health/components/nodrug-therapy/nodrug-therapy.scss

@@ -75,17 +75,18 @@
   background: #fff;
   background: #fff;
   border-radius: 16rpx;
   border-radius: 16rpx;
   margin-bottom: 18rpx;
   margin-bottom: 18rpx;
-  padding: 24rpx 24rpx 18rpx 24rpx;
+  padding: 30rpx 24rpx 18rpx 24rpx;
   box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
   box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
 }
 }
 .therapy-title {
 .therapy-title {
-  font-size: 28rpx;
+  font-size: 32rpx;
   font-weight: 500;
   font-weight: 500;
   color: #222;
   color: #222;
-  margin-bottom: 12rpx;
+  margin-bottom: 20rpx;
+  text-align: center;
 }
 }
 .therapy-row {
 .therapy-row {
-  font-size: 26rpx;
+  font-size: 28rpx;
   color: #666;
   color: #666;
   margin-bottom: 8rpx;
   margin-bottom: 8rpx;
   display: flex;
   display: flex;

+ 2 - 2
miniprogram/module/health/components/nodrug-therapy/nodrug-therapy.wxml

@@ -8,7 +8,7 @@
       <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
       <t-loading wx:if="{{loading}}" theme="spinner" size="20px" class="loading" />
       <view class="card-title">
       <view class="card-title">
         <view>
         <view>
-          <image src="../../assets/icon/icon_record@2x.png" class="icon-title" />
+          <image src="../../assets/icon/icon_treatment@3x.png" class="icon-title" />
         </view>
         </view>
         <view class="text-title">非药物治疗</view>
         <view class="text-title">非药物治疗</view>
       </view>
       </view>
@@ -21,7 +21,7 @@
     <view class="nodrug-therapy-list" wx:if="{{offlineTreatmentList.length>0}}">
     <view class="nodrug-therapy-list" wx:if="{{offlineTreatmentList.length>0}}">
       <block wx:for="{{offlineTreatmentList}}" wx:key="id">
       <block wx:for="{{offlineTreatmentList}}" wx:key="id">
         <view class="therapy-card">
         <view class="therapy-card">
-          <view class="therapy-title">{{item.title}}</view>
+          <view class="therapy-title">{{item.conditioningProgramName}}</view>
           <view class="therapy-row">
           <view class="therapy-row">
             <text class="label">下次时间:</text>
             <text class="label">下次时间:</text>
             <text style="color:black">{{item.arrangeDate}}</text>
             <text style="color:black">{{item.arrangeDate}}</text>

+ 2 - 2
miniprogram/module/health/components/report-health-patient/report-health-patient.wxml

@@ -10,13 +10,13 @@
         <view class="row">
         <view class="row">
           <span class="col">
           <span class="col">
             <text class="text-item">{{dictionary.label($dictionaries, 'sys_user_sex', dataset.sex)}}</text>
             <text class="text-item">{{dictionary.label($dictionaries, 'sys_user_sex', dataset.sex)}}</text>
-            <text class="text-item">{{dataset.age}}岁</text>
+            <text class="text-item" wx:if="{{dataset.age}}">{{dataset.age}}岁</text>
             <block wx:for="{{specialPeriod}}" wx:key="*this">
             <block wx:for="{{specialPeriod}}" wx:key="*this">
               <text class="text-item" wx:if="{{dictionary.label($dictionaries,'women_special_period', item) !== '无'}}">{{dictionary.label($dictionaries,'women_special_period', item)}}</text>
               <text class="text-item" wx:if="{{dictionary.label($dictionaries,'women_special_period', item) !== '无'}}">{{dictionary.label($dictionaries,'women_special_period', item)}}</text>
             </block>
             </block>
             <text class="text-item" wx:for="{{job}}" wx:key="*this">{{dictionary.label($dictionaries, 'job', item)}}</text>
             <text class="text-item" wx:for="{{job}}" wx:key="*this">{{dictionary.label($dictionaries, 'job', item)}}</text>
             <view class="text-items" wx:if="{{dataset.phone}}"><text style="color:#8C8C8C">手机号:</text><text style="color:black">{{dataset.phone}}</text></view>
             <view class="text-items" wx:if="{{dataset.phone}}"><text style="color:#8C8C8C">手机号:</text><text style="color:black">{{dataset.phone}}</text></view>
-            <view class="text-items"><text style="color:#8C8C8C">身份证号:</text>
+            <view class="text-items"><text style="color:#8C8C8C" wx:if="{{dataset.cardno}}">身份证号:</text>
               <view style="color:black">{{dataset.cardno}}</view>
               <view style="color:black">{{dataset.cardno}}</view>
             </view>
             </view>
           </span>
           </span>

+ 1 - 0
miniprogram/module/health/components/report-health-status/report-health-status.scss

@@ -8,6 +8,7 @@
   font-size: 16px;
   font-size: 16px;
   font-weight: bold;
   font-weight: bold;
   color: black;
   color: black;
+  width: 95%;
 }
 }
 .status-content{
 .status-content{
   width: 100%;
   width: 100%;

+ 1 - 2
miniprogram/pages/home/home.wxml

@@ -24,9 +24,8 @@ v<!--pages/home/home.wxml-->
         <text class="user-name">{{patient.name}}</text>
         <text class="user-name">{{patient.name}}</text>
          <t-icon color="{{patientIconColor}}" name="{{patientIcon}}" size="20px"></t-icon>
          <t-icon color="{{patientIconColor}}" name="{{patientIcon}}" size="20px"></t-icon>
          </view>
          </view>
-
          <view>
          <view>
-        <text class="user-age">{{patient.age}}岁</text>
+        <text class="user-age" wx:if="{{patient.age}}">{{patient.age}}岁</text>
         <text class="user-description" overflow="fade" max-lines="1">{{patientDescription}}</text>
         <text class="user-description" overflow="fade" max-lines="1">{{patientDescription}}</text>
         </view>
         </view>
     </view>
     </view>