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 @@
扫码预约取号
@@ -162,9 +162,8 @@
预约时间:
- {{
- order_info.time
- }}
+
+ {{order_info.date}} {{order_info.time.substring(',',5)}}
@@ -193,7 +192,7 @@
实付款
已退款
(测试:{{ order_info.true_price }})
+ v-if="order_info.true_price !== order_info.price">(实付:{{ order_info.true_price }})
{{ order_info.price }}
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"
/>