diff --git a/src/api/hisApi.ts b/src/api/hisApi.ts
index 7983229..3f93606 100644
--- a/src/api/hisApi.ts
+++ b/src/api/hisApi.ts
@@ -64,6 +64,7 @@ export interface OptionalItemListResponse {
// 已预约套餐信息
export interface PackagItemInfo {
patient_name: string;
+ is_upgrade_package: number; // 0-否 1-是
appointment_datetime: string;
package_code: string;
package_name: string;
diff --git a/src/assets/upgrade.png b/src/assets/upgrade.png
new file mode 100644
index 0000000..65be607
Binary files /dev/null and b/src/assets/upgrade.png differ
diff --git a/src/pages/U1/u1.tsx b/src/pages/U1/u1.tsx
index 55e0233..dfcaeb1 100644
--- a/src/pages/U1/u1.tsx
+++ b/src/pages/U1/u1.tsx
@@ -23,9 +23,9 @@ const U1: React.FC = () => {
// 实时监听身份证读取
useEffect(() => {
- // localStorage.setItem("lastIdCardNo", '421126199307103856');
- // navigate("/u2");
- // return;
+ localStorage.setItem("lastIdCardNo", '362331199210243023');
+ navigate("/UI6");
+ return;
window.electronAPI.startIdCardListen().catch((e: any) => {
console.error("start_idcard_listen failed", e);
window.electronAPI.log("error", `start_idcard_listen failed: ${e}`);
@@ -75,7 +75,7 @@ const U1: React.FC = () => {
.catch((e: any) => console.error(e));
}, 1000);
})
- .catch(() => {});
+ .catch(() => { });
};
// 先验证档案信息,查询到才跳转
@@ -92,7 +92,7 @@ const U1: React.FC = () => {
.then((res) => {
if (res.Status === 200 && res.Data) {
// 查询成功,跳转到 u2
- window.electronAPI.stopIdCardListen().catch(() => {});
+ window.electronAPI.stopIdCardListen().catch(() => { });
setReading(false);
isProcessingRef.current = false;
navigate("/u2");
@@ -119,7 +119,7 @@ const U1: React.FC = () => {
});
return () => {
- window.electronAPI.stopIdCardListen().catch(() => {});
+ window.electronAPI.stopIdCardListen().catch(() => { });
window.electronAPI.removeIdCardListeners();
if (timerRef.current) clearTimeout(timerRef.current);
if (intervalRef.current) clearInterval(intervalRef.current);
diff --git a/src/pages/UI6/UI6.css b/src/pages/UI6/UI6.css
index c0cc8dd..babcf83 100644
--- a/src/pages/UI6/UI6.css
+++ b/src/pages/UI6/UI6.css
@@ -4,12 +4,31 @@
overflow-y: auto;
overflow-x: hidden;
/* 隐藏滚动条但保持滚动功能 */
- scrollbar-width: none; /* Firefox */
- -ms-overflow-style: none; /* IE 和 Edge */
+ scrollbar-width: none;
+ /* Firefox */
+ -ms-overflow-style: none;
+ /* IE 和 Edge */
+}
+
+.ui6-package-name {
+ position: relative;
+ display: inline-block;
+ padding-right: 72px;
+}
+
+.ui6-upgrade-badge {
+ position: absolute;
+ top: 50%;
+ right: -60px;
+ transform: translateY(-50%);
+ height: 100px;
+ width: auto;
+
}
.ui6-table-container::-webkit-scrollbar {
- display: none; /* Chrome, Safari, Opera */
+ display: none;
+ /* Chrome, Safari, Opera */
}
.ui6-table {
@@ -75,4 +94,4 @@
.ui6-project-item:last-child {
border-bottom: none;
-}
+}
\ No newline at end of file
diff --git a/src/pages/UI6/UI6.tsx b/src/pages/UI6/UI6.tsx
index ed56993..55c818a 100644
--- a/src/pages/UI6/UI6.tsx
+++ b/src/pages/UI6/UI6.tsx
@@ -6,6 +6,7 @@ import BackButton from "../../components/BackButton";
import ConfirmButton from "../../components/ConfirmButton";
import DecorLine from "../../components/DecorLine";
import { getPackagItemDetail } from "../../api/hisApi";
+import upgradeImg from "../../assets/upgrade.png";
const UI6: React.FC = () => {
const navigate = useNavigate();
@@ -114,13 +115,21 @@ const UI6: React.FC = () => {
+ )}
+
尊敬的客户,以下是您预约的 {PackageInfo.appointment_datetime} 体检套餐详情,请核对确认