feat:小程序修改

.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 ------------------------------------

src/pages/root/login.vue

@@ -120,7 +120,14 @@ const affirmConfirm = () => {
             </view>
         </view>
 
-        <affirm-check v-model="state.isAgree" class="absolute bottom-30rpx" />
+        <view class="absolute bottom-60rpx">
+            <view class="sub-text-28 color-red! indent-2em">
+                <text>小程序只提供给有"浦江县机关事务智慧后勤一体化平台"账号的用户使用,其余用户不能使用该小程序</text>
+            </view>
+            <view class="h-10rpx" />
+            <affirm-check v-model="state.isAgree" />
+        </view>
+
         <affirm-modal ref="affirmModalRef" @confirm="affirmConfirm" />
         <service-text ref="serviceTextRef" :showPhoneText="false" />
         <tm-modal :show="state.loginErrorVisible" title="登录错误" cancelText="取消" confirmText="联系客服" height="auto"

src/pages/root/pwd-login.vue

@@ -133,7 +133,13 @@ const affirmModalConfirm = () => {
             <text></text>
             <text class="color-blue font-size-sm" @click="router.jump('/pages/root/login')">手机号一键登录</text>
         </view>
-        <affirm-check v-model="state.isAgree" class="absolute bottom-30rpx" />
+        <view class="absolute bottom-60rpx">
+            <view class="sub-text-28 color-red! indent-2em">
+                <text>小程序只提供给有"浦江县机关事务智慧后勤一体化平台"账号的用户使用,其余用户不能使用该小程序</text>
+            </view>
+            <view class="h-10rpx" />
+            <affirm-check v-model="state.isAgree" />
+        </view>
         <affirm-modal ref="affirmModalRef" @confirm="affirmModalConfirm" />
     </crud-layout>
 </template>

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)
     }

src/pages/tabbar/integrated.vue

@@ -42,36 +42,36 @@ const todoCount = ref(0)
 const crudLayoutRef = ref<any>(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: "通知公告",

src/sheep/components/base/base-safe-height/base-safe-height.vue

@@ -11,17 +11,29 @@ const props = withDefaults(defineProps<Props>(), {
 })
 
 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"
 }
 </script>
 

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<string | undefined> {
 		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<string>((resolve, reject) => {
 			uni.scanCode({
@@ -20,7 +22,7 @@ export function useScanCode(actModalShow) {
 				},
 			})
 		})
-		return scanResult
+		return normalizeScanResult(scanResult || "")
 	}
 
 	// 处理url扫码结果

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()
-
 })
 
 </script>