From e6c19624b5799104cd4ffc78317c4021d105b751 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 27 Nov 2024 09:30:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86bug=E3=80=81=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E4=B8=8D=E8=83=BD=E9=99=84=E5=8A=A0=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/OrderController.php | 2 +-
 h5/App.vue                                              | 2 +-
 h5/pages/main/order/src/order.vue                       | 9 ++++-----
 h5/pages/main/questionnaire/index.vue                   | 4 +++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index bc152a1..311689e 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -23,7 +23,7 @@ class OrderController extends Controller
     $persons_sfz = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->pluck('id_number')->toArray();
 
     $OrderList = DB::table('orders')
-      ->select('id', 'title', 'status', 'name', 'appointment_time as time', 'order_number as order','appointment_number',
+      ->select('id', 'title', 'status', 'name','appointment_date as date', 'appointment_time as time', 'order_number as order','appointment_number',
         DB::raw("CASE WHEN type = 1 THEN '个检' WHEN type = 2 THEN '团检' ELSE 'unknown' END as type"),
         'price', 'true_price', 'pay_time', 'refund_time', 'created_at')
       ->where(['web_user_id' => $user->id])
diff --git a/h5/App.vue b/h5/App.vue
index 6070795..d625f3c 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -9,7 +9,7 @@
 	} from 'vue'
 	import {
 		$api,
-		$response,
+		$response, 
 	} from '@/api'
 	import {
 		onShow,
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index 2a68691..a074468 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -137,7 +137,7 @@
 				<view>扫码预约取号</view>
 				<w-qrcode :options="{
 				  level: 4,
-				  size: 500,
+				  size: 460,
 				  code: show_erweima_text,
 				}"></w-qrcode>
 			</view>
@@ -162,9 +162,8 @@
 						</view>
 						<view class="order_info_line_wrapper">
 							<view class="order_info_line_label_wrapper">预约时间：</view>
-							<view class="order_info_line_value_wrapper">{{
-							      order_info.time
-							    }}</view>
+							<view class="order_info_line_value_wrapper">
+							{{order_info.date}} {{order_info.time.substring(',',5)}}</view>
 						</view>
 					</view>
 					<view v-if="order_info.status==2 || order_info.status==4" >
@@ -193,7 +192,7 @@
 					<text v-if="[2, 4].includes(order_info.status)">实付款</text>
 					<text v-if="[5].includes(order_info.status)">已退款</text>
 					<text class="price_true"
-						v-if="order_info.true_price !== order_info.price">(测试:{{ order_info.true_price }})</text>
+						v-if="order_info.true_price !== order_info.price">(实付:{{ order_info.true_price }})</text>
 					<text class="price_text">{{ order_info.price }}</text>
 				</view>
 				<view class="order_line_wrapper"></view>
diff --git a/h5/pages/main/questionnaire/index.vue b/h5/pages/main/questionnaire/index.vue
index 2229aa8..0dd7014 100644
--- a/h5/pages/main/questionnaire/index.vue
+++ b/h5/pages/main/questionnaire/index.vue
@@ -61,6 +61,7 @@ const getmyddcSelect = async () => {
 
 const getContent = (item) => {
   // 格式化 单选/多选 数据
+  console.log('--------',item)
   let contentArr = item?.content.map((val) => {
     if (val.includes("{{MORE}}")) {
       let valParse = val.split("{{MORE}}");
@@ -72,6 +73,7 @@ const getContent = (item) => {
     }
     return { text: val, value: val, isInput: "" };
   });
+  
   return contentArr;
 };
 
@@ -350,7 +352,7 @@ onShow(() => {
                   topicList[topicIndex].answer.includes(val.value)
                 "
                 v-model="topicList[topicIndex].more[index]"
-                :placeholder="getContent()[index]?.isInput"
+                :placeholder="getContent(topicList[topicIndex])[index]?.isInput"
               />
             </view>
           </view>