diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 784790d..ef0974d 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -572,7 +572,7 @@ class ReportController extends Controller foreach ($item['基础项目列表'] as $i) { $content_list[] = [ 'title' => $i['基础项目名称'], - 'content' => $i['结果值'] . $i['结果值单位'], + 'content' => $i['结果值'] .' '. $i['结果值单位'], 'icon' => $i['异常标识'], 'desc' => $i['结果值范围'], ]; @@ -595,11 +595,12 @@ class ReportController extends Controller public function list(Request $request) { $id_number = $request->post('id_number'); + $phone = $request->post('phone'); $hospital = Hospital::where('id', $request->post('hospital'))->where('del', 2)->first(); if (!$hospital) Yo::error_echo(100000, ['机构/医院']); $peis = new PEISApiController(); $res = $peis::Post('体检报告查询', $hospital->id, [ - "电话号码" => "", + "电话号码" => $phone, "证件号码" => $id_number, "体检号" => '' ])['data']; diff --git a/滦平县报告对比/components/report/type3.vue b/滦平县报告对比/components/report/type3.vue index 2140629..0d2dc8e 100644 --- a/滦平县报告对比/components/report/type3.vue +++ b/滦平县报告对比/components/report/type3.vue @@ -58,7 +58,8 @@ //data:"fdfdfdfs", showToast: false, success: () => { - uni.$lu.toast("链接已复制到剪切板,请前往浏览器下载") + window.open(url) ; + //uni.$lu.toast("链接已复制到剪切板,请前往浏览器下载") // tiao(url) }, fail: (e) => { @@ -76,8 +77,8 @@ //data:"fdfdfdfs", showToast: false, success: () => { - - uni.$lu.toast("链接已复制到剪切板,请前往浏览器下载.") + window.open(url) ; + //uni.$lu.toast("链接已复制到剪切板,请前往浏览器下载.") } }); @@ -125,15 +126,15 @@ - + + - 报告下载 + 查看报告 diff --git a/滦平县报告对比/pages/main/home/home.vue b/滦平县报告对比/pages/main/home/home.vue index fd8a3da..d6943f4 100644 --- a/滦平县报告对比/pages/main/home/home.vue +++ b/滦平县报告对比/pages/main/home/home.vue @@ -21,9 +21,10 @@ }, }); const id_number = ref('') + const phone=ref('') const toPage = () => { uni.navigateTo({ - url: `/pages/main/list/list?hospital=${$props.hospital}&id_number=${id_number.value}` + url: `/pages/main/list/list?hospital=4&id_number=${id_number.value}&phone=${phone.value}` }) } @@ -33,6 +34,10 @@ + 手机号 + + + @@ -62,7 +67,8 @@ border-radius: 8rpx; align-items: center; margin: 20rpx auto 0; - background: #33333310; + background: #ffffff; + border: 1px solid #16C5A9; } .top_button_text_wrapper { diff --git a/滦平县报告对比/pages/main/list/list.vue b/滦平县报告对比/pages/main/list/list.vue index 4affe30..2bcb7cc 100644 --- a/滦平县报告对比/pages/main/list/list.vue +++ b/滦平县报告对比/pages/main/list/list.vue @@ -28,9 +28,14 @@ }, }); const ReportList = async () => { + uni.showLoading({ + title:'加载中...' + }) const response = await ReportListAction({ - id_number: $props.id_number + id_number: $props.id_number, + phone:$props.phone }) + uni.hideLoading() $response(response, () => { report_list.value = response.data.list }) diff --git a/滦平县报告对比/pages/main/report/report.vue b/滦平县报告对比/pages/main/report/report.vue index e40df36..d686366 100644 --- a/滦平县报告对比/pages/main/report/report.vue +++ b/滦平县报告对比/pages/main/report/report.vue @@ -40,9 +40,13 @@ }) } const ReportInfo = async () => { + uni.showLoading({ + title:'加载中...' + }) const response = await ReportInfoAction({ id: $props.id }) + uni.hideLoading() $response(response, () => { report_content.value = { content: response.data.content,