diff --git a/src/components/BottomPanel/index.scss b/src/components/BottomPanel/index.scss
index 9a76e7b5..23441abe 100644
--- a/src/components/BottomPanel/index.scss
+++ b/src/components/BottomPanel/index.scss
@@ -3,7 +3,7 @@
.bottom-panel {
height: 49Px;
padding-top: 8Px;
- padding-bottom: 8Px;
+ padding-bottom: calc(env(safe-area-inset-bottom) + 8Px);
display: flex;
align-items: center;
justify-content: space-around;
@@ -14,8 +14,4 @@
border-top-left-radius: 1rem;
z-index: 3000;
background: var(--wjh-color-background-frame);
-}
-
-.bottom-bar-ios {
- padding-bottom: 2rem;
-}
+}
\ No newline at end of file
diff --git a/src/components/BottomPanel/index.vue b/src/components/BottomPanel/index.vue
index cafa8fcd..a48c9233 100644
--- a/src/components/BottomPanel/index.vue
+++ b/src/components/BottomPanel/index.vue
@@ -1,14 +1,10 @@
-
+
diff --git a/src/components/PopView/index.vue b/src/components/PopView/index.vue
index 3f47b24e..831872dc 100644
--- a/src/components/PopView/index.vue
+++ b/src/components/PopView/index.vue
@@ -4,9 +4,7 @@
@@ -14,7 +12,6 @@
-
+
点击查看相关业务服务组织的联系方式
diff --git a/src/pages/suit/ContactMe/index.module.scss b/src/pages/suit/ContactMe/index.module.scss
index 30e4fb96..7a0f2c78 100644
--- a/src/pages/suit/ContactMe/index.module.scss
+++ b/src/pages/suit/ContactMe/index.module.scss
@@ -3,6 +3,7 @@
.container {
text-align: center;
padding: 8Px;
+ padding-bottom: calc(env(safe-area-inset-bottom) + 8Px);
font-size: 1.0rem;
color: var(--wjh-color-text-secondary);
background-color: var(--wjh-color-primary-light);
@@ -26,9 +27,4 @@
color: var(--wjh-color-primary-dark);
line-height: 150%;
}
-}
-
-.ios {
- padding-bottom: 2rem;
-}
-
+}
\ No newline at end of file
diff --git a/src/pages/suit/ContactMe/index.vue b/src/pages/suit/ContactMe/index.vue
index ca463190..a31ac049 100644
--- a/src/pages/suit/ContactMe/index.vue
+++ b/src/pages/suit/ContactMe/index.vue
@@ -1,6 +1,5 @@
-
+
点击查看学生事务大厅的联系方式
diff --git a/src/utils/effects.ts b/src/utils/effects.ts
index 6a2e9f2d..8c9b1e98 100644
--- a/src/utils/effects.ts
+++ b/src/utils/effects.ts
@@ -1,33 +1,6 @@
-import Taro from "@tarojs/taro";
-
-/**
- * 适配苹果手机的大小
- * @returns
- */
-
-export function isNewIPhone(): boolean {
- const info = Taro.getSystemInfoSync();
- if (!info.model) return false;
- const isNewIphone = info.model.match(
- "(iPhone X|iPhone XS|iPhone 11|iPhone 12|iPhone 13|iPhone 14|iPhone 15)"
- )?.length;
- return isNewIphone !== undefined && isNewIphone > 0;
-}
-
-export function scrollViewHeight(top = true, bottom = true) {
- let topHeight = "0px";
- let bottomHeight = "0px";
- if (top) topHeight = isNewIPhone() ? "87px" : "60px";
- if (bottom) bottomHeight = isNewIPhone() ? "88px" : "64px";
- return {
- height: `calc(100vh - ${topHeight} - ${bottomHeight})`
- };
-}
-
/**
* 实验室页面 精弘网络copyright
*/
-
export function getCopyRight() {
const currentYear = new Date().getFullYear();
return `精弘网络@${currentYear}`;
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 4e43e806..71d0786a 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,5 +1,5 @@
import { cookiesToString, ejectCookies } from "./cookie";
-import { getCopyRight, isNewIPhone, scrollViewHeight } from "./effects";
+import { getCopyRight } from "./effects";
import { fetch } from "./fetch";
import { checkBind } from "./checkBind";
import { checkNotification } from "./checkNotification";
@@ -13,8 +13,6 @@ export {
FetchResult,
ejectCookies,
cookiesToString,
- isNewIPhone,
- scrollViewHeight,
getCopyRight,
fetch,
checkBind,