Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024

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])

h5/pages/main/combo/combo.vue

@@ -5,7 +5,7 @@ import DraggableButton from "@/pages/components/goHome.vue";
  * user：sa0ChunLuyu
  * date：2024年8月7日 20:05:05
  */
-import { ref, computed } from "vue";
+import { ref, computed, nextTick } from "vue";
 import { $image, $api, $response } from "@/api";
 import { onShow,onLoad } from "@dcloudio/uni-app";
 import { useStore } from "@/store";
@@ -41,6 +41,7 @@ const selectItemClick = async (index, key) => {
   // 选择套餐条件
   let data = combo_select.value;
   if (selectKey.value == "sort_list") {
+	  	 combo_list.value.list=[]
     if (sortIndex.value == index) {
       sortIndex.value = 0;
     } else {
@@ -160,6 +161,7 @@ const combo_list_computed = computed(() => {
   }
   return list;
 });
+let combo_list_k=ref(null)
 const getComboList = async (e) => {
   uni.showLoading();
   let obj = {
@@ -182,7 +184,10 @@ const getComboList = async (e) => {
   const response = await $api("ComboList", obj);
   uni.hideLoading();
   $response(response, () => {
-    combo_list.value = response.data;
+ 
+		combo_list.value = response.data;
+ 
+
   });
 };
 
@@ -253,6 +258,8 @@ const open = (key) => {
   }
 };
 
+
+
 const config_ref = ref(null);
 const configRef = (e) => {
   if (!config_ref.value) {
@@ -447,7 +454,7 @@ const toRouter = () => {
         </view>
       </view>
     </view>
-    <view class="list_wrapper">
+    <view class="list_wrapper" ref="combo_list_k">
       <view
         class="combo_wrapper"
         v-for="(i, k) in combo_list_computed"

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">{{
+							<view class="order_info_line_value_wrapper">
-							      order_info.time
+							{{order_info.date}} {{order_info.time.substring(',',5)}}</view>
-							    }}</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>

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>