From feb428d7b90043237f61831f7801f91a49932603 Mon Sep 17 00:00:00 2001 From: yanzai Date: Wed, 18 Dec 2024 08:59:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E3=80=81=E8=B0=83=E6=95=B4=E5=A9=9A=E6=A3=80=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/OrderController.php | 4 +- .../Controllers/API/H5/PersonController.php | 2 + h5/pages/main/order/src/order.vue | 158 +++++++++++++++--- h5/pages/premarital/form/form.vue | 3 +- 4 files changed, 139 insertions(+), 28 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 2709207..fcf4191 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -56,6 +56,7 @@ class OrderController extends Controller if (!!$order_info) { $order_info->buy_info = json_decode($order_info->buy_info, true); $order_info->erxian_appointment_info = json_decode($order_info->erxian_appointment_info, true); + $order_info->appointment_back_info = json_decode($order_info->appointment_back_info, true); } else { return \Yz::echoError1('未找到有效订单'); } @@ -257,6 +258,7 @@ class OrderController extends Controller 'group_name' => $group_info['group_name'], 'items' => $group_info['items'], 'group_id' => $group_info['group_id'], + 'have_Nx1'=> !empty($Nx1_arrInfo) ]; $TJ_Leixing_id = $group_info['checkup_type_id']; $title = "单位团检" . $group_info['combo_name']; @@ -850,7 +852,7 @@ class OrderController extends Controller } $cad = array_merge($cad, $cad2); } else { - if(isset($buy_info['group']['items'])){ + if(isset($buy_info['group']['items']) and $buy_info['group']['have_Nx1']===true){ $item_temp=[]; foreach ($buy_info['group']['items'] as $gitem) { $item_temp[]=[ diff --git a/Laravel/app/Http/Controllers/API/H5/PersonController.php b/Laravel/app/Http/Controllers/API/H5/PersonController.php index 37367e7..1bb8c09 100644 --- a/Laravel/app/Http/Controllers/API/H5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/H5/PersonController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\API\PEISApiController; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; class PersonController extends Controller { @@ -35,6 +36,7 @@ class PersonController extends Controller "单位Id"=>$group_info['单位Id'] ]; $fenzu = $peis::Post('单位分组批次查询', 1, $data); + // Log::info(json_encode($fenzu,JSON_UNESCAPED_UNICODE)); if(empty($fenzu['data'])) break; foreach ($fenzu['data'][0]['分组'] as $key => $value) { if($value['Id']==$group_info['分组Id']){ diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue index 7d9bc89..7282d7b 100644 --- a/h5/pages/main/order/src/order.vue +++ b/h5/pages/main/order/src/order.vue @@ -120,12 +120,27 @@ url: '/pages/main/ctime/ctime?id=' + id }) } - let erweima_popup=ref(null); - let show_erweima_text=ref(''); - const erweima_click=(text)=>{ - show_erweima_text.value=text + let erweima_popup = ref(null); + let show_erweima_text = ref(''); + const erweima_click = (text) => { + show_erweima_text.value = text erweima_popup.value.open() } + let detail_popup = ref(null); + let OrderInfoDetail = ref({}); + const click_detail = async (order) => { + detail_popup.value.open() + uni.showLoading(); + const response = await $api("GetOrderDetail", { + id: order.id, + }); + uni.hideLoading(); + $response(response, () => { + if (response.status) { + OrderInfoDetail.value = response.data.info + } + }) + } onMounted(() => { deepInfo(); }); @@ -142,11 +157,72 @@ }"> + + + {{OrderInfoDetail.title}} + + 体检人: + {{OrderInfoDetail.name}} + + + 订单号: + {{OrderInfoDetail.order_number}} + + + 类型: + 个检团检 + + + 预约时间: + {{OrderInfoDetail.appointment_date}} {{OrderInfoDetail.appointment_time}} + + + + 核磁项目: + + {{item.name}} + 预约时间：{{OrderInfoDetail.erxian_appointment_info[0].date}} {{OrderInfoDetail.erxian_appointment_info[0].time}} + + + + 自选项目: + + {{item.name}} + + + + 订单状态: + + 待支付 + + 已支付 + 交易关闭 + 已完成 + + + + 预约状态: + 已预约预约未成功 + + + 下单时间: + {{OrderInfoDetail.created_at}} + + + + 待支付 - 已预约 - 预约失败 + + 已预约 + + 预约失败 交易关闭 已完成 @@ -163,12 +239,13 @@ 预约时间： - {{order_info.date}} {{order_info.time.substring(',',5)}} + {{order_info.date}} {{order_info.time.substring(',',5)}} + - - + 订单号： - {{ - order_info.order - }} + + {{order_info.order}} + 类型： - {{ - order_info.type - }} + + {{order_info.type}} + - - 需支付 - 实付款 - 已退款 - (实付:{{ order_info.true_price }}) - {{ order_info.price }} + + 查看详情>>> + + 需支付 + 实付款 + 已退款 + (实付:{{ order_info.true_price }}) + {{ order_info.price }} + + @@ -215,8 +296,9 @@ 继续付款 - + 改约 退款 @@ -314,7 +396,7 @@ font-weight: 400; color: #111111; line-height: 1; - margin-top: 28rpx; + text-align: right; margin-right: 30rpx; font-size: 26rpx; @@ -404,4 +486,28 @@ padding-top: 35rpx; margin-top: 16rpx; } + + .click_detail { + font-size: 24rpx; + color: #239ea3; + margin-left: 30rpx; + margin-top: 20rpx; + font-weight: 700; + } + + .OrderInfoRow { + display: flex; + font-size: 26rpx; + margin-top: 16rpx; + color: #666; + + } + + .row_label { + width: 150rpx + } + + .row_value { + margin-left: 20rpx; + } \ No newline at end of file diff --git a/h5/pages/premarital/form/form.vue b/h5/pages/premarital/form/form.vue index 0b775a2..a77d7cd 100644 --- a/h5/pages/premarital/form/form.vue +++ b/h5/pages/premarital/form/form.vue @@ -223,7 +223,8 @@ }) $response(response, () => { uni.navigateTo({ - url: '/pages/main/combo/combo' + // url: '/pages/main/combo/combo', + url: '/pages/main/selectDoctor/selectDoctor?month=all' }) }) }