From 648904d076ae6e17892b40675598b1c8dc474277 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 24 Apr 2026 16:21:12 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into feature/v9.0/9.0.4
---
src/pages/inspectionTask/index.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index 3dcd60e..4955d45 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -9,7 +9,6 @@
import { getWebViewUrl } from "@/utils/index.js";
import WebViewPlus from "@/components/WebViewPlus.vue";
import { onHide, onShow } from "@dcloudio/uni-app";
-import { errorFactory } from "sass-loader/dist/utils.js";
import { useAppStore } from "@/store/index.js";
const appStore = useAppStore();
@@ -19,10 +18,21 @@
const updateKey = ref(0);
const sxListKey = ref(0);
const viewUrl = computed(() => {
+ // #ifdef MP-WEIXIN
return getWebViewUrl("/inspectionTask", {
updateKey: updateKey.value,
sxListKey: sxListKey.value,
+ showAddBtn: 1,
});
+ // #endif
+
+ // #ifndef MP-WEIXIN
+ return getWebViewUrl("/inspectionTask", {
+ updateKey: updateKey.value,
+ sxListKey: sxListKey.value,
+ showAddBtn: 0,
+ });
+ // #endif
});
watch(
@@ -40,7 +50,7 @@
// #ifndef MP-WEIXIN
if ([1, 2].includes(data.rowItem.status)) {
uni.navigateTo({
- url: `/subPackages/inProgress/index?wayLineJobInfoId=${data.rowItem.id}`,
+ url: `/subPackages/taskDetail/inProgress/index?wayLineJobInfoId=${data.rowItem.id}&batchNo=${data.rowItem.batch_no}`,
});
} else {
uni.navigateTo({
@@ -49,8 +59,13 @@
}
// #endif
}
+
+ if (data.type === "addTask") {
+ // #ifdef MP-WEIXIN
+ // #endif
+ }
}
-const isApp = ref(false);
+
onShow(() => {
const joinParams = uni.getStorageSync("joinParams");
if (joinParams) {
@@ -64,13 +79,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(() => {
--
Gitblit v1.9.3