diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index e91efd0..aa3b246 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -161,12 +161,10 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group
['name' => '3000以上', 'id' => 5],
];
$item_label = [
- ["id" => 1, 'name' => '一般检查'],
- ["id" => 2, 'name' => '血常规'],
- ["id" => 3, 'name' => '尿常规'],
- ["id" => 4, 'name' => '肝功能'],
- ["id" => 5, 'name' => '肾功能'],
- ["id" => 6, 'name' => '血糖']
+ ["id" => 3468454, 'name' => '内科检查'],
+ ["id" => 1812, 'name' => '尿常规'],
+ ["id" => 1955, 'name' => '肝功能'],
+ ["id" => 1958, 'name' => '肾功能'],
];
return \Yz::Return(true, "查询成功", ['sort_list' => $sort_list, 'combo_type' => $type, 'combo_crowd' => $crowd, 'combo_price' => $price_list, 'combo_item' => $item_label]);
}
@@ -403,7 +401,6 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
// 用于存储每个数组及其与目标数组的相似度
$similarities = [];
foreach ($combo_temp as $index => $array) {
-
$similarity = $this->jaccard_similarity($item_ids, $array);
$similarities[$index] = $similarity;
}
@@ -422,6 +419,7 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group
) as b on a.combo_id=b.c_id where a.status=1 and a.combo_id in (".$ids.")");
foreach ($combos as $key => $combo) {
+
$tags = json_decode($combo->tags, true);
$combo->tags2 = json_decode($combo->tags2, true);
foreach ($tags as $k => $tag) {
@@ -442,8 +440,14 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group
'money' => number_format($combo->price - $item_all_price,2)
];
}
+ $list=[];
+ foreach ($combos as $key => $combo) {
+ if($combo->recommend['xiangsidu']<>'0%'){
+ $list[]=$combo;
+ }
+ }
- return \Yz::Return(true, "查询完成", ['combos' => $combos]);
+ return \Yz::Return(true, "查询完成", ['combos' => $list]);
}
function jaccard_similarity($set1, $set2) {
// 计算交集
diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index d35134a..2ce8ec9 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -11,6 +11,7 @@ class FenzhenController extends Controller
public function abandon()
{
// 这里放 弃检逻辑
+
return \Yz::Return(true, "弃检成功");
}
diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php
index d992408..b5ad1d2 100644
--- a/Laravel/app/Http/Controllers/API/H5/HomeController.php
+++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php
@@ -87,7 +87,8 @@ class HomeController extends Controller
], [
'message' => '',
'name' => '满意度调查',
- 'jump' => '/pages/main/questionnaire/index',
+ // 'jump' => '/pages/main/questionnaire/index',
+ 'jump' => 'https://www.wjx.cn/vm/Q9A0NRI.aspx',
'icon' => '/assets/h5/a_manyidudiaocha.png'
]], [[
'message' => '',
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index 9b3e469..c83615d 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -28,6 +28,9 @@ class OrderController extends Controller
$datetime = new DateTime($list->created_at);
$timestamp = $datetime->getTimestamp();
$list->end_time = $timestamp + (60 * $WaitingPaymentTime);
+ if(time() > $list->end_time){
+ $list->status=3;
+ }
}
}
diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php
index ca43b1b..e226c7e 100644
--- a/Laravel/app/Http/Controllers/API/H5/ReportController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php
@@ -41,6 +41,7 @@ class ReportController extends Controller
foreach ($report_list as $key => $report) {
$report_list[$key]['is_read']=0;
+ $report_list[$key]['登记时间']= explode('T', $report_list[$key]['登记时间'])[0];
if($report['体检状态']=='报告已出' || $report['体检状态']=='总检完成'){
$cha=DB::table('report_l1_records')->where(['体检号' => $report['体检号']])->first();
if(!!$cha and $cha->is_read==1){
@@ -152,7 +153,7 @@ class ReportController extends Controller
];
$info['content'] = $report->总检建议;
-
+ DB::table('report_l1_records')->where(['id' => $report->id])->update(['is_read' => 1]);
return \Yz::Return(true, "查询完成", ['info' => $info]);
}
}
@@ -261,6 +262,7 @@ class ReportController extends Controller
{
$ids = $request->post('tj_numbers');
if(count($ids)<>2) return \Yz::echoError1("请选择两份报告");
+ if($ids[0]==$ids[1]) return \Yz::echoError1('不能选择相同的报告');
sort($ids);
$report1=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[0])->whereIn('体检状态',['报告已出','总检完成'])->get();
$report2=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[1])->whereIn('体检状态',['报告已出','总检完成'])->get();
diff --git a/Laravel/app/Http/Controllers/API/Web/ComboController.php b/Laravel/app/Http/Controllers/API/Web/ComboController.php
index d8d18bb..4d99e1c 100644
--- a/Laravel/app/Http/Controllers/API/Web/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/Web/ComboController.php
@@ -175,7 +175,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
if (!isset($groupedData[$keshiName])) {
$groupedData[$keshiName] = [];
}
- $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price];
+ $groupedData[$keshiName][] = ['id'=>$item->item_id,'desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price];
}
$items_info['price'] = $price;
$items_info['original_price'] = $items_original_price;
diff --git a/h5/package.json b/h5/package.json
index a13bd53..f8e8219 100644
--- a/h5/package.json
+++ b/h5/package.json
@@ -1,5 +1,6 @@
{
"dependencies": {
+ "@uni-ui/code-ui": "^1.5.3",
"echarts": "^5.4.2",
"weixin-js-sdk": "^1.6.5"
},
diff --git a/h5/pages.json b/h5/pages.json
index 3fd5bc5..1616f2e 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -189,6 +189,18 @@
"navigationBarTitleText": "体检引导"
}
},
+ {
+ "path": "pages/user/fenzhen/xindiantu",
+ "style": {
+ "navigationBarTitleText": "体检引导"
+ }
+ },
+ {
+ "path": "pages/user/fenzhen/qijian",
+ "style": {
+ "navigationBarTitleText": "线上弃检"
+ }
+ },
{
"path": "pages/buy/contrast/contrast",
"style": {
@@ -202,6 +214,9 @@
}
}
],
+ "easycom": {
+ "^w-(.*)": "@/uni_modules/wmf-code/components/w-$1/w-$1.vue"
+ },
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "海南现代妇女儿童医院",
diff --git a/h5/pages/buy/choose/choose.vue b/h5/pages/buy/choose/choose.vue
index 73f7242..e15e990 100644
--- a/h5/pages/buy/choose/choose.vue
+++ b/h5/pages/buy/choose/choose.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/buy/contrast/contrast.vue b/h5/pages/buy/contrast/contrast.vue
index a8d831b..aa974c6 100644
--- a/h5/pages/buy/contrast/contrast.vue
+++ b/h5/pages/buy/contrast/contrast.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/buy/done/done.vue b/h5/pages/buy/done/done.vue
index f7a6454..985cc88 100644
--- a/h5/pages/buy/done/done.vue
+++ b/h5/pages/buy/done/done.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/components/goHome.vue b/h5/pages/components/goHome.vue
new file mode 100644
index 0000000..768fba4
--- /dev/null
+++ b/h5/pages/components/goHome.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
diff --git a/h5/pages/main/bgcx/bgcx.vue b/h5/pages/main/bgcx/bgcx.vue
index 493b7f5..daf9cb7 100755
--- a/h5/pages/main/bgcx/bgcx.vue
+++ b/h5/pages/main/bgcx/bgcx.vue
@@ -1,4 +1,5 @@
+
@@ -129,7 +136,7 @@
-
未读
diff --git a/h5/pages/main/bgcx/bgdb/bgdb.vue b/h5/pages/main/bgcx/bgdb/bgdb.vue
index f495a47..30259cf 100755
--- a/h5/pages/main/bgcx/bgdb/bgdb.vue
+++ b/h5/pages/main/bgcx/bgdb/bgdb.vue
@@ -1,4 +1,5 @@
+
@@ -193,7 +195,10 @@ onShow(() => {
-
+
{{ item.r1?.content }}
@@ -210,7 +215,10 @@ onShow(() => {
-
+
{{ item.r2?.content }}
diff --git a/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue b/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue
index b1ce8d8..d619bb3 100755
--- a/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue
+++ b/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue
@@ -1,5 +1,6 @@
-
+
+
diff --git a/h5/pages/main/bgcx/bgjd/bgjd.vue b/h5/pages/main/bgcx/bgjd/bgjd.vue
index dd2f9db..98ff44b 100755
--- a/h5/pages/main/bgcx/bgjd/bgjd.vue
+++ b/h5/pages/main/bgcx/bgjd/bgjd.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/bgcx/ckbg/ckbg.vue b/h5/pages/main/bgcx/ckbg/ckbg.vue
index ff52cde..58fa929 100755
--- a/h5/pages/main/bgcx/ckbg/ckbg.vue
+++ b/h5/pages/main/bgcx/ckbg/ckbg.vue
@@ -1,5 +1,6 @@
-
+
+
diff --git a/h5/pages/main/bgcx/qsfx/qsfx.vue b/h5/pages/main/bgcx/qsfx/qsfx.vue
index 59d732c..18415f1 100755
--- a/h5/pages/main/bgcx/qsfx/qsfx.vue
+++ b/h5/pages/main/bgcx/qsfx/qsfx.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/bgcx/qsfx/qsfxxq.vue b/h5/pages/main/bgcx/qsfx/qsfxxq.vue
index f7c2bba..7579020 100755
--- a/h5/pages/main/bgcx/qsfx/qsfxxq.vue
+++ b/h5/pages/main/bgcx/qsfx/qsfxxq.vue
@@ -1,4 +1,5 @@
+
-/**
+import DraggableButton from "@/pages/components/goHome.vue";
+ /**
* name:
* user:sa0ChunLuyu
* date:2024年8月7日 20:05:05
@@ -277,7 +278,8 @@ const toRouter = () => {
};
-
+
+
@@ -320,7 +322,7 @@ const toRouter = () => {
-
+
{
-
+
{
- 适用人群
+ 体检项目(多选)
+import DraggableButton from "@/pages/components/goHome.vue";
/**
* name:
* user:tcdb
@@ -66,6 +67,7 @@ onShow(() => {
});
+
diff --git a/h5/pages/main/coupon/coupon.vue b/h5/pages/main/coupon/coupon.vue
index f76fe88..e703d43 100644
--- a/h5/pages/main/coupon/coupon.vue
+++ b/h5/pages/main/coupon/coupon.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/dev/dev.vue b/h5/pages/main/dev/dev.vue
index 186b9b5..3e29d12 100644
--- a/h5/pages/main/dev/dev.vue
+++ b/h5/pages/main/dev/dev.vue
@@ -1,4 +1,6 @@
+
diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue
index 1e4cddd..87f2d1e 100644
--- a/h5/pages/main/index/index.vue
+++ b/h5/pages/main/index/index.vue
@@ -261,7 +261,7 @@
- 10061457
+ 10080726
diff --git a/h5/pages/main/login/login.vue b/h5/pages/main/login/login.vue
index 735a4c4..d8d92b9 100644
--- a/h5/pages/main/login/login.vue
+++ b/h5/pages/main/login/login.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index 45a7624..3c90f51 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -1,4 +1,5 @@
+
@@ -162,8 +164,8 @@
继续付款
-
- 改约
+
退款
+import DraggableButton from "@/pages/components/goHome.vue";
/**
* name:
* user:sa0ChunLuyu
@@ -38,6 +39,7 @@ console.log(config_ref.value);
})
+
diff --git a/h5/pages/main/questionnaire/index.vue b/h5/pages/main/questionnaire/index.vue
index 9dca934..59ef0e2 100644
--- a/h5/pages/main/questionnaire/index.vue
+++ b/h5/pages/main/questionnaire/index.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/selectDoctor/selectDoctor.vue b/h5/pages/main/selectDoctor/selectDoctor.vue
index b27520a..160d3a2 100755
--- a/h5/pages/main/selectDoctor/selectDoctor.vue
+++ b/h5/pages/main/selectDoctor/selectDoctor.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/tj/choose.vue b/h5/pages/main/tj/choose.vue
index 13ff288..52d2b06 100644
--- a/h5/pages/main/tj/choose.vue
+++ b/h5/pages/main/tj/choose.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/tj/selectType.vue b/h5/pages/main/tj/selectType.vue
index 3613e63..5b5e9b1 100644
--- a/h5/pages/main/tj/selectType.vue
+++ b/h5/pages/main/tj/selectType.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue
index 34a3e41..1bd1d15 100644
--- a/h5/pages/main/tj/tjxq.vue
+++ b/h5/pages/main/tj/tjxq.vue
@@ -1,4 +1,5 @@
+
@@ -335,28 +338,31 @@ onShow(() => {
检查指标意义
-
+
- {{ val.keshi_name }}({{ val.children.length }})
-
-
+
+ {{ val.keshi_name }}({{ val.children.length }})
+
{{ v.name }}
- {{
- v.desc || "-"
- }}
+
+ {{ v.name }}
+
+ {{
+ v.desc || "-"
+ }}
+
@@ -394,8 +400,9 @@ onShow(() => {
>
{{ v.name }}
+ {{ v.name }}
+
{{
v.desc || "-"
}}
@@ -435,8 +442,9 @@ onShow(() => {
>
{{ v.name }}
+ {{ v.name }}
+
{{
v.desc || "-"
}}
@@ -528,7 +536,7 @@ onShow(() => {
套餐价格
- ¥ {{ comboInfo.price }}
@@ -567,6 +575,7 @@ onShow(() => {
.comboInfo {
position: relative;
z-index: 1;
+
&::after {
content: "";
width: 100%;
diff --git a/h5/pages/main/tj/tjzx.vue b/h5/pages/main/tj/tjzx.vue
index 535bdd1..d723729 100644
--- a/h5/pages/main/tj/tjzx.vue
+++ b/h5/pages/main/tj/tjzx.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index 5cede4d..24b0c4e 100755
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/main/yytjsj/yytjsj.vue b/h5/pages/main/yytjsj/yytjsj.vue
index c72fb09..482d943 100755
--- a/h5/pages/main/yytjsj/yytjsj.vue
+++ b/h5/pages/main/yytjsj/yytjsj.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/posts/posts/posts.vue b/h5/pages/posts/posts/posts.vue
index 0ab9c31..e9b6cf8 100644
--- a/h5/pages/posts/posts/posts.vue
+++ b/h5/pages/posts/posts/posts.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/user/choose/choose.vue b/h5/pages/user/choose/choose.vue
index 9703f2f..3180592 100644
--- a/h5/pages/user/choose/choose.vue
+++ b/h5/pages/user/choose/choose.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue
index edb9324..83974e0 100644
--- a/h5/pages/user/fenzhen/fenzhen.vue
+++ b/h5/pages/user/fenzhen/fenzhen.vue
@@ -1,555 +1,598 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ fenzhen_list.info.name }}
- {{ fenzhen_list.info.sex === 1 ? '男士' : '女士' }}
-
-
-
- 体检套餐:
- {{ fenzhen_list.info.combo_name }}
-
-
- 体检日期:
- {{ fenzhen_list.info.check_date }}
-
-
-
- 体检注意事项
-
-
-
-
- 开始体检时间
- {{ timeShow(fenzhen_list.info.start_time) }}
- — 预计结束时间
- {{ timeShow(fenzhen_list.info.end_time) }}
-
-
-
-
-
- 尊敬的客户,为了使您的体检流程更加顺畅,请按以下步骤提 示顺序逐项完成体检。
-
-
-
- 自助导检
-
-
-
- {{ i.time }}
-
-
-
-
-
-
-
-
-
- {{ k + 1 }}.{{ i.name }}
- {{ i.desc }}
-
-
-
- {{ i.tip }}
- 查看详情>>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ fenzhen_list.info.name
+ }}
+ {{
+ fenzhen_list.info.sex === 1 ? "男士" : "女士"
+ }}
+
+
+
+ 体检套餐:
+ {{
+ fenzhen_list.info.combo_name
+ }}
+
+
+ 体检日期:
+ {{
+ fenzhen_list.info.check_date
+ }}
+
+
+
+ 体检注意事项
+
+
+
+
+ 开始体检时间
+ {{
+ timeShow(fenzhen_list.info.start_time)
+ }}
+ — 预计结束时间
+ {{
+ timeShow(fenzhen_list.info.end_time)
+ }}
+
+
+
+
+
+ 尊敬的客户,为了使您的体检流程更加顺畅,请按以下步骤提
+ 示顺序逐项完成体检。
+
+
+
+ 自助导检
+
+
+
+ {{
+ i.time
+ }}
+
+
+
+
+
+
+
+
+
+ {{ k + 1 }}.{{ i.name }}
+ {{ i.desc }}
+
+
+
+ {{ i.tip }}
+ 查看详情>>
+
+
+
+
+
+
+
\ No newline at end of file
+.tip_dialog_text_wrapper {
+ max-height: calc(100vh - 600rpx);
+ overflow-y: auto;
+}
+
+.tip_dialog_wrapper {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ width: 750rpx;
+ background: #00000060;
+ margin: 0 auto;
+ z-index: 9999;
+}
+
+.tip_dialog_close_wrapper {
+ position: absolute;
+ top: 30rpx;
+ right: 40rpx;
+ width: 26rpx;
+ height: 26rpx;
+}
+
+.tip_dialog_close_wrapper image {
+ width: 26rpx;
+ height: 26rpx;
+ display: block;
+ object-fit: contain;
+}
+
+.tip_dialog_box_wrapper {
+ position: absolute;
+ width: 610rpx;
+ background: #ffffff;
+ border-radius: 15rpx;
+ padding-left: 50rpx;
+ padding-right: 50rpx;
+ padding-bottom: 90rpx;
+ padding-top: 130rpx;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+}
+
+.time_line_item_more_wrapper {
+ font-size: 22rpx;
+ color: #239ea3;
+ line-height: 1;
+ text-decoration-line: underline;
+ margin-right: 19rpx;
+}
+
+.time_line_item_text_wrapper {
+ font-weight: 500;
+ font-size: 24rpx;
+ color: #6e6e6e;
+ line-height: 1;
+ margin-left: 42rpx;
+}
+
+.time_line_item_line_wrapper {
+ width: 550rpx;
+ height: 1rpx;
+ background: #e8e8e8;
+ border-radius: 1rpx;
+ margin: 13rpx auto 5rpx;
+}
+
+.time_line_item_box_wrapper {
+ width: 400rpx;
+ height: 40rpx;
+ background: #5a75ca30;
+ border-radius: 5rpx;
+ font-weight: 500;
+ font-size: 24rpx;
+ color: #5a75ca;
+ line-height: 40rpx;
+ text-align: center;
+ margin-right: 17rpx;
+}
+
+.time_line_item_title_wrapper {
+ width: 140rpx;
+ font-weight: bold;
+ font-size: 28rpx;
+ color: #0d0d0d;
+ line-height: 40rpx;
+ height: 40rpx;
+ margin-left: 22rpx;
+}
+
+.time_line_item_flex_wrapper {
+ margin-top: 15rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.time_line_item_time_cover_wrapper {
+ position: absolute;
+ width: 2rpx;
+ top: -36rpx;
+ height: 100rpx;
+ left: 50%;
+ background: #ffffff;
+ transform: translateX(-50%);
+ z-index: 99;
+}
+
+.time_line_item_time_line_wrapper {
+ position: absolute;
+ width: 2rpx;
+ top: 0;
+ bottom: 0;
+ left: 50%;
+ background: #dedede;
+ transform: translateX(-50%);
+}
+
+.time_line_item_time_dot_wrapper {
+ position: absolute;
+ width: 16rpx;
+ height: 16rpx;
+ background: #cfcece60;
+ border-radius: 50%;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, calc(-50% + 26rpx));
+ z-index: 999;
+}
+
+.time_line_item_time_dot_in_wrapper {
+ width: 8rpx;
+ height: 8rpx;
+ background: #cfcece;
+ border-radius: 50%;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+}
+
+.time_line_box_wrapper {
+ margin-top: 28rpx;
+}
+
+.time_line_item_triangle_wrapper {
+ width: 16rpx;
+ height: 16rpx;
+ border-left: 1rpx #e8e8e8 solid;
+ border-bottom: 1rpx #e8e8e8 solid;
+ background: #f8f8f8;
+ position: absolute;
+ top: 50%;
+ left: -10rpx;
+ transform: rotate(45deg);
+}
+
+.time_line_item_content_wrapper {
+ width: 590rpx;
+ background: #f8f8f8;
+ border-radius: 5rpx;
+ margin-left: 12rpx;
+ position: relative;
+ border: 1rpx #e8e8e8 solid;
+ margin-top: 36rpx;
+ padding-bottom: 15rpx;
+}
+
+.time_line_item_time_value_wrapper {
+ width: 90rpx;
+ height: 55rpx;
+ background: #e4e4e4;
+ border-radius: 28rpx;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #212121;
+ line-height: 55rpx;
+ text-align: center;
+ position: relative;
+ z-index: 99;
+}
+
+.time_line_item_time_wrapper {
+ width: 90rpx;
+ position: absolute;
+ left: 6rpx;
+ right: 0;
+ top: 0;
+ bottom: 0;
+}
+
+.time_line_item_wrapper {
+ width: calc(90rpx + 12rpx + 590rpx);
+ display: flex;
+ justify-content: end;
+ margin: 0 auto;
+ position: relative;
+}
+
+.time_line_title_wrapper {
+ width: 180rpx;
+ height: 60rpx;
+ background: linear-gradient(90deg, #edf6f5 0%, #bbdfe1 99%);
+ border-radius: 0rpx 30rpx 30rpx 0rpx;
+ font-weight: bold;
+ font-size: 25rpx;
+ color: #123531;
+ text-align: center;
+ line-height: 60rpx;
+ margin-top: 26rpx;
+ overflow: hidden;
+}
+
+.time_line_wrapper {
+ width: 710rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04);
+ border-radius: 15rpx;
+ margin: 53rpx auto 0;
+ overflow: hidden;
+ position: relative;
+ padding-bottom: 30rpx;
+}
+
+.tip_text_wrapper {
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #e95515;
+ line-height: 36rpx;
+ margin-left: 10rpx;
+}
+
+.tip_icon_wrapper {
+ width: 24rpx;
+ height: 24rpx;
+ margin-top: 5rpx;
+}
+
+.tip_icon_wrapper image {
+ width: 24rpx;
+ height: 24rpx;
+ display: block;
+ object-fit: contain;
+}
+
+.tip_box_wrapper {
+ display: flex;
+ margin-top: 20rpx;
+}
+
+.tip_time_value_wrapper {
+ font-size: 36rpx;
+ color: #239ea3;
+ margin: 0 10rpx;
+}
+
+.tip_time_text_wrapper {
+ font-size: 22rpx;
+ color: #161616;
+}
+
+.tip_time_wrapper {
+ display: flex;
+ align-items: end;
+ line-height: 1;
+}
+
+.tip_wrapper {
+ width: calc(100% - 50px);
+ margin: 32rpx auto 0;
+}
+
+.info2_wrapper {
+ margin-top: 30rpx;
+}
+
+.info_box_wrapper {
+ margin-top: 60rpx;
+ margin-left: 29rpx;
+}
+
+.button_wrapper {
+ display: flex;
+ justify-content: end;
+}
+
+.desc_wrapper {
+ width: 160rpx;
+ height: 48rpx;
+ background: #239ea3;
+ border-radius: 5rpx;
+ font-size: 20rpx;
+ color: #ffffff;
+ line-height: 48rpx;
+ text-align: center;
+ margin-right: 29rpx;
+ margin-top: 24rpx;
+}
+
+.info_wrapper {
+ display: flex;
+ align-items: center;
+}
+
+.info_text_wrapper {
+ font-size: 24rpx;
+ color: #0f0f0f;
+ line-height: 1;
+}
+
+.info_title_wrapper {
+ font-size: 24rpx;
+ color: #8b8b8b;
+ line-height: 1;
+}
+
+.order_info_wrapper {
+ width: 710rpx;
+ height: 360rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.04);
+ border-radius: 15rpx;
+ margin: 20rpx auto 0;
+ overflow: hidden;
+}
+
+.person_name_wrapper {
+ display: flex;
+ align-items: end;
+ margin-top: 72rpx;
+ margin-left: 29rpx;
+}
+
+.person_name_text_wrapper {
+ font-weight: bold;
+ font-size: 34rpx;
+ color: #171717;
+}
+
+.person_sex_wrapper {
+ font-size: 24rpx;
+ color: #7e7e7e;
+ margin-left: 15rpx;
+}
+
+.time_line_item-2_wrapper .time_line_item_time_value_wrapper,
+.time_line_item-1_wrapper .time_line_item_time_value_wrapper {
+ background: #239ea3;
+ color: #f8f8f8;
+}
+
+.time_line_item-2_wrapper .time_line_item_time_dot_wrapper,
+.time_line_item-1_wrapper .time_line_item_time_dot_wrapper {
+ background: #239ea360;
+}
+
+.time_line_item-2_wrapper .time_line_item_time_dot_in_wrapper,
+.time_line_item-1_wrapper .time_line_item_time_dot_in_wrapper {
+ background: #239ea3;
+}
+
+.time_line_item-2_wrapper .time_line_item_box_wrapper,
+.time_line_item-1_wrapper .time_line_item_box_wrapper {
+ background: #6cafb230;
+ color: #239ea3;
+}
+
+.time_line_item--1_wrapper .time_line_item_time_value_wrapper {
+ background: #239ea3;
+ color: #f8f8f8;
+}
+
+.time_line_item--1_wrapper .time_line_item_time_dot_wrapper {
+ background: #239ea360;
+}
+
+.time_line_item--1_wrapper .time_line_item_time_dot_in_wrapper {
+ background: #239ea3;
+}
+
+.time_line_item--1_wrapper .time_line_item_box_wrapper {
+ background: #e1af6830;
+ color: #cc913e;
+}
+
diff --git a/h5/pages/user/fenzhen/qijian.vue b/h5/pages/user/fenzhen/qijian.vue
new file mode 100644
index 0000000..d6910b5
--- /dev/null
+++ b/h5/pages/user/fenzhen/qijian.vue
@@ -0,0 +1,187 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/h5/pages/user/fenzhen/xindiantu.vue b/h5/pages/user/fenzhen/xindiantu.vue
new file mode 100644
index 0000000..fb74d66
--- /dev/null
+++ b/h5/pages/user/fenzhen/xindiantu.vue
@@ -0,0 +1,594 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ fenzhen_list.info.name
+ }}
+ {{
+ fenzhen_list.info.sex === 1 ? "男士" : "女士"
+ }}
+
+
+
+ 体检套餐:
+ {{
+ fenzhen_list.info.combo_name
+ }}
+
+
+ 体检日期:
+ {{
+ fenzhen_list.info.check_date
+ }}
+
+
+ 体检号条码:
+
+
+
+
+
+ 开始体检时间
+ {{
+ timeShow(fenzhen_list.info.start_time)
+ }}
+ — 预计结束时间
+ {{
+ timeShow(fenzhen_list.info.end_time)
+ }}
+
+
+
+
+
+ 尊敬的客户,为了使您的体检流程更加顺畅,请按以下步骤提
+ 示顺序逐项完成体检。
+
+
+
+
+
+
+ 未完成
+
+ 已完成
+
+
+
+
+
+ {{ item.name }}
+
+ 弃检
+
+
+
+ {{ item.name }}
+
+ 完成
+ {{ item.time }}
+
+
+
+
+
+
+
+
+
diff --git a/h5/pages/user/pick/pick.vue b/h5/pages/user/pick/pick.vue
index 136d56d..e216272 100644
--- a/h5/pages/user/pick/pick.vue
+++ b/h5/pages/user/pick/pick.vue
@@ -1,4 +1,5 @@
+
diff --git a/h5/unocss.config.js b/h5/unocss.config.js
index 46cb890..07a9a06 100644
--- a/h5/unocss.config.js
+++ b/h5/unocss.config.js
@@ -16,6 +16,10 @@ export default {
'center': 'flex justify-center items-center',
'between': 'flex justify-between items-center',
'around': 'flex justify-around items-center',
+ 'evenly': 'flex justify-evenly items-center',
+ 'col': 'flex flex-col',
+ 'row': 'flex flex-row',
+ 'bs': 'b-0 b-solid', // 边框样式 用的时候加上 b-color 和某个方向的宽度 比如 b-l-1
},
],
diff --git a/h5/vite.config.js b/h5/vite.config.js
index fd29ef8..811418a 100644
--- a/h5/vite.config.js
+++ b/h5/vite.config.js
@@ -1,9 +1,12 @@
import { defineConfig } from 'vite'
import uni from '@dcloudio/vite-plugin-uni'
import Unocss from 'unocss/vite'
-
+
// https://vitejs.dev/config/
export default defineConfig({
+ transpileDependencies: [
+ /[/\\]node_modules[/\\](.+?)?@uni-ui(.*)[/\\]code-plugs/
+ ],
plugins: [
uni(),
// https://github.com/antfu/unocss