From 44dd9c4eb8a2489c63a5eb53fd4254bbb3510e95 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 18 Jun 2026 09:14:57 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.4'

---
 src/pages/work/index.vue |   89 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index 7d2532e..7d982e1 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -1,38 +1,87 @@
 <template>
-	<view class="flex flex-col eventTickets">
-		 <WebViewPlus v-if="isApp" 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 { getWebViewUrl } from "@/utils/index.js";
 import WebViewPlus from "@/components/WebViewPlus.vue";
+import { onShow, onHide } from "@dcloudio/uni-app";
+
 const sWebViewRef = ref(null);
-const viewUrl = getWebViewUrl('/work', {})
+const updateKey = ref(0);
+const viewUrl = computed(() => {
+  // #ifdef MP-WEIXIN
+  return getWebViewUrl("/work", {
+    updateKey: updateKey.value,
+    showAddBtn: 1,
+  });
+  // #endif
+
+  // #ifndef MP-WEIXIN
+  return getWebViewUrl("/work", {
+    updateKey: updateKey.value,
+    showAddBtn: 0,
+  });
+  // #endif
+});
+
 function onPostMessage(data) {
-	if(data.type==='workid'){
+  // #ifdef MP-WEIXIN
+  if (data.type === "addWork") {
+  }
+  // #endif
+
+  // #ifndef MP-WEIXIN
+  if (data.type === "jumpMapNav") {
     uni.navigateTo({
-      url: `/subPackages/workDetail/index?eventNum=${data.eventNum}`
+      url: `/subPackages/workDetail/mapWork/index?currentItem=${data.eventNum}`,
     });
-  }else if(data.type === 'bigImage'){
+  } else if (data.type === "workid") {
     uni.navigateTo({
-      url: `/subPackages/workDetail/photoMagnify/index?eventNum=${data.eventNum}`
+      url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&totalNum=${data.totalNum}&keyword=${data.keyword}&aiType=${data.aiType}&status=${data.status}&current=${data.current}`,
+    });
+  } else if (data.type === "bigImage") {
+    uni.navigateTo({
+      url: `/subPackages/workDetail/photoMagnify/index?eventNum=${data.eventNum}`,
     });
   }
-
+  // #endif
 }
-	const isApp = ref(false)
-	onShow(() => {
-	  isApp.value = true
-	});
+onShow(() => {
+  const joinParams = uni.getStorageSync("joinParams");
+  if (joinParams) {
+    updateKey.value = updateKey.value + 1;
+    uni.removeStorageSync("joinParams");
+  }
 
-	onHide(() => {
-	  isApp.value = false
-	});
+  // #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
+
+});
+
+onHide(() => {
+});
 </script>
 
 <style scoped lang="scss">
-
+.eventTickets {
+  width: 100%;
+  height: 100%;
+}
 </style>

--
Gitblit v1.9.3