diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php
index 21b4a26..8a369eb 100644
--- a/Laravel/app/Http/Controllers/API/ApiMapController.php
+++ b/Laravel/app/Http/Controllers/API/ApiMapController.php
@@ -97,6 +97,7 @@ class ApiMapController extends Controller
'GetSanFangCode' => $base_url . '/api/H5/GetSanFangCode', // 获取三方机构code
'HeXiaoSanFangCode' => $base_url . '/api/H5/HeXiaoSanFangCode', // 核销三方机构code
'GetHomeNotice' => $base_url . '/api/H5/GetHomeNotice', // 首页消息通知
+ 'GetPersonOrderList' => $base_url . '/api/H5/GetPersonOrderList', // 获取个人订单列表
];
}
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index 5d784c7..520b8f9 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -76,6 +76,25 @@ class OrderController extends Controller
'list' => $OrderList
]);
}
+ //查询某个人的预约记录
+ public function GetPersonOrderList(){
+ $person_id= request('person_id');
+ $appointment_date= request('appointment_date');
+ $status= request('status');
+ $list=DB::table('orders')->where(['person_id'=>$person_id]);
+ if(isset($appointment_date)){
+ $list=$list->where(['appointment_date'=>$appointment_date]);
+ }
+ if(isset($status) and !empty($status)){
+ $list=$list->whereIn('status',$status);
+ }
+ $list=$list->get();
+ $count=count($list);
+ return \Yz::Return(true, '获取成功', [
+ 'list'=>$list,
+ 'count'=>$count
+ ]);
+ }
public function GetDetail()
{
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index 0902cee..50cb26d 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -89,6 +89,7 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () {
Route::post('/GetSanFangCode', 'App\Http\Controllers\API\H5\SanFangController@GetSanFangCode');//获取三方code
Route::post('/HeXiaoSanFangCode', 'App\Http\Controllers\API\H5\SanFangController@HeXiaoSanFangCode');//核销三方code
Route::post('/GetHomeNotice', 'App\Http\Controllers\API\H5\HomeController@GetHomeNotice');//首页消息通知
+ Route::post('/GetPersonOrderList', 'App\Http\Controllers\API\H5\OrderController@GetPersonOrderList');//获取个人订单列表
diff --git a/h5/pages/main/selectDoctor/selectDoctor.vue b/h5/pages/main/selectDoctor/selectDoctor.vue
index 15ffb6e..d4a3c2e 100644
--- a/h5/pages/main/selectDoctor/selectDoctor.vue
+++ b/h5/pages/main/selectDoctor/selectDoctor.vue
@@ -151,7 +151,7 @@
});
return;
}
-
+ yytjInfo.value.doctor_date= selectedDate.value
yytjInfo.value.doctor_name = item.name;
yytjInfo.value.doctor_id = item.id;
yytjInfo.value.nmrIndex = -1;
diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue
index f077514..1b7c870 100644
--- a/h5/pages/main/tj/tjxq.vue
+++ b/h5/pages/main/tj/tjxq.vue
@@ -350,10 +350,10 @@
套餐名称：
{{ groupInfo.combo_name || comboInfo?.combo_name }}
-
+
@@ -591,7 +591,7 @@
}
.groupInfo{
border: 1px solid #ccc;
- padding: 20rpx;
+ padding: 20rpx 20rpx 0rpx 20rpx;
border-radius: 20rpx;
}
\ No newline at end of file
diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index 5109ae0..2334b8d 100644
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -677,13 +677,21 @@ const toRouter = (url, status, index) => {
{{comboInfo.tags[0]?.text}}
-
+
+
+
+ ¥{{ comboInfo?.price }}
+
+
+ ¥{{ comboInfo?.original_price }}
+
diff --git a/h5/pages/main/yytjsj/yytjsj_new.vue b/h5/pages/main/yytjsj/yytjsj_new.vue
index dc4768e..bf90047 100644
--- a/h5/pages/main/yytjsj/yytjsj_new.vue
+++ b/h5/pages/main/yytjsj/yytjsj_new.vue
@@ -1,5 +1,19 @@
+
+
+ 提示
+
+ |
+ 当前日期已有预约记录，是否继续预约？
+
+
+
+ 关闭
+ 继续
+
+
+
{{person_name}}
@@ -49,7 +63,7 @@
class="text-#fff text-32rpx rounded-45rpx bg-#239EA3 mt-40rpx ma w-520rpx h-90rpx flex flex-items-center flex-justify-center">
确定
-->
- 立即预约
+ 立即预约
@@ -101,7 +115,7 @@
let combo_name = ref('')
let combo_id=ref(null);
let item_ids=ref([]);
-
+ let YuYuePopupRef=ref(null);
const getBuyInfoFuc = async () => {
// 获取购买信息
let obj = {
@@ -383,8 +397,31 @@
}
MonthCalendar.value.open()
}
+ ////先查询用户是否在预约日期有预约记录
+ const ChaPersonAppointment=async()=>{
+ if (selectedDate.value == null || selectedDate.value =='' ) {
+ uni.$lu.toast("请选择体检日期");
+ return false
+ }
+ uni.showLoading();
+ let data = {
+ person_id: person_id.value,
+ appointment_date: selectedDate.value,
+ status: [2]
+ }
+ console.log(data);
+ const response = await $api("GetPersonOrderList", data);
+ uni.hideLoading();
+ $response(response, () => {
+ if(response.data.count>0){
+ YuYuePopupRef.value.open()
+ }else{
+ StartYuYue()
+ }
+ });
+ }
//点击提交
- const StartYuYue = () => {
+ const StartYuYue = async () => {
if (buyInfo.value.group_id || buyInfo.value.sanfang_code?.code_num) {
//如果是团检则创建订单 /三方订单
comfrimyy()
@@ -731,8 +768,50 @@
font-weight: 700;
font-size: 29rpx;
color: #F6FDFD;
+ text-align: center;
+ }
+ .tishi_main{
+ background-color: #fff;
+ padding: 40rpx 50rpx;
+ width:500rpx;
+ border-radius: 40rpx;
+ }
+ .tishi_button{
+ height: 60rpx;
+ line-height: 60rpx;
+ width: 365rpx;
+ background-color: #009da5;
+ color:#fff;
text-align: center;
-
-
+
+ border-radius: 40rpx;
+ margin: 40rpx auto 10rpx auto;
+ }
+
+ .tishi_title{
+ text-align: center;
+ font-size: 30rpx;
+ font-weight: 600;
+ color:#2b2827;
+ }
+ .tishi_title2{
+ display: flex;
+ font-size: 28rpx;
+ margin-top: 30rpx;
+ font-weight: 600;
+ color:#3a3635;
+ padding-left: 5rpx;
+ }
+ .tishi_content{
+ font-size: 28rpx;
+ margin-top: 30rpx;
+ color:#474241;
+ }
+ .tishi_shuxian{
+ color:#00939B;
+ font-weight: bolder;
+ margin-right: 4rpx;
+ // border-right: 3rpx solid #00939B;
+ // height: 28rpx;
}
\ No newline at end of file