From 5325281fb41efc312be3443400f983e62f0e2427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Tue, 6 May 2025 11:36:14 +0800
Subject: [PATCH] update

---
 .hbuilderx/launch.json                |  4 +++
 src/pages/addPaymentAccount/index.vue |  7 +++++
 src/pages/taskDetails/index.vue       | 45 ++++++++++++++++++++-------
 src/pages/user/index.vue              |  8 +++++
 src/pages/userInfo/index.vue          |  9 ++++++
 src/utils/uils.js                     | 33 +++++++++++++++++---
 vite.config.js                        |  7 +++++
 7 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 15db785..e5a582a 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -4,6 +4,10 @@
         {
             "playground" : "standard",
             "type" : "uni-app:app-ios"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
         }
     ]
 }
diff --git a/src/pages/addPaymentAccount/index.vue b/src/pages/addPaymentAccount/index.vue
index 1329ffe..53415c4 100644
--- a/src/pages/addPaymentAccount/index.vue
+++ b/src/pages/addPaymentAccount/index.vue
@@ -3,8 +3,15 @@ import {defineAsyncComponent, ref} from "vue";
 import XNav from "../../components/XNav.vue";
 import XNoticeBar from "../../components/XNoticeBar.vue";
 
+// #ifdef APP-PLUS
+import AliPay from "./components/AliPay.vue";
+import BankPay from "./components/BankPay.vue";
+// #endif
+
+// #ifndef APP-PLUS
 const AliPay = defineAsyncComponent(() => import('./components/AliPay.vue'));
 const BankPay = defineAsyncComponent(() => import('./components/BankPay.vue'));
+// #endif
 
 const currentTab = ref(0);
 const tabs = [
diff --git a/src/pages/taskDetails/index.vue b/src/pages/taskDetails/index.vue
index d6cddab..ba5f6be 100644
--- a/src/pages/taskDetails/index.vue
+++ b/src/pages/taskDetails/index.vue
@@ -1,40 +1,63 @@
 <script setup>
 import goodsIcon from '../../static/icons/goodsIcon.png';
 import XNav from "../../components/XNav.vue";
-import {ref, onMounted, defineAsyncComponent} from 'vue';
+import {defineAsyncComponent, getCurrentInstance, nextTick, onMounted, reactive, ref} from 'vue';
 import {onLoad} from "@dcloudio/uni-app";
 import XLink from "../../components/XLink.vue";
 import XNoticeBar from "../../components/XNoticeBar.vue";
 import XImage from "../../components/XImage.vue";
 import fmt from "../../static/images/fmt.png";
+// #ifdef APP-PLUS
+import TaskDetails from "./components/TaskDetails.vue";
+import CollectMaterials from "./components/CollectMaterials.vue";
+import MyBackfill from "./components/MyBackfill.vue";
+import ReviewCommunication from "./components/ReviewCommunication.vue";
+// #endif
+
+// #ifndef APP-PLUS
+const TaskDetails = defineAsyncComponent(() => import('./components/TaskDetails.vue'));
+const CollectMaterials = defineAsyncComponent(() => import('./components/CollectMaterials.vue'));
+const MyBackfill = defineAsyncComponent(() => import('./components/MyBackfill.vue'));
+const ReviewCommunication = defineAsyncComponent(() => import('./components/ReviewCommunication.vue'));
+// #endif
 
 const details = ref(null);
-const mainDetailsRef = ref();
+const mainDetailWidth = ref(0);
 const currentTabs = ref(0);
-const tabs = [
+const tabs = reactive([
     {
         name: "任务详情",
-        component: defineAsyncComponent(() => import('./components/TaskDetails.vue')),
+        component: TaskDetails,
     },
     {
         name: "领取素材",
-        component: defineAsyncComponent(() => import('./components/CollectMaterials.vue')),
+        component: CollectMaterials,
     },
     {
         name: "我的回填",
-        component: defineAsyncComponent(() => import('./components/MyBackfill.vue')),
+        component: MyBackfill,
     },
     {
         name: "审核沟通",
-        component: defineAsyncComponent(() => import('./components/ReviewCommunication.vue')),
+        component: ReviewCommunication,
     },
-];
+]);
 
 onLoad((options) => {
     const {id} = options;
 });
 
 onMounted(() => {
+    nextTick(() => {
+        const instancs = getCurrentInstance();
+        uni.createSelectorQuery()
+            .in(instancs)
+            .select("#mainDetailBox")
+            .boundingClientRect()
+            .exec((result) => {
+                mainDetailWidth.value = result[0].width;
+            })
+    });
 })
 </script>
 
@@ -84,12 +107,12 @@ onMounted(() => {
             </view>
         </view>
 
-        <view ref="mainDetailsRef" class="rounded-[16rpx] bg-[#fff] main-details overflow-hidden">
+        <view id="mainDetailBox" class="rounded-[16rpx] bg-[#fff] main-details overflow-hidden">
             <tui-tabs
-                v-if="mainDetailsRef?.$el?.clientWidth"
+                v-if="mainDetailWidth"
                 :tabs="tabs"
                 :currentTab="currentTabs"
-                :width="mainDetailsRef?.$el?.clientWidth"
+                :width="mainDetailWidth"
                 @change="({index})=>currentTabs=index">
             </tui-tabs>
 
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index edce0f1..0088cf7 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -13,9 +13,17 @@ import XNav from "../../components/XNav.vue";
 import CreditScore from "../../components/CreditScore.vue";
 import {toPage} from "../../utils/uils.js";
 
+// #ifdef APP-PLUS
+import MyTeam from "./components/MyTeam.vue";
+import Inviter from "./components/Inviter.vue";
+import AccompanyingMentor from "./components/AccompanyingMentor.vue";
+// #endif
+
+// #ifndef APP-PLUS
 const MyTeam = defineAsyncComponent(() => import('./components/MyTeam.vue'));
 const Inviter = defineAsyncComponent(() => import('./components/Inviter.vue'));
 const AccompanyingMentor = defineAsyncComponent(() => import('./components/AccompanyingMentor.vue'));
+// #endif
 
 const tabCur = ref('MyTeam');
 const tabs = [
diff --git a/src/pages/userInfo/index.vue b/src/pages/userInfo/index.vue
index 0d24596..05fabf8 100644
--- a/src/pages/userInfo/index.vue
+++ b/src/pages/userInfo/index.vue
@@ -4,9 +4,18 @@ import Right from "../../static/icons/right.png";
 import Avatar from "../../static/images/Avatar.png";
 import XNav from "../../components/XNav.vue";
 
+// #ifdef APP-PLUS
+import EditWxCode from './components/EditWxCode.vue';
+import EditPhone from './components/EditPhone.vue';
+import EditPassWord from './components/EditPassWord.vue';
+// #endif
+
+// #ifndef APP-PLUS
 const EditWxCode = defineAsyncComponent(() => import('./components/EditWxCode.vue'));
 const EditPhone = defineAsyncComponent(() => import('./components/EditPhone.vue'));
 const EditPassWord = defineAsyncComponent(() => import('./components/EditPassWord.vue'));
+// #endif
+
 
 const showTool = ref(false);
 const tool = ref('EditWxCode');
diff --git a/src/utils/uils.js b/src/utils/uils.js
index 437bc96..3fa86dd 100644
--- a/src/utils/uils.js
+++ b/src/utils/uils.js
@@ -45,16 +45,39 @@ export const copy = (context) => {
 }
 
 export const download = (urls) => {
-    const promises = urls.map((url, index) => new Promise((resolve, reject) => {
+    // #ifndef APP-PLUS
+    const promises1 = urls.map(url => new Promise((resolve, reject) => {
         const iframe = document.createElement('iframe');
         iframe.src = url;
         iframe.style.display = 'none';
         document.body.appendChild(iframe);
         resolve(true);
     }));
-    Promise.all(promises).then(res => {
-        console.log(res);
-    }).catch(err => {
-        console.log(err);
+    Promise.all(promises1).then(() => {
+        showToast('保存成功');
+    }).catch(() => {
+        showToast('保存失败');
     });
+    // #endif
+
+    // #ifdef APP-PLUS
+    const promises2 = urls.map(v => new Promise((resolve, reject) => {
+        urls.forEach(v => {
+            uni.downloadFile({
+                url: v,
+                success: () => {
+                    resolve(true);
+                },
+                fail: () => {
+                    reject(false);
+                }
+            })
+        })
+    }));
+    Promise.all(promises2).then(() => {
+        showToast('保存成功');
+    }).catch(() => {
+        showToast('保存失败');
+    });
+    // #endif
 }
diff --git a/vite.config.js b/vite.config.js
index 0917122..e1a0c3c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,4 +7,11 @@ export default defineConfig({
         uni.default(),
         tailwindcss(),
     ],
+    css: {
+        preprocessorOptions: {
+            scss: {
+                silenceDeprecations: ['legacy-js-api'],
+            }
+        }
+    },
 })