Merge branch 'main' of https://git.1024tool.vip/xz/doctor-mini into main

2025-07-18 17:55:56 +08:00 · 2025-07-18 17:55:56 +08:00 · 20b415ffc4
commit 20b415ffc4
parent 4d02e461c5 91c34c3f9b
7 changed files with 25 additions and 20 deletions
--- a/app.less
+++ b/app.less
@ -28,9 +28,7 @@ page {
  button{
    margin: 0;
  }
-  .t-image-viewer {
-    top: 0;
-  }
+  
  .t-navbar__content{
    background-color: transparent;
  }
--- a/pages/followUp/index.less
+++ b/pages/followUp/index.less
@ -63,6 +63,7 @@
                height: 196rpx;
                background: #F8F8F8;
                border-radius: 16rpx;
+                overflow: hidden;
                border: 1rpx solid #EEEEEE;
                position: relative;
                image{
--- a/pages/followUp/index.wxml
+++ b/pages/followUp/index.wxml
@ -48,7 +48,7 @@
        <view class="item-title">肝功能</view>
        <view class="follow-images">
            <t-row gutter="16">
-                <t-col span="8" wx:for="{{detail.liver_function_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && form.liver_function_image.length > 12)}}">
+                <t-col span="8" wx:for="{{detail.liver_function_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && detail.liver_function_image.length > 2)}}">
                    <view class="report-image" data-mode="liver_function_image" data-index="{{index}}" bind:tap="handleImagePreview">
                        <image class="image" src="{{item}}" mode=""></image>
                        <view class="more" wx:if="{{index == 2 && detail.liver_function_image.length > 3 }}">+ {{detail.liver_function_image.length - 3}}</view>
@ -95,7 +95,7 @@
        <view class="follow-images">
            <t-row gutter="16">
                
-                <t-col span="8" wx:for="{{detail.coagulation_function_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && form.coagulation_function_image.length > 12)}}">
+                <t-col span="8" wx:for="{{detail.coagulation_function_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && detail.coagulation_function_image.length > 2)}}">
                    <view class="report-image" data-mode="coagulation_function_image" data-index="{{index}}" bind:tap="handleImagePreview">
                        <image class="image" src="{{item}}" mode=""></image>
                        <view class="more" wx:if="{{index == 2 && detail.coagulation_function_image.length > 3 }}">+ {{detail.coagulation_function_image.length - 3}}</view>
@ -149,7 +149,7 @@
        <view class="follow-images">
            <t-row gutter="16">
               
-                <t-col span="8" wx:for="{{detail.blood_routine_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && form.blood_routine_image.length > 12)}}">
+                <t-col span="8" wx:for="{{detail.blood_routine_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && detail.blood_routine_image.length > 2)}}">
                    <view class="report-image" data-mode="blood_routine_image" data-index="{{index}}" bind:tap="handleImagePreview">
                        <image class="image" src="{{item}}" mode=""></image>
                        <view class="more" wx:if="{{index == 2 && detail.blood_routine_image.length > 3 }}">+ {{detail.blood_routine_image.length - 3}}</view>
@ -181,7 +181,7 @@
        <view class="follow-images">
            <t-row gutter="16">
                
-                <t-col span="8" wx:for="{{detail.b_mode_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && form.b_mode_image.length > 12)}}">
+                <t-col span="8" wx:for="{{detail.b_mode_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && detail.b_mode_image.length > 2)}}">
                    <view class="report-image" data-mode="b_mode_image" data-index="{{index}}" bind:tap="handleImagePreview">
                        <image class="image" src="{{item}}" mode=""></image>
                        <view class="more" wx:if="{{index == 2 && detail.b_mode_image.length > 3 }}">+ {{detail.b_mode_image.length - 3}}</view>
@ -255,7 +255,7 @@
        <view class="follow-images">
            <t-row gutter="16">
                
-                <t-col span="8" wx:for="{{detail.nutritional_indicator_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && form.nutritional_indicator_image.length > 12)}}">
+                <t-col span="8" wx:for="{{detail.nutritional_indicator_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && detail.nutritional_indicator_image.length > 2)}}">
                    <view class="report-image" data-mode="nutritional_indicator_image" data-index="{{index}}" bind:tap="handleImagePreview">
                        <image class="image" src="{{item}}" mode=""></image>
                        <view class="more" wx:if="{{index == 2 && detail.nutritional_indicator_image.length > 3 }}">+ {{detail.nutritional_indicator_image.length - 3}}</view>
@ -293,7 +293,7 @@
        <view class="follow-images">
            <t-row gutter="16">
                
-                <t-col span="8" wx:for="{{detail.mdt_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && form.b_mode_image.length > 12)}}">
+                <t-col span="8" wx:for="{{detail.mdt_image}}" wx:key="index" wx:if="{{index < 2 || (index == 2 && detail.b_mode_image.length > 2)}}">
                    <view class="report-image" data-mode="mdt_image" data-index="{{index}}" bind:tap="handleImagePreview">
                        <image class="image" src="{{item}}" mode=""></image>
                        <view class="more" wx:if="{{index == 2 && detail.mdt_image.length > 3 }}">+ {{detail.mdt_image.length - 3}}</view>
@ -326,7 +326,7 @@
 <t-image-viewer
  usingCustomNavbar
  deleteBtn="{{false}}"
-  closeBtn="{{false}}"
+  closeBtn="{{true}}"
  showIndex="{{true}}"
  initial-index="{{imageIndex}}"
  visible="{{imageVisible}}"
--- a/pages/home/index.js
+++ b/pages/home/index.js
@ -51,7 +51,7 @@ Page({
  },
  async getPersonalInfo(id) {
    const info = await request('doctor/patient/basic/'+id).then((res) => res);
-    console.log(info)
+    info.avatar = info.avatar ? info.avatar : 'https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/my/baby.png';
    this.setData({
      userInfo: info
    })
@ -79,7 +79,7 @@ Page({
        heightData.push(item.height)
        weightData.push(item.weight)
        totalBilirubin.push(item.total_bilirubin)
-        directBilirubin.push(item.directBilirubin)
+        directBilirubin.push(item.direct_bilirubin)
        xAxis.push(item.age)
      })
    }
@ -325,7 +325,6 @@ Page({
  // 初始化体间接胆红素趋势
  initIndirectChart() {

-
    const chartComp = this.selectComponent('#mychart-dom-indirect');
    if (chartComp) {
      chartComp.init((canvas, width, height, dpr) => {
--- a/pages/home/index.less
+++ b/pages/home/index.less
@ -53,12 +53,16 @@

    .box_1 {
      border-radius: 100%;
-      background-image: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/e2d2f77550f64a02bebd425d1db7d2e3_mergeImage.png);
      width: 120rpx;
      height: 120rpx;
      border: 1px solid rgba(248, 248, 248, 1);
      display: flex;
      flex-direction: column;
+      overflow: hidden;
+      image{
+        width: 100%;
+        height: 100%;
+      }
    }

    .text-group_1 {
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@ -5,7 +5,9 @@
  <view class="home-content">

    <view class="group_2">
-      <view class="box_1"></view>
+      <view class="box_1">
+        <image src="{{userInfo.avatar}}" />
+      </view>
      <view class="text-group_1">
        <text lines="1" class="text_2">{{userInfo.username}}<text lines="1" decode="true" class="text_4">{{userInfo.sex == 1 ? '男':'女'}}&nbsp;·&nbsp;{{ userInfo.age }}</text></text>
        <text lines="1" class="text_3">下次随访时间：{{ userInfo.next_follow_date }}</text>
@ -70,6 +72,7 @@
        <view class="echarts-canvas-container">
          <ec-canvas wx:if="{{ activeIndex == 0 }}" id="mychart-dom-height" canvas-id="mychart-height" ec="{{ ec }}"></ec-canvas>
          <ec-canvas wx:else id="mychart-dom-weight" canvas-id="mychart-weight" ec="{{ ec2 }}" ></ec-canvas>
+          <!--  force-use-old-canvas="true"  -->
        </view>
      </view>
      <view class="item-title">
--- a/project.private.config.json
+++ b/project.private.config.json
@ -33,7 +33,7 @@
      ]
    }
  },
-  "libVersion": "3.8.8",
+  "libVersion": "3.8.10",
  "setting": {
    "urlCheck": false,
    "compileHotReLoad": true,