diff --git a/.env b/.env
index c26753f..d042ff0 100644
--- a/.env
+++ b/.env
@@ -17,16 +17,16 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx'
VITE_OAUTH2_APP_CLIENT='mini:mini'
# --------------------------- start 开发环境 start ----------------------------------
-VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api
+VITE_APP_DEV_SERVICE = https://www.pjzhhq.cn/api
# VITE_APP_DEV_SERVICE = http://localhost:9999
# VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc
# VITE_IMAGE_DEV_PATH = http://localhost:9999
# VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc/api
-VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api
+VITE_IMAGE_DEV_PATH = https://www.pjzhhq.cn/api
# ----------------------------- end 开发环境 end ------------------------------------
# --------------------------- start 生产环境 start ----------------------------------
-VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api
-VITE_APP_PROD_IMAGE = https://stgl.pj.gov.cn/api
+VITE_APP_PROD_SERVICE = https://www.pjzhhq.cn/api
+VITE_APP_PROD_IMAGE = https://www.pjzhhq.cn/api
# ----------------------------- end 生产环境 end ------------------------------------
diff --git a/src/pages/root/login.vue b/src/pages/root/login.vue
index 9e6d837..28d8990 100644
--- a/src/pages/root/login.vue
+++ b/src/pages/root/login.vue
@@ -120,7 +120,14 @@ const affirmConfirm = () => {
-
+
+
+ 小程序只提供给有"浦江县机关事务智慧后勤一体化平台"账号的用户使用,其余用户不能使用该小程序
+
+
+
+
+
{
手机号一键登录
-
+
+
+ 小程序只提供给有"浦江县机关事务智慧后勤一体化平台"账号的用户使用,其余用户不能使用该小程序
+
+
+
+
diff --git a/src/pages/tabbar/canteen.vue b/src/pages/tabbar/canteen.vue
index 7980d90..d707a03 100644
--- a/src/pages/tabbar/canteen.vue
+++ b/src/pages/tabbar/canteen.vue
@@ -22,6 +22,9 @@ onLoad(() => {
})
onShow(async () => {
+ console.log("systemInfoSync:", uni.getSystemInfoSync());
+ console.log("menuButtonBoundingClientRect:", uni.getMenuButtonBoundingClientRect());
+
if (pageRef.value) {
pageRef.value.reload(false)
}
diff --git a/src/pages/tabbar/integrated.vue b/src/pages/tabbar/integrated.vue
index f781d63..0918ac0 100644
--- a/src/pages/tabbar/integrated.vue
+++ b/src/pages/tabbar/integrated.vue
@@ -42,36 +42,36 @@ const todoCount = ref(0)
const crudLayoutRef = ref(null)
const services = [
- {
- name: "todo",
- label: "工作待办",
- icon: "/static/icon/todo.png",
- url: "/pages/integrated/todo/index",
- },
- {
- name: "meeting-booking",
- label: "会议预定",
- icon: "/static/icon/meeting-booking.png",
- url: "/pages/integrated/meeting/index",
- },
- {
- name: "lost-and-found",
- label: "失物招领",
- icon: "/static/icon/service_1.png",
- url: "/pages/integrated/lostAndFound/index",
- },
+ // {
+ // name: "todo",
+ // label: "工作待办",
+ // icon: "/static/icon/todo.png",
+ // url: "/pages/integrated/todo/index",
+ // },
+ // {
+ // name: "meeting-booking",
+ // label: "会议预定",
+ // icon: "/static/icon/meeting-booking.png",
+ // url: "/pages/integrated/meeting/index",
+ // },
+ // {
+ // name: "lost-and-found",
+ // label: "失物招领",
+ // icon: "/static/icon/service_1.png",
+ // url: "/pages/integrated/lostAndFound/index",
+ // },
{
name: "feedback",
label: "意见反馈",
icon: "/static/icon/feedback.png",
url: "/pages/integrated/feedback/index",
},
- {
- name: "repair-report",
- label: "物业维修",
- icon: "/static/icon/service_2.png",
- url: "/pages/integrated/repair/index",
- },
+ // {
+ // name: "repair-report",
+ // label: "物业维修",
+ // icon: "/static/icon/service_2.png",
+ // url: "/pages/integrated/repair/index",
+ // },
{
name: "notice",
label: "通知公告",
diff --git a/src/sheep/components/base/base-safe-height/base-safe-height.vue b/src/sheep/components/base/base-safe-height/base-safe-height.vue
index 0d0fe5a..bd94ebe 100644
--- a/src/sheep/components/base/base-safe-height/base-safe-height.vue
+++ b/src/sheep/components/base/base-safe-height/base-safe-height.vue
@@ -11,17 +11,29 @@ const props = withDefaults(defineProps(), {
})
function getHeight() {
- const { top, bottom } = uni.getSystemInfoSync().safeAreaInsets!
+ let _statusBarHeight = 0;
+ let _bottom = 0;
+ const { statusBarHeight, safeAreaInsets } = uni.getSystemInfoSync()
+ const { bottom = 0 } = safeAreaInsets ?? {}
+ if (statusBarHeight) {
+ _statusBarHeight = statusBarHeight
+ }
+ if (_statusBarHeight <= 20) {
+ _statusBarHeight = 20
+ }
+ if (bottom) {
+ _bottom = bottom
+ }
+ if (_bottom <= 8) {
+ _bottom = 8
+ }
if (props.type && props.type === "bottom") {
- return bottom + "px"
+ return _bottom + "px"
}
if (props.type && props.type === "top") {
- if (top < 22) {
- return "22px"
- }
- return top + "px"
+ return _statusBarHeight + "px"
}
- return 22 + "px"
+ return 20 + "px"
}
diff --git a/src/sheep/hooks/use-scan-code.ts b/src/sheep/hooks/use-scan-code.ts
index 73c5500..7c8a4b5 100644
--- a/src/sheep/hooks/use-scan-code.ts
+++ b/src/sheep/hooks/use-scan-code.ts
@@ -1,12 +1,14 @@
import { router } from ".."
import { getUrlParamsObj, isDevEnv } from "../utils/app"
+const normalizeScanResult = (scanResult: string) => scanResult.replace("https://stgl.pj.gov.cn", "https://www.pjzhhq.cn")
+
export function useScanCode(actModalShow) {
async function scanCodeAction(): Promise {
if (isDevEnv()) {
const testQrCode = "https://stgl.pj.gov.cn/h5/#/pages/pay/scanPay?id=1931916121241079810"
uni.showModal({ content: "开发环境不是浙政钉和诗画环境，扫码仅供测试" })
- return Promise.resolve(testQrCode)
+ return normalizeScanResult(testQrCode)
}
const scanResult = await new Promise((resolve, reject) => {
uni.scanCode({
@@ -20,7 +22,7 @@ export function useScanCode(actModalShow) {
},
})
})
- return scanResult
+ return normalizeScanResult(scanResult || "")
}
// 处理url扫码结果
diff --git a/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue b/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue
index 87502eb..a1efb72 100644
--- a/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue
+++ b/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue
@@ -347,11 +347,13 @@ watchEffect(() => {
})
onMounted(() => {
let sys = uni.getWindowInfo()
- safeHeight.value = sys.safeAreaInsets.bottom || 16
+ safeHeight.value = sys.safeAreaInsets.bottom
+ if (safeHeight.value < 8) {
+ safeHeight.value = 8
+ }
})
onMounted(() => {
getList()
-
})