diff --git a/public/images/guide.png b/public/images/guide.png
new file mode 100644
index 000000000..6de7ef2e3
Binary files /dev/null and b/public/images/guide.png differ
diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 54001ff3c..3e37e0f90 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -21,6 +21,9 @@
+
+
+
@@ -38,12 +41,13 @@ import FloatSpinner from "./components/FloatSpinner";
import RightBottom from "./components/RightBottom";
import PreviewImageState from "./components/PreviewImage/state";
import NetworkException from "./components/NetworkException";
+import GuidePage from "./components/GuidePage";
import TaskOperation from "./pages/manage/components/TaskOperation";
import {mapState} from "vuex";
import {languageType} from "./language";
export default {
- components: {TaskOperation, NetworkException, PreviewImageState, RightBottom, FloatSpinner},
+ components: {TaskOperation, NetworkException, PreviewImageState, RightBottom, FloatSpinner, GuidePage},
data() {
return {
@@ -387,6 +391,10 @@ export default {
window.__onNotificationPermissionStatus = (ret) => {
this.$store.state.appNotificationPermission = $A.runNum(ret) == 1;
}
+ // 前往页面
+ window.__handleLink = (path) => {
+ this.goForward({ path: (path || '').indexOf('/') !==0 ? "/" + path : path });
+ }
},
otherEvents() {
diff --git a/resources/assets/js/components/GuidePage.vue b/resources/assets/js/components/GuidePage.vue
new file mode 100644
index 000000000..7d6557659
--- /dev/null
+++ b/resources/assets/js/components/GuidePage.vue
@@ -0,0 +1,41 @@
+
+
+
![]()
+
+
+
+
+
+
+
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index d484e34a0..f4e8920bf 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -1457,6 +1457,7 @@ export default {
},
/********************文件打包下载部分************************/
+
packPercentageParse(val) {
return parseInt(val, 10);
},
@@ -1479,13 +1480,12 @@ export default {
file.percentage = Math.max(1, pack.progress);
if (file.status != 'finished' && file.percentage >= 100) {
file.status = 'finished';
- // 下载文件
this.downloadPackFile(file.name);
}
})
},
- async downloadPackFile(filePackName) {
+ downloadPackFile(filePackName) {
const downloadUrl = $A.apiUrl(`file/download/confirm?name=${filePackName}&token=${this.userToken}`);
if (!$A.Electron && !$A.isEEUiApp) {
const link = document.createElement('a');
diff --git a/resources/assets/js/pages/manage/projectInvite.vue b/resources/assets/js/pages/manage/projectInvite.vue
index b033db782..d411ab248 100644
--- a/resources/assets/js/pages/manage/projectInvite.vue
+++ b/resources/assets/js/pages/manage/projectInvite.vue
@@ -60,6 +60,13 @@ export default {
'$route': {
handler(route) {
if(route.name == 'manage-project-invite'){
+ // 唤醒app
+ if (!$A.Electron && !$A.isEEUiApp && navigator.userAgent.indexOf("MicroMessenger") === -1){
+ if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
+ window.location.href = "dootask://" + route.fullPath
+ }
+ }
+ //
this.code = route.query ? route.query.code : '';
this.getData();
}
diff --git a/resources/assets/sass/components/_.scss b/resources/assets/sass/components/_.scss
index 3411a8296..d933698af 100644
--- a/resources/assets/sass/components/_.scss
+++ b/resources/assets/sass/components/_.scss
@@ -15,3 +15,5 @@
@import "report";
@import "resize-line";
@import "right-bottom";
+@import "guide-page";
+
diff --git a/resources/assets/sass/components/guide-page.scss b/resources/assets/sass/components/guide-page.scss
new file mode 100644
index 000000000..256fecaca
--- /dev/null
+++ b/resources/assets/sass/components/guide-page.scss
@@ -0,0 +1,14 @@
+.common-guide {
+ position: fixed;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ z-index: 999999;
+ background-color: #000000de;
+ padding: 5px 10px;
+
+ >div {
+ text-align: center;
+ }
+}
diff --git a/resources/assets/statics/public/images/guide.png b/resources/assets/statics/public/images/guide.png
new file mode 100644
index 000000000..6de7ef2e3
Binary files /dev/null and b/resources/assets/statics/public/images/guide.png differ