From d5cc7b3af4d1a40d94483370d3afad4af4ed600e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BD=B3=E5=AE=87?= <17601616548@163.com>
Date: Mon, 7 Oct 2024 21:38:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BD=93=E6=A3=80=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E6=B2=A1=E6=9C=89=E5=8F=B7=E6=BA=90ID=E7=9A=84bug=202?=
 =?UTF-8?q?.=E8=B6=8B=E5=8A=BF=E5=88=86=E6=9E=90=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E9=A1=B5=203.=E5=A5=97=E9=A4=90=E5=88=97=E8=A1=A8=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=8C=BB=E7=94=9F=E9=80=89=E6=8B=A9=204.=E4=BD=93?=
 =?UTF-8?q?=E6=A3=80=E5=BC=95=E5=AF=BC=E5=8A=A0=E5=85=A5=E5=BF=83=E7=94=B5?=
 =?UTF-8?q?=E5=9B=BE=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/main/bgcx/ckbg/ckbg.vue   | 13 +++++++------
 h5/pages/main/bgcx/qsfx/qsfxxq.vue | 10 ++++++++++
 h5/pages/main/combo/combo.vue      |  6 +++---
 h5/pages/main/tjyy/tjyy.vue        |  4 ++--
 h5/pages/user/fenzhen/fenzhen.vue  |  8 +++++++-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/h5/pages/main/bgcx/ckbg/ckbg.vue b/h5/pages/main/bgcx/ckbg/ckbg.vue
index e4888e8..ff52cde 100755
--- a/h5/pages/main/bgcx/ckbg/ckbg.vue
+++ b/h5/pages/main/bgcx/ckbg/ckbg.vue
@@ -91,9 +91,9 @@ const collapseClick = async (e) => {
       }
     }
     // return
-    if(itemWithId120.hasOwnProperty("details")){
+    if (itemWithId120.hasOwnProperty("details")) {
       console.log(itemWithId120["details"], "itemWithId120");
-      return
+      return;
     }
     uni.showLoading({
       title: "加载中",
@@ -315,7 +315,8 @@ onShow(() => {
           >
             全部检查
           </view>
-          <view
+          <!-- 展开全部 -->
+          <!-- <view
             class="position-absolute top-20rpx right-0rpx text-#6D6D6D text-26rpx"
           >
             <view
@@ -329,8 +330,7 @@ onShow(() => {
               <uni-collapse-item id="qcInline-item" :open="isopen">
               </uni-collapse-item>
             </view>
-            <!-- 展开全部 -->
-          </view>
+          </view> -->
           <view v-for="(item, index) in wzbg_list">
             <uni-collapse
               class="collapse-w"
@@ -383,7 +383,8 @@ onShow(() => {
                         <!-- {{item.details.error_items.length}} -->
                         <text
                           v-if="
-                            !item.details.suojian?.length && !item.details.error_items?.length
+                            !item.details.suojian?.length &&
+                            !item.details.error_items?.length
                           "
                         >
                           未见明显异常</text
diff --git a/h5/pages/main/bgcx/qsfx/qsfxxq.vue b/h5/pages/main/bgcx/qsfx/qsfxxq.vue
index 4ccb345..f7c2bba 100755
--- a/h5/pages/main/bgcx/qsfx/qsfxxq.vue
+++ b/h5/pages/main/bgcx/qsfx/qsfxxq.vue
@@ -62,6 +62,16 @@ const ReportAnalysis = async () => {
   });
   $response(response, () => {
     uni.hideLoading();
+    if (!response.data.show) {
+      uni.showToast({
+        title: "暂无数据",
+        icon: "none",
+      });
+      uni.navigateBack({
+        delta: 1,
+      });
+      return;
+    }
     analysis_content.value = response.data.info;
     console.log(analysis_content.value);
     response.data.chart1_option.min = Number(response.data.chart1_option.min);
diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue
index 20edc13..8c948f4 100644
--- a/h5/pages/main/combo/combo.vue
+++ b/h5/pages/main/combo/combo.vue
@@ -311,7 +311,7 @@ const toRouter = () => {
         </view>
       </view>
     </view>
-  <view class="relative z-999 pt-10rpx center">
+    <!-- <view class="relative z-999 pt-10rpx center">
       <view class="doctor_wrapper">
         <view class="doctor_tip_wrapper">
           <text v-if="!!combo_list.doctor.id">已根据指定医生：</text>
@@ -322,7 +322,7 @@ const toRouter = () => {
         </view>
         <view class="doctor_tip_wrapper">（自动筛选匹配套餐）</view>
       </view>
-    </view>
+    </view> -->
     <view class="select_wrapper flex" v-if="selectKey">
       <template v-for="(value, key, index) in combo_select" :key="index">
         <view
@@ -416,7 +416,7 @@ const toRouter = () => {
       </view>
     </view>
     <uni-popup ref="popup" mask-background-color="transparent">
-      <view class="pt-260rpx w-full h-100vh" @click="popup.close()">
+      <view class="pt-180rpx w-full h-100vh" @click="popup.close()">
         <view class="bg-[rgba(0,0,0,0.3)] h-100%">
           <view
             class="bg-#fff"
diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index 6f315b0..5cede4d 100755
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -73,7 +73,7 @@ const comfrimyy = async () => {
   //   uni.$lu.toast("请选择医生");
   //   return;
   // }
-  // console.log(yytjInfo.value?.nmr_list);
+  console.log(yytjInfo.value?.nmr_list);
   for (let i = 0; i < yytjInfo.value?.nmr_list?.length; i++) {
     if (!yytjInfo.value?.nmr_list[i].time) {
       uni.$lu.toast("请选择预约时间");
@@ -84,7 +84,7 @@ const comfrimyy = async () => {
   if (yytjInfo.value?.nmr_list?.length > 1) {
     plan_nmr_id = yytjInfo.value?.nmr_list[0]?.id;
   }
-  if (yytjInfo.value?.nmr_list?.length > 1) {
+  if (yytjInfo.value?.nmr_list?.length > 0) {
     plan_id = yytjInfo.value?.nmr_list[yytjInfo.value?.nmr_list.length - 1]?.id;
   }
 
diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue
index 5ae6f71..edb9324 100644
--- a/h5/pages/user/fenzhen/fenzhen.vue
+++ b/h5/pages/user/fenzhen/fenzhen.vue
@@ -49,6 +49,12 @@
 		}
 	}
 
+	const toRouter = () => {
+		uni.navigateTo({
+			url: '/pages/user/fenzhen/xindiantu?id=' + $props.id
+		})
+	}
+
 	const timeShow = (time) => {
 		let time_array = time.split(':')
 		return `${time_array[0]}:${time_array[1]}`
@@ -149,7 +155,7 @@
 							<view v-if="!!i.time && !!i.tip" class="time_line_item_line_wrapper"></view>
 							<view v-if="!!i.time && !!i.tip" class="time_line_item_flex_wrapper">
 								<view class="time_line_item_text_wrapper">{{ i.tip }}</view>
-								<view v-if="i.more > 0" class="time_line_item_more_wrapper">查看详情>></view>
+								<view v-if="i.more > 0" class="time_line_item_more_wrapper" @click="toRouter()">查看详情>></view>
 							</view>
 						</view>
 					</view>