From c7006707bafc2c3185f4fe1b9fea85597df0b084 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 20 Dec 2025 11:40:40 +0800
Subject: [PATCH] feat:针对非微信小程序相关配置处理
---
src/pages/map/index.vue | 14 ++-
src/pages.json | 18 ++--
src/pages/user/index.vue | 13 ++-
src/pages/work/index.vue | 136 ++++++++++++++++++---------------
src/pages/inspectionTask/index.vue | 14 ++-
5 files changed, 107 insertions(+), 88 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 6ce2a2c..ff2c1c6 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -42,12 +42,6 @@
"navigationBarTitleText": "登录页",
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/dispatcher/index",
- "style": {
- "navigationStyle": "custom"
- }
}
],
"subPackages": [
@@ -157,12 +151,16 @@
"pagePath": "pages/inspectionTask/index",
"text": "任务"
},
+ // #ifndef MP-WEIXIN
+ {
+ "iconPath": "static/images/tabbar/add.png",
+ "pagePath": "subPackages/taskDetail/addTask/index"
+ },
{
"iconPath": "static/images/tabbar/drone.png",
- "selectedIconPath": "static/images/tabbar/drone.png",
- "pagePath": "pages/dispatcher/index",
- "text": ""
+ "visible": "true"
},
+ // #endif
{
"iconPath": "static/images/tabbar/icon_order.png",
"selectedIconPath": "static/images/tabbar/icon_order_selected.png",
@@ -183,4 +181,4 @@
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
-}
+}
\ No newline at end of file
diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index bccef03..13476ad 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -64,13 +64,17 @@
const encodedData = encodeURIComponent(JSON.stringify({ device_sn: "" }));
uni.setStorageSync("webview_params", encodedData);
- uni.setStorageSync("lastTab", "task");
+ // #ifndef MP-WEIXIN
uni.setTabBarItem({
- index: 2,
- text: "",
- iconPath: "static/images/tabbar/add.png",
- selectedIconPath: "static/images/tabbar/add.png",
+ index: 2, // Tab 的索引（从0开始）
+ visible: true,
+ pagePath: "subPackages/taskDetail/addTask/index",
});
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: false,
+ });
+ // #endif
});
onHide(() => {
diff --git a/src/pages/map/index.vue b/src/pages/map/index.vue
index 8771ccd..a24c644 100644
--- a/src/pages/map/index.vue
+++ b/src/pages/map/index.vue
@@ -74,13 +74,17 @@
};
onShow(() => {
- uni.setStorageSync("lastTab", "map");
+ // #ifndef MP-WEIXIN
uni.setTabBarItem({
- index: 2,
- text: "",
- iconPath: "static/images/tabbar/drone.png",
- selectedIconPath: "static/images/tabbar/drone.png",
+ index: 2, // Tab 的索引（从0开始）
+ visible: false,
+ pagePath: "subPackages/taskDetail/addTask/index",
});
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: true,
+ });
+ // #endif
});
onHide(() => {
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index e85d644..7e94e96 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -95,13 +95,16 @@
onShow(() => {
getUserInfoData();
- uni.setStorageSync("lastTab", "user");
+ // #ifndef MP-WEIXIN
uni.setTabBarItem({
- index: 2,
- text: "",
- iconPath: "static/images/tabbar/drone.png",
- selectedIconPath: "static/images/tabbar/drone.png",
+ index: 2, // Tab 的索引（从0开始）
+ visible: false,
});
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: true,
+ });
+ // #endif
});
</script>
<style scoped lang="scss">
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index afeaf42..942ecdd 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -1,75 +1,85 @@
+<!--
+ * @Author : yuan
+ * @Date : 2025-12-18 10:06:30
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-12-20 11:37:09
+ * @FilePath : \src\pages\work\index.vue
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-12-18 10:06:30
+-->
<template>
- <view class="eventTickets">
- <WebViewPlus ref="sWebViewRef" :src="`${viewUrl}`" @webMessage="onPostMessage" />
- </view>
-
+ <view class="eventTickets">
+ <WebViewPlus
+ ref="sWebViewRef"
+ :src="`${viewUrl}`"
+ @webMessage="onPostMessage"
+ />
+ </view>
</template>
<script setup>
- import {
- getWebViewUrl
- } from "@/utils/index.js";
- import WebViewPlus from "@/components/WebViewPlus.vue";
- import {
- useTabAddButton
- } from "@/hooks/index.js";
- import { onShow, onHide } from "@dcloudio/uni-app";
-
- const sWebViewRef = ref(null);
- // const viewUrl = getWebViewUrl('/work', {})
- const updateKey = ref(0)
- const viewUrl = computed(() => {
- return getWebViewUrl('/work', {
- updateKey: updateKey.value
- })
- })
+import { getWebViewUrl } from "@/utils/index.js";
+import WebViewPlus from "@/components/WebViewPlus.vue";
+import { useTabAddButton } from "@/hooks/index.js";
+import { onShow, onHide } from "@dcloudio/uni-app";
- function onPostMessage(data) {
- if (data.type === 'jumpMapNav') {
- uni.navigateTo({
- url: `/subPackages/workDetail/mapWork/index?currentItem=${data.eventNum}`
- });
+const sWebViewRef = ref(null);
+// const viewUrl = getWebViewUrl('/work', {})
+const updateKey = ref(0);
+const viewUrl = computed(() => {
+ return getWebViewUrl("/work", {
+ updateKey: updateKey.value,
+ });
+});
- } else if (data.type === 'workid') {
- uni.navigateTo({
- url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&totalNum=${data.totalNum}&keyword=${data.keyword}&aiType=${data.aiType}&status=${data.status}`
- });
- } else if (data.type === 'bigImage') {
- uni.navigateTo({
- url: `/subPackages/workDetail/photoMagnify/index?eventNum=${data.eventNum}`
- });
+function onPostMessage(data) {
+ if (data.type === "jumpMapNav") {
+ uni.navigateTo({
+ url: `/subPackages/workDetail/mapWork/index?currentItem=${data.eventNum}`,
+ });
+ } else if (data.type === "workid") {
+ uni.navigateTo({
+ url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&totalNum=${data.totalNum}&keyword=${data.keyword}&aiType=${data.aiType}&status=${data.status}`,
+ });
+ } else if (data.type === "bigImage") {
+ uni.navigateTo({
+ url: `/subPackages/workDetail/photoMagnify/index?eventNum=${data.eventNum}`,
+ });
+ }
+}
+const isApp = ref(false);
+onShow(() => {
+ const joinParams = uni.getStorageSync("joinParams");
+ if (joinParams) {
+ updateKey.value = updateKey.value + 1;
+ uni.removeStorageSync("joinParams");
+ }
- }
+ // #ifndef MP-WEIXIN
+ uni.setTabBarItem({
+ index: 2, // Tab 的索引（从0开始）
+ // text: '新建工单',
+ visible: true,
+ pagePath: "subPackages/workDetail/addWork/index",
+ });
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: false,
+ });
+ // #endif
- }
- const isApp = ref(false)
- onShow(() => {
- const joinParams = uni.getStorageSync('joinParams');
- if (joinParams) {
- updateKey.value = updateKey.value + 1
- uni.removeStorageSync('joinParams');
- }
-
- uni.setStorageSync('lastTab', 'work');
- uni.setTabBarItem({
- index: 2,
- text: '',
- iconPath: 'static/images/tabbar/add.png',
- selectedIconPath: 'static/images/tabbar/add.png'
- });
- // isApp.value = true
- });
+ // isApp.value = true
+});
- onHide(() => {
- // isApp.value = false
- });
+onHide(() => {
+ // isApp.value = false
+});
</script>
<style scoped lang="scss">
- .eventTickets {
-
- width: 100%;
- height: 100%;
-
- }
-</style>
\ No newline at end of file
+.eventTickets {
+ width: 100%;
+ height: 100%;
+}
+</style>
--
Gitblit v1.9.3