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 @@
@@ -84,12 +107,12 @@ onMounted(() => {
-
+
currentTabs=index">
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'],
+ }
+ }
+ },
})