From f6b9497095ef3ccb45a2224124c1fd77bddb9378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BD=B3=E5=AE=87?= <17601616548@163.com>
Date: Wed, 23 Oct 2024 00:18:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84=E5=B8=83=E5=B1=80=202.=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E9=80=89=E6=8B=A9=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E8=B7=B3=E8=BD=AC=E7=9A=84=E6=97=B6=E5=80=99=E9=80=89?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/main/tjyy/tjyy.vue     | 19 +++++++++++++------
 h5/pages/main/yytjsj/yytjsj.vue | 22 +++++++++++++++++-----
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index 9928580..83434e9 100755
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -361,9 +361,13 @@ onShow(() => {
   }
 });
 
-const toRouter = (url, status) => {
+const toRouter = (url, status, index) => {
   if (status) {
+    console.log(index);
+    yytjInfo.value.nmrIndex = index;
+    console.log(yytjInfo.value);
     uni.setStorageSync("yytjInfoS", yytjInfo.value);
+    $store.setYytjInfo(yytjInfo.value);
   }
   uni.navigateTo({
     url: url,
@@ -618,13 +622,13 @@ const toRouter = (url, status) => {
               更改预约人
             </button>
           </view>
-          <view
-            class="text-24rpx text-#040404 mb-30rpx"
-            @click="toRouter('/pages/main/yytjsj/yytjsj', 1)"
-          >
+          <view class="text-24rpx text-#040404 mb-30rpx">
             <view
               class="mb-20rpx between"
               v-for="(val, index) in yytjInfo?.nmr_list"
+              @click="
+                toRouter('/pages/main/yytjsj/yytjsj', 1, val.time ? index : 0)
+              "
               :key="index"
               v-if="yytjInfo?.nmr_list?.length"
             >
@@ -638,7 +642,10 @@ const toRouter = (url, status) => {
                 val.time ? "重新预约" : "预约时间"
               }}</text>
             </view>
-            <view class="mb-20rpx between">
+            <view
+              class="mb-20rpx between"
+              @click="toRouter('/pages/main/yytjsj/yytjsj', 1, 0)"
+            >
               <text>体检医生</text>
               <text class="text-30rpx">{{
                 yytjInfo?.doctor_name || "选择医生"
diff --git a/h5/pages/main/yytjsj/yytjsj.vue b/h5/pages/main/yytjsj/yytjsj.vue
index a0950f7..ab079e3 100755
--- a/h5/pages/main/yytjsj/yytjsj.vue
+++ b/h5/pages/main/yytjsj/yytjsj.vue
@@ -58,8 +58,9 @@ const getnmrList = async () => {
     itemsInfo.value = response.data.items_info;
     truePrice.value = response.data.true_price;
     currentDate.value = getToday(); //huo获取今天的日期
-
+    console.log(yytjInfo.value, "cfvghbjnkmljhbgvfcgvhbjnk");
     if (!yytjInfo.value?.nmr_list?.length) {
+      yytjInfo.value.nmrIndex = 0;
       yytjInfo.value.nmr_list = response.data.nmr_list.map((val) => {
         return {
           ...val,
@@ -74,8 +75,9 @@ const getnmrList = async () => {
         id: "",
       });
     }
-    console.log(yytjInfo.value.nmr_list[0]);
-    xmmcClick(yytjInfo.value.nmr_list[0], 0);
+    nmrIndex.value = yytjInfo.value.nmrIndex;
+    console.log(yytjInfo.value.nmr_list[nmrIndex.value]);
+    xmmcClick(yytjInfo.value.nmr_list[nmrIndex.value], nmrIndex.value);
     uni.hideLoading();
   });
 };
@@ -508,7 +510,7 @@ onShow(() => {
             </view>
           </view>
         </view>
-        <view class="center mt-20rpx text-#8B8B8B text-24rpx">
+        <!-- <view class="center mt-20rpx text-#8B8B8B text-24rpx">
           <text>体检医生 - </text>
           <text
             class="ml-10rpx text-#0E0E0E center mr-auto"
@@ -517,7 +519,7 @@ onShow(() => {
             {{ yytjInfo?.doctor_name || "请选择" }}
             <uni-icons type="right" size="14"></uni-icons>
           </text>
-        </view>
+        </view> -->
       </view>
       <view
         style="box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04)"
@@ -641,6 +643,16 @@ onShow(() => {
                   {{ item.time }}
                 </view>
               </view>
+              <view
+                class="p-20rpx pl-10rpx pr-10rpx rounded-15rpx between"
+                @click="clickDoctor"
+              >
+                <text>体检医生</text>
+                <text class="ml-10rpx text-#0E0E0E center">
+                  {{ yytjInfo?.doctor_name || "请选择" }}
+                  <uni-icons type="right" size="14"></uni-icons>
+                </text>
+              </view>
             </view>
           </view>
         </view>