From e3e6a984ee20e3a77852442b68ddb1d887e2e769 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 26 Dec 2025 18:05:34 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into prod
---
src/subPackages/taskDetail/addTask/index.vue | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/subPackages/taskDetail/addTask/index.vue b/src/subPackages/taskDetail/addTask/index.vue
index 1b63118..f175785 100644
--- a/src/subPackages/taskDetail/addTask/index.vue
+++ b/src/subPackages/taskDetail/addTask/index.vue
@@ -1,27 +1,38 @@
<!-- 新建任务 -->
<template>
- <WebViewPlus v-if="isApp" :src="`${viewUrl}`" @webMessage="onPostMessage"/>
+ <WebViewPlus v-if="isApp" :src="`${viewUrl}`" @webMessage="onPostMessage" />
</template>
<script setup>
import WebViewPlus from "@/components/WebViewPlus.vue";
-import {getWebViewUrl} from "@/utils/index.js";
-import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
+import { getWebViewUrl } from "@/utils/index.js";
+import { onHide, onLoad, onShow } from "@dcloudio/uni-app";
// const viewUrl = ref(getWebViewUrl('/addTask'))
const sWebViewRef = ref(null);
-const viewUrl = ref('')
+const viewUrl = ref("");
function onPostMessage(data) {
- if (data.type === 'submitSuccess'){
- uni.setStorageSync('joinParams', {
- type: 'add'
+ if (data.type === "submitSuccess") {
+ // #ifdef MP-WEIXIN
+ if ("fun" in data && data.fun === "add") {
+ uni.setStorageSync("joinParams", {
+ type: "add",
+ });
+ }
+ // #endif
+
+ // #ifndef MP-WEIXIN
+ uni.setStorageSync("joinParams", {
+ type: "add",
});
// console.log('打印新增成功')
uni.switchTab({
- url: '/pages/inspectionTask/index'
+ url: "/pages/inspectionTask/index",
});
+ // #endif
+
// uni.redirectTo({
// url: `/pages/inspectionTask/index?addLog=1111`
// });
@@ -33,28 +44,41 @@
// const sns = options.device_sn
//
// });
+const isApp = ref(false);
-const isApp = ref(false)
-onShow(() => {
- isApp.value = true
- let params = {}
- const encodedData = uni.getStorageSync('webview_params')
- params = JSON.parse(decodeURIComponent(encodedData))
- viewUrl.value = getWebViewUrl('/addTask', params)
- uni.setTabBarItem({
- index: 3, // Tab
- visible: false,
- });
- uni.setTabBarItem({
- index: 2, // Tab 的索引（从0开始）
- // text: '新建任务',
- visible: true,
- "pagePath": "subPackages/taskDetail/addTask/index"
- });
+// #ifdef MP-WEIXIN
+onLoad((options) => {
+ isApp.value = true;
+ let params = {};
+ if ("data" in options) {
+ try {
+ params = JSON.parse(options.data);
+ } catch (e) {
+ console.error(e);
+ }
+ }
+ viewUrl.value = getWebViewUrl("/addTask", params);
});
+// #endif
+
+// #ifndef MP-WEIXIN
+onShow(() => {
+ isApp.value = true;
+ let params = {};
+ const encodedData = uni.getStorageSync("webview_params");
+ if (encodedData) {
+ try {
+ params = JSON.parse(decodeURIComponent(encodedData));
+ } catch (e) {
+ console.error(e);
+ }
+ }
+ viewUrl.value = getWebViewUrl("/addTask", params);
+});
+// #endif
onHide(() => {
- isApp.value = false
+ isApp.value = false;
});
</script>
--
Gitblit v1.9.3