关闭套餐列表筛选动画、修改套餐名称显示bug、自动预约二线(未完成)

main
yanzai 1 year ago
parent 1922dd96c3
commit 60951740bf

@ -498,7 +498,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
}
$temp_nmr=[];
$keywords = ['磁', 'CT', 'DR', '钼靶'];
$keywords = ['磁'];
foreach ($nmr_list as $key=>$item){
foreach ($keywords as $index => $keyword) {
@ -542,7 +542,9 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
'original_price' =>number_format($all_original_price, 2, '.', '') ,//总原价
'pay_item_count' => $pay_item_count,//需要付费的项目数量
'lose_price'=>number_format($lose_price, 2, '.', ''),//剩余的不用就会浪费的金额
'nmr_list' => $nmr_list//核磁项目列表
// 'nmr_list' => $nmr_list,//核磁项目列表
'nmr_list' => [],//不返回给前端了
'nmr_list2' => $nmr_list//核磁项目列表,重新定义一个字段用于前端携带返回
];
return \Yz::Return(true, "查询成功", $data);
}

@ -85,6 +85,9 @@ class OrderController extends Controller
$coupon_id = request('coupon_id');//优惠券
$jifen = request('jifen', 0); //使用的积分数量
$yucunkuan = request('yucunkuan', 0);//使用的预存款数量
$erxian_info= request('erxian_info');//使用的预存款数量
$wj_flag = request('wj'); //问卷标记
if (isset($wj_flag) and $wj_flag == 1) {
@ -337,6 +340,29 @@ class OrderController extends Controller
$true_price = $true_price - ($jifen + $yucunkuan);
if ($true_price < -1) return \Yz::echoError1("");
if ($true_price < 0) $true_price = 0;
//如果有二线号源,根据体检时间查询二线可用号源,区分上下午
$plan_nmr_info=[];
if (isset($erxian_info) and !empty($erxian_info)) {
foreach ($erxian_info as $erxian_item) {
$nmrPlans=$AspNet::ErXian(['yyid'=>6,'data'=>[$plan->date],'action'=>"1"],uniqid());
if($plan->time<="12:00") $end_time="12:00";
if($plan->time>"12:00") $end_time="23:59";
if(!isset($nmrPlans[$plan->date]) or empty($nmrPlans[$plan->date])) return \Yz::echoError1("二线号源不可用,请重新选则日期");
foreach ($nmrPlans[$plan->date] as $nmp_p){
if($nmp_p['Time']>=substr($plan->time,0,5) and $nmp_p['Time']<=$end_time and $nmp_p['keyong']==="0"){
$plan_nmr_info[]=[
"item_id"=>$erxian_item['item_id'],
"name"=>$erxian_item['name'],
"price"=>$erxian_item['price'],
"time"=>$plan->date." ".$nmp_p['Time'],
];
break;
}
}
}
}
//校验二线号源
if (isset($plan_nmr_info) and !empty($plan_nmr_info)) {
@ -720,22 +746,7 @@ class OrderController extends Controller
if($order_info->hospital_id == 4){
$yyid=2;
}
//如果有二线信息校验二线号源是否可用
// $erxian_info=json_decode($order_info->erxian_appointment_info, true);
// if (isset($erxian_info) and !empty($erxian_info)) {
// foreach ($erxian_info as $key => $plan_nmr) {
// $p_nmr_data = [
// 'item_id' => $plan_nmr['item_id'],
// 'name' => $plan_nmr['name'],
// 'date' => $plan_nmr['date'],
// 'time' => $plan_nmr['time'],
// ];
// //调用接口校验号源是否可用
// $erxian_status = $AspNet::ErXian(['YYRQ' => $p_nmr_data['date'], 'YYSJ' => $p_nmr_data['time'], 'yyid' => $yyid, 'action' => 4], uniqid());
// if ($erxian_status !== true) return ['status' => false, 'msg' => $p_nmr_data['name'] . '号源不可用'];
// }
//
// }
$buy_info = json_decode($order_info->buy_info, true);
$combo_id = $buy_info['combo']['id'];

@ -4,7 +4,7 @@
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>体检平台</title>
<title>海南现代妇女儿童医院体检平台</title>
</head>
<body>
<div id="app"></div>

@ -550,7 +550,7 @@ const toRouter = () => {
>
</view>
</uni-popup>
<uni-popup ref="popup" mask-background-color="transparent">
<uni-popup ref="popup" mask-background-color="transparent" :animation="false">
<view class="pt-292rpx w-full h-100vh" @click="popup.close()">
<view class="bg-[rgba(0,0,0,0.3)] h-100%">
<view

@ -368,7 +368,7 @@ onShow(() => {
/>
<view class="flex flex-col grow">
<text
>{{ item.name }} {{ item.sex == 0 ? "(男)" : "(女)" }}</text
>{{ item.name }}</text
>
<view class="mt-13rpx mb-18rpx">
<uni-tag

@ -29,6 +29,7 @@ let netReceiptsPrice = ref(0);
let yucunkuan = ref(0); //
let jifen = ref(0); //
let keyong_jifen = ref(0); //
let erxianInfo=ref(null);
const mountedAction = async () => {
uni.showLoading({
@ -193,6 +194,7 @@ const getnmrList = async () => {
comboInfo.value = response.data.combo_info;
itemsInfo.value = response.data.items_info;
truePrice.value = response.data.true_price;
erxianInfo.value=response.data.nmr_list2;
netReceiptsPrice.value = response.data.true_price;
if(itemsInfo.value.items?.length){//
let cailiao_price=0
@ -303,6 +305,7 @@ const comfrimyy = async () => {
yucunkuan: yucunkuan.value,
coupon_id:yytjInfo.value?.couponId || null,
wj: buyInfo.value.wj,
erxian_info:erxianInfo.value,
};
console.log(obj);
const response = await $api("OrderCreate", obj);

Loading…
Cancel
Save