diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php
index cada066..3b0034c 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php
@@ -11,7 +11,7 @@ class CheckUpTypeController extends Controller
//体检类型列表
public function GetEnableList()
{
- $list=DB::table('checkup_type')->where(['is_del'=>0,'status'=>1])->get();
+ $list=DB::table('checkup_type')->where(['is_del'=>0,'status'=>1])->orWhere('id',8)->get();
return \Yz::Return(true,'查询完成',['list'=>$list]);
}
}
diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php
index 6d3218b..37a7653 100644
--- a/Laravel/app/Http/Controllers/API/ApiMapController.php
+++ b/Laravel/app/Http/Controllers/API/ApiMapController.php
@@ -85,6 +85,8 @@ class ApiMapController extends Controller
'CheckedSignIn' => $base_url . '/api/H5/CheckedSignIn', // 检后签到
'SendMsgCode' => $base_url . '/api/H5/SendMsgCode', // 发送验证码
'CheckMsgCode' => $base_url . '/api/H5/CheckMsgCode', // 验证验证码
+ 'BaseInfo' => $base_url . '/api/H5/BaseInfo', // 基础信息
+ 'CreateNewOrder' => $base_url . '/api/H5/CreateNewOrder', // 创建订单（新）
];
}
diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php
index 5eea537..b16b9a4 100644
--- a/Laravel/app/Http/Controllers/API/H5/HomeController.php
+++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php
@@ -18,6 +18,31 @@ class HomeController extends Controller
'version' => $version
]);
}
+ //获取基础信息
+ public function BaseInfo(){
+ $openid = request('openid');
+ $hospital_id = request('hospital_id');
+ $user = DB::table('web_users')->where(['openid' => $openid, 'is_del' => 0])->first();
+ if (!$user) return \Yz::echoError1("openid对应用户不存在");
+ $person = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0, 'is_default' => 1])->first();
+ if (!$person) return \Yz::echoError1("请选择就诊人");
+ $personCount = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->count();
+ $hospital=DB::table('hospitals')->where(['id' => $hospital_id])->first();
+ if (!$hospital) {
+ return \Yz::echoError1("医院不存在");
+ }
+ $info =[
+ 'person' => [
+ 'name' => $person->name,
+ 'sex' => $person->sex,
+ 'count' => $personCount
+ ],
+ 'hospital' => [
+ 'name' => $hospital->name,
+ ]
+ ] ;
+ return \Yz::Return(true, '获取成功', $info);
+ }
// 获取配置更新时间
public function config()
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index 507e8ab..7d5e135 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -19,15 +19,25 @@ class OrderController extends Controller
{
// status 1-待支付 2-已预约 3-交易关闭 4-已完成 5-已退款
$openid = $request->post('openid');
+ $searchInfo = $request->post('searchInfo');
$user = DB::table('web_users')->where(['openid' => $openid, 'is_del' => 0])->first();
if (!$user) return \Yz::echoError1("openid对应用户不存在");
$persons_sfz = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->pluck('id_number')->toArray();
+ $where=['web_user_id' => $user->id];
+ if(isset($searchInfo['status'])){
+ $where['status'] = $searchInfo['status'];
+ }
- $OrderList = DB::table('orders')
+ $OrderList = DB::table('orders');
+ $OrderList=$OrderList
->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])
+ 'price', 'true_price', 'pay_time', 'refund_time', 'created_at');
+ if(isset($searchInfo['dateRange'])){
+ $OrderList=$OrderList->whereBetween('appointment_date', [$searchInfo['dateRange'][0], $searchInfo['dateRange'][1]]);
+ }
+ $OrderList=$OrderList
+ ->where($where)
->orWhere(function ($query) use ($persons_sfz) {
$query->WhereIn('id_number', $persons_sfz)
->where('person_id', 0);
@@ -44,6 +54,7 @@ class OrderController extends Controller
}
}
+
return \Yz::Return(true, '获取成功', [
'list' => $OrderList
]);
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderNewController.php b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php
new file mode 100644
index 0000000..74116b0
--- /dev/null
+++ b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php
@@ -0,0 +1,388 @@
+where(['openid' => $openid, 'status' => 1, 'is_del' => 0])->first();
+ if (!$user) return \Yz::echoError1('用户不存在');
+ $person = DB::table('web_user_person')->where(['id' => $person_id, 'is_del' => 0])->first();
+ if (!$person) return \Yz::echoError1('体检人不存在');
+ $title = "自选项目";
+ $price = 0;
+ $quanInfo = false;
+ $true_price = 0;//订单真实支付金额
+ $buy_info = [
+ 'combo' => [
+ 'id' => 0,
+ 'name' => $title,
+ 'price' => 0,
+ ],
+ 'items' => [],
+ 'group' => [
+ 'id' => '',
+ ],
+ 'nmr_list' => [],
+ 'peiou_info' => [],
+ ];
+ if (!empty($peiou_info)) {
+ $buy_info['peiou_info'] = $peiou_info;
+ }
+ //如果是套餐
+ $Nx1_arrInfo = [];
+ $TJ_Leixing_id = 1;//存储用体检类型
+ $checkup_type_id = false; //体检类型id
+ if (isset($combo_id) and $combo_id <> 0) {
+ $combo_info = DB::table('combos')->where(['combo_id' => $combo_id, 'status' => 1])->first();
+ if (!$combo_info) return \Yz::echoError1("套餐不存在");
+ if (!isset($combo_info->checkup_type_id)) return \Yz::echoError1("套餐未关联体检类型");
+ $checkup_type_id = $combo_info->checkup_type_id;
+
+ //构建多选一数据
+ if (isset($duo_xuan_yi) and !empty($duo_xuan_yi)) {
+ $combo_Nx1 = json_decode($combo_info->duo_xuan_yi, true);
+ foreach ($duo_xuan_yi as $r_k => $r_v) {
+ foreach ($combo_Nx1 as $k => $n1v) {
+ if ($r_v['zu_name'] == $n1v['组名称']) {
+ foreach ($n1v['包含项目'] as $k2 => $v2) {
+ if ($v2['Id'] == $r_v['item_id']) {
+ if ($v2['科室名称'] == '影像科') {
+ $buy_info['nmr_list'][] = [
+ 'item_id' => $v2['Id'],
+ 'name' => $v2['名称'],
+ ];
+ }
+ $Nx1_arrInfo[] = [
+ 'id' => $v2['Id'],
+ 'name' => $v2['名称'],
+ 'price' => 0
+ ];
+ }
+ }
+ }
+ }
+ }
+ }
+
+ $TJ_Leixing_id = $checkup_type_id;
+ $price += $combo_info->price;
+ $title = $combo_info->name;
+ $buy_info['combo'] = [
+ 'id' => $combo_info->combo_id,
+ 'name' => $combo_info->name,
+ 'price' => $combo_info->price,
+ ];
+ //如果有影像科，则存储在nmr_list字段
+ $comboItem = DB::table('combo_items')->where(['combo_id' => $combo_id, 'status' => 1, 'keshi_name' => '影像科'])->get();
+ if (count($comboItem) > 0) {
+ foreach ($comboItem as $item) {
+ $buy_info['nmr_list'][] = [
+ 'item_id' => $item->item_id,
+ 'name' => $item->name,
+ ];
+ }
+ }
+ }
+
+ //如果有自选项目
+ $items_list = [];
+ if (count($item_ids) != 0) {
+ $items_list = DB::table('items')->whereIn('item_id', $item_ids)->where(['status' => 1])->get();
+ $existingIds = [];
+ $item_price = 0;
+ foreach ($items_list as $item) {
+ $item_price += $item->price;
+ $existingIds[] = $item->item_id;
+ $buy_info['items'][] = [
+ 'id' => $item->item_id,
+ 'name' => $item->name,
+ 'price' => $item->price
+ ];
+ //如果有影像科，则存储在nmr_list字段
+ if ($item->keshi_name == '影像科') {
+ $buy_info['nmr_list'][] = [
+ 'item_id' => $item->item_id,
+ 'name' => $item->name,
+ ];
+ }
+ }
+ if (isset($wj_flag) and $wj_flag == 1) {
+ $item_price = $item_price * $wj_zhekou;
+ }
+
+
+ $price += $item_price;
+ $missingIds = array_diff($item_ids, $existingIds);
+ if (count($missingIds) > 0) return \Yz::echoError1("部分自选项目不可用，Id:" . implode(', ', $missingIds));
+ }
+ //如果有 多选一项目
+ if (!empty($Nx1_arrInfo)) {
+ $buy_info['items'] = array_merge($buy_info['items'], $Nx1_arrInfo);
+ }
+ $true_price = $price;
+
+ //如果是团检
+ $group_info = false;
+ if ($type == 2) {
+ $P = new PersonController();
+ $data = [
+ '电话号码' => null,
+ '证件号码' => null,
+ '预约Id' => $group_id
+ ];
+ $group_info = $P->group_info($hospital_id, $data);
+ $group_info = $group_info[0];
+
+ //如果有多选一项目
+ //构建多选一数据
+ $Nx1_arrInfo = [];
+ if (isset($duo_xuan_yi) and !empty($duo_xuan_yi)) {
+ foreach ($duo_xuan_yi as $r_k => $r_v) {
+ $Nx1_arrInfo[] = [
+ 'id' => $r_v['item_id'],
+ 'name' => $r_v['item_name'],
+ ];
+ }
+ }
+ $group_info['items'] = array_merge($group_info['items'], $Nx1_arrInfo); //合并多选一
+
+ $buy_info['group'] = [
+ 'id' => $group_id,
+ 'combo_name' => $group_info['combo_name'],
+ 'combo_id' => $group_info['combo_id'],
+ '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'];
+ $price = $price + $group_info['sixi_zong_ji_jin_e'];
+ $need_pay = ($price - $group_info['tongshou_xiane']) > 0 ? $price - $group_info['tongshou_xiane'] : 0;
+ //团检订单金额为减去统收后的金的
+ $price = $need_pay;
+ $true_price = $need_pay;
+
+
+ //如果有影像科，则存储在nmr_list字段
+ $all_items = DB::table('items')->where(['status' => 1, 'keshi_name' => '影像科'])->get();
+ foreach ($group_info['items'] as $item) {
+ foreach ($all_items as $it) {
+ if ($it->item_id == $item['id']) {
+ $buy_info['nmr_list'][] = [
+ 'item_id' => $it->item_id,
+ 'name' => $it->name,
+ ];
+ }
+ }
+ }
+
+ }
+
+ //调用思信接口判断各个项目是否可用
+ $check_items = [];
+ foreach ($item_ids as $item_id) {
+ $check_items[] = ['Id' => $item_id];
+ }
+ if ((isset($combo_id) and $combo_id <> 0) || count($check_items) != 0) {
+ $item_check = self::item_check($hospital_id, [
+ '人员信息列表' => [[
+ "序号" => 0,
+ "性别" => $person->sex == 1 ? '男' : '女',
+ "年龄" => floor((time() - strtotime($person->birthday)) / 86400 / 360),
+ "婚姻状态" => $person->married == 1 ? '已婚' : '未婚',
+ ]],
+ '套餐Id' => $combo_id == 0 ? null : $combo_id,
+ '可选项目信息' => $check_items,
+ ]);
+ if (count($item_check['data']) != 1) {
+ return \Yz::echoError1("体检系统提示：" . $item_check['message']);
+ }
+ }
+
+
+ $plan_nmr_appointment_info = [];
+ //校验积分和预存款
+ $env = config('app.globals.Env');
+ $AspNet = new AspNetZhuanController();
+ if ($env == 'pro') { //如果是正式环境, 测试环境不抵扣
+ if ($jifen > 0) {
+ $all_jifen = $AspNet::GetJiFen_YuCunKuan(1, $person->ghzid);
+ if ($jifen > $all_jifen) return \Yz::echoError1("用户剩余积分不足");
+ }
+ if ($yucunkuan > 0) {
+ // return \Yz::echoError1("暂不支持预存款");
+ $all_yucunkuan = $AspNet::GetJiFen_YuCunKuan(2, $person->ghzid);
+ if ($yucunkuan > $all_yucunkuan) return \Yz::echoError1("用户剩余预存款不足");
+ }
+ $true_price = $true_price - ($jifen + $yucunkuan);
+ if ($true_price < -1) return \Yz::echoError1("预抵扣金额超过订单金额，操作失败");
+ if ($true_price < 0) $true_price = 0;
+//如果有二线号源,根据体检时间查询二线可用号源，区分上下午，二线需预约体检时间1小时后
+ $plan_nmr_info = [];
+ if (isset($erxian_info) and !empty($erxian_info)) {
+ foreach ($erxian_info as $erxian_item) {
+ $temp_date = [
+ "item_id" => $erxian_item['item_id'],
+ "name" => $erxian_item['name'],
+ "price" => $erxian_item['price'],
+ ];
+ $plan_nmr_info[] = $temp_date;
+ }
+
+ }
+
+ //使用优惠券
+ if (isset($coupon_id) and !empty($coupon_id)) {
+ if ($true_price == 0) return \Yz::echoError1("金额为0，无需使用优惠券");
+ $use_quan = $this->useYouHuiQuan($true_price, $person, $coupon_id);
+ $quanInfo = $use_quan['quanInfo'];
+ $true_price = $use_quan['price'];
+ }
+ $now_datetime = date('Y-m-d H:i:s');
+ //构建订单号
+ $order_num = $this->generateOrderNumber();
+
+ $data = [
+ 'title' => $title,
+ 'type' => $type,
+ 'web_user_id' => $user->id,
+ 'checkup_type_id' => $TJ_Leixing_id,
+ 'person_id' => $person->id,
+ 'name' => $person->name,
+ 'id_number' => $person->id_number,
+ 'buy_info' => json_encode($buy_info, JSON_UNESCAPED_UNICODE),
+ 'price' => $price,
+ 'true_price' => number_format($true_price, 2, '.', ''),
+ 'jifen' => $jifen,
+ 'yucunkuan' => $yucunkuan,
+ 'order_number' => $order_num,
+ 'status' => 99, //先标记为异常，方法最底部更新为正常状态
+ 'erxian_appointment_info' => json_encode($plan_nmr_info, JSON_UNESCAPED_UNICODE),
+ 'combo_id' => $combo_id,
+ 'hospital_id' => $hospital_id,
+ 'doctor' => $doctor,
+ 'phone' => $person->phone,
+ 'sex' => $person->sex,
+ 'birthday' => $person->birthday,
+ 'married' => $person->married,
+ 'wj_flag' => $wj_flag,
+ 'youhuiquan' => $quanInfo === false ? '' : json_encode(['id' => $quanInfo['DZJID'], 'name' => $quanInfo['DZJLBMC']], JSON_UNESCAPED_UNICODE),
+ 'created_at' => $now_datetime,
+ 'paycheck_time' => $now_datetime
+ ];
+
+
+ $insert = DB::table('orders')->insertGetId($data);
+
+
+ //调用接口扣除积分和预存款、优惠券
+ $jifen_dikou_status = true;
+ $yucunkuan_dikou_status = true;
+ $youhuiquan_dikou_status = true;
+
+ if ($env == 'pro') { //如果是正式环境
+
+
+ $nowDateTime = date('Y-m-d H:i:s');
+
+ if ($jifen > 0) {
+ $jifen_dikou_status = false;
+ $jifen_dikou_status = $AspNet::UseJiFen($person->ghzid, -$jifen, $yyid, $insert, 'tj_h5', '抵扣体检H5订单', $now_datetime);
+ }
+ if ($yucunkuan > 0) {
+ $yucunkuan_dikou_status = false;
+ $yucunkuan_dikou_status = $AspNet::UseYuCunKuan($person->ghzid, -$yucunkuan, $yyid, 0, $insert, 'tj_h5', '抵扣体检H5订单', $now_datetime);
+ }
+
+ //核销优惠券
+ if (isset($coupon_id) and !empty($coupon_id)) {
+ $youhuiquan_dikou_status = false;
+ $data = [
+ 'action' => 3,
+ 'ghzid' => $person->ghzid,
+ 'dzjid' => $coupon_id,
+ 'hxbz' => "抵扣体检H5订单",
+ 'yyid' => $yyid
+ ];
+ $youhuiquan_dikou_status = $AspNet::YouHuiQuan($data);
+ }
+
+ }
+
+ if ($insert and $jifen_dikou_status and $yucunkuan_dikou_status and $youhuiquan_dikou_status) {
+ //中途未报错，更新订单为待支付
+ DB::table('orders')->where('id', $insert)->update([
+ 'status' => 1 //标记为待支付
+ ]);
+ $action = false;
+ if ($true_price == 0) {
+ DB::table('orders')->where('id', $insert)->update([
+ 'status' => 2 //标记为已支付
+ ]);
+ }
+ if ($true_price > 0) {
+ //如果大于0则提示前端去支付
+ $action = "pay";
+ }
+ return \Yz::return(true, "操作成功", ['action' => $action, 'orderid' => $insert]);
+ } else {
+ return \Yz::echoError1('操作失败');
+ }
+ }
+
+ }
+
+}
diff --git a/Laravel/app/Http/Controllers/API/H5/PlanController.php b/Laravel/app/Http/Controllers/API/H5/PlanController.php
index 2f8f5d2..545d377 100644
--- a/Laravel/app/Http/Controllers/API/H5/PlanController.php
+++ b/Laravel/app/Http/Controllers/API/H5/PlanController.php
@@ -107,12 +107,13 @@ class PlanController extends Controller
->where(['hospital_id'=>$hospital_id,'type'=>1,'is_del'=>0])
->where('is_vip','<>',1)
->whereIn('use_type',[0,$use_type]);
-
+ $comboItemsNmr=false;
if(!!$combo_id){
$comboInfo=DB::table('combos')->where(['combo_id'=>$combo_id])->first();
if(!empty($comboInfo->keyue_start_time) and !empty($comboInfo->keyue_end_time)){
$list=$list->whereBetween('time',[$comboInfo->keyue_start_time,$comboInfo->keyue_end_time]);
}
+ $comboItemsNmr=DB::table('combo_items')->where(['combo_id'=>$combo_id])->where('name', 'like', '%磁%')->get();
}
if(!!$personInfo){
$list=$list->whereIn('sex',[0,$personInfo->sex]);
@@ -132,7 +133,14 @@ class PlanController extends Controller
});
}
$list=$list->orderBy('time','asc')->get();
-
+ if(!!$comboItemsNmr){
+ //如果有核磁项目，11点往后的号源不可用
+ foreach ($list as $key=>$item) {
+ if($item->time > '11:00:00' and $item->time <= '12:00:00'){
+ $list[$key]->status=2;
+ }
+ }
+ }
// 获取前后各三天的日期
$dateTime = new DateTime($date);
@@ -155,6 +163,9 @@ class PlanController extends Controller
if(!empty($comboInfo->keyue_start_time) and !empty($comboInfo->keyue_end_time)){
$weeklist=$weeklist->whereBetween('time',[$comboInfo->keyue_start_time,$comboInfo->keyue_end_time]);
}
+ if(!!$comboItemsNmr){
+ $weeklist=$weeklist->whereNotBetween('time',['11:00:00','12:00:00']);
+ }
}
if(!!$personInfo){
$weeklist=$weeklist->whereIn('sex',[0,$personInfo->sex]);
diff --git a/Laravel/app/Http/Controllers/API/Internal/PlanController.php b/Laravel/app/Http/Controllers/API/Internal/PlanController.php
index 0b231f6..b5df148 100644
--- a/Laravel/app/Http/Controllers/API/Internal/PlanController.php
+++ b/Laravel/app/Http/Controllers/API/Internal/PlanController.php
@@ -21,7 +21,10 @@ class PlanController extends Controller
$list=DB::table('plans')
->where('date',$date)->whereIn('status',[1])
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
- ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")',[$checkup_type_id])
+ ->where(function($query) use ($checkup_type_id) {
+ $query->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id])
+ ->orWhereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', ["8"]);
+ })
->where(['hospital_id'=>$hospital_id,'type'=>1,'is_del'=>0])
->where('is_vip','=',$is_vip);
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index 248564f..b5baa3c 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -76,6 +76,8 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () {
Route::post('/CheckedSignIn', 'App\Http\Controllers\API\H5\OrderController@CheckedSignIn');//检后签到
Route::post('/SendMsgCode', 'App\Http\Controllers\API\SendMsgCodeController@SendMsgCode');//发送验证码
Route::post('/CheckMsgCode', 'App\Http\Controllers\API\SendMsgCodeController@CheckMsgCode');//验证验证码
+ Route::post('/BaseInfo', 'App\Http\Controllers\API\H5\HomeController@BaseInfo');//基础信息
+ Route::post('/CreateNewOrder', 'App\Http\Controllers\API\H5\OrderNewController@CreateNewOrder');//创建新订单
diff --git a/h5/common/Top.vue b/h5/common/Top.vue
new file mode 100644
index 0000000..bd63fd4
--- /dev/null
+++ b/h5/common/Top.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
diff --git a/h5/pages/buy/done/done.vue b/h5/pages/buy/done/done.vue
index 606ba0f..12c5dd9 100644
--- a/h5/pages/buy/done/done.vue
+++ b/h5/pages/buy/done/done.vue
@@ -122,6 +122,13 @@ import DraggableButton from "@/pages/components/goHome.vue";
预约时间：
{{ order_info.appointment_date }} {{ order_info.appointment_time }}
+
+ 核磁项目:
+
+ {{item.name}}
+ 预约时间：{{order_info.erxian_appointment_info[0].date}} {{order_info.erxian_appointment_info[0].time}}
+
+
类型：
个检团检
diff --git a/h5/pages/main/order/order_new.vue b/h5/pages/main/order/order_new.vue
index 397ad82..f49cbab 100644
--- a/h5/pages/main/order/order_new.vue
+++ b/h5/pages/main/order/order_new.vue
@@ -3,24 +3,7 @@
-
+
挂号预约
@@ -28,31 +11,38 @@
- 未就诊
- 已就诊
- 已退号
+ 未就诊
+ 已就诊
+ 已退号
预约日期
-
+
-
-
-
- 预约日期
+
+
+
+
+ 预约日期
+
+
+
+
+
+
预约人：
- {{ order_info.name }}
+ {{ item.name }}
预约诊区：
秀英院区
- 健康管理中心(1楼男宾区)
- 健康管理中心(2楼女宾区)
+ 健康管理中心(1楼男宾区)
+ 健康管理中心(2楼女宾区)
@@ -75,6 +65,7 @@
onShow,
onLoad
} from "@dcloudio/uni-app";
+ import Top from "../../../common/Top.vue";
import {
useStore
} from "@/store";
@@ -101,9 +92,22 @@
});
};
+ let searchInfo=ref({})
+ let order_list = ref([])
+ const getOrderList = async () => {
+ uni.showLoading()
+ const response = await $api('OrderList',{searchInfo:searchInfo.value})
+ uni.hideLoading()
+ $response(response, () => {
+ order_list.value = response.data.list
+
+ })
+ }
onShow(() => {
+ getOrderList()
if (!!config_ref.value) {
checkHospital();
+
}
});
@@ -114,100 +118,7 @@
min-height: calc(100vh - 80rpx);
padding-top: 20rpx;
}
- .user_choose_wrapper {
- width: 50rpx;
- height: 50rpx;
- margin-left: 30rpx;
- }
-
- .user_choose_wrapper image {
- width: 50rpx;
- height: 50rpx;
- display: block;
- object-fit: contain;
- }
-
- .user_title_wrapper {
- font-weight: 400;
- font-size: 26rpx;
- color: #fff;
- line-height: 1;
- }
-
- .user_name_wrapper {
- font-weight: 400;
- font-size: 26rpx;
- color: #fff;
- line-height: 1;
- }
-
- .user_wrapper {
- height: 60rpx;
- padding-left: 40rpx;
- padding-right: 20rpx;
- margin-right: 20rpx;
- background: #009ea7;
- border-radius: 40rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .header_wrapper {
- display: flex;
- align-items: center;
- justify-content: space-between;
- width: 710rpx;
- height: 90rpx;
- background: #d8edf2;
- margin: 0 auto;
- position: relative;
-
- background-color: #fff;
- margin-left: 20rpx;
- margin-right: 20rpx;
- border-radius: 20rpx;
- }
-
- .hospital_wrapper {
- display: flex;
- align-items: center;
- width: 40%;
- }
-
- .hospital_icon_wrapper {
- width: 48rpx;
- height: 48rpx;
- margin-left: 20rpx;
- }
-
- .hospital_icon_wrapper image {
- width: 48rpx;
- height: 48rpx;
- display: block;
- object-fit: contain;
- }
-
- .hospital_name_wrapper {
- font-weight: 400;
- font-size: 28rpx;
- color: #484747;
- margin-left: 9rpx;
- line-height: 1;
- }
-
- .hospital_select_wrapper {
- width: 24rpx;
- height: 14rpx;
- margin-left: 19rpx;
- }
-
- .hospital_select_wrapper image {
- width: 24rpx;
- height: 14rpx;
- display: block;
- object-fit: contain;
- }
+
.haoyuan_row{
display: flex;
width: 100%;
@@ -261,6 +172,7 @@
margin: 20rpx;
border-radius: 10rpx;
padding: 30rpx;
+ color:#3E3A39;
}
.order_info_line_wrapper {
display: flex;