diff --git a/components/form/FileUpload.vue b/components/form/FileUpload.vue index ea0a770..c0b5654 100644 --- a/components/form/FileUpload.vue +++ b/components/form/FileUpload.vue @@ -13,9 +13,10 @@ - + {{file.name}} + 预览 {{ file.progress }}% @@ -28,12 +29,15 @@ + + \ No newline at end of file diff --git a/components/headers/headers.vue b/components/headers/headers.vue index 2710cb9..e095f32 100644 --- a/components/headers/headers.vue +++ b/components/headers/headers.vue @@ -39,17 +39,25 @@ }, methods:{ goBackFn(){ - // uni.navigateBack({ - // success: function() { - // // console.log('getCurrentPages()',getCurrentPages()) - // // let page = getCurrentPages()[0]; //跳转页面成功之后 - // // if(page.route=='pages/projectManage/projectManage'){ - - // // } - // // if (!page) return; - // // page.onLoad(); //如果页面存在,则重新刷新页面 - // } - // }) + let pages = getCurrentPages(); + // let prevPage = pages[pages.length - 2] + console.log('prevPage', pages) + if(pages.length > 1) { + uni.navigateBack({ + success: function() { + // console.log('getCurrentPages()',getCurrentPages()) + // let page = getCurrentPages()[0]; //跳转页面成功之后 + // if(page.route=='pages/projectManage/projectManage'){ + + // } + // if (!page) return; + // page.onLoad(); //如果页面存在,则重新刷新页面 + } + }); + return + } + + // uni.redirectTo({ // url: `/pages/workspace/workspace?current=${11}` // }); diff --git a/components/previewIframe.vue b/components/previewIframe.vue new file mode 100644 index 0000000..8c3adde --- /dev/null +++ b/components/previewIframe.vue @@ -0,0 +1,37 @@ + + + + diff --git a/main.js b/main.js index a9610f1..4b46fbc 100644 --- a/main.js +++ b/main.js @@ -4,6 +4,8 @@ import { createSSRApp } from 'vue' import "/utils/webview.js" //把表单字段组件注册到全局,解决跨平台兼容的容器组件循环引用问题 import WFormItem from '@/components/WFormItem.vue' +import PreviewIframe from '@/components/previewIframe.vue' + import { Popup, Icon, Badge, Pagination } from 'vant'; // import VueQuillEditor from "vue-quill-editor"; // import "quill/dist/quill.core.css"; // import styles @@ -13,6 +15,7 @@ import { Popup, Icon, Badge, Pagination } from 'vant'; export function createApp() { const app = createSSRApp(App) app.component('WFormItem', WFormItem); + app.component('PreviewIframe', PreviewIframe); // app.use(VueQuillEditor); app.use(Popup); app.use(Icon); diff --git a/package-lock.json b/package-lock.json index d421e79..ae811ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@wangeditor/editor-for-vue": "^5.1.12", "clipboard": "^2.0.11", "dayjs": "^1.11.10", + "js-base64": "^3.7.7", "vant": "^4.9.7", "vue-quill-editor": "^3.0.6" }, @@ -935,6 +936,11 @@ "resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz", "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" }, + "node_modules/js-base64": { + "version": "3.7.7", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.7.tgz", + "integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==" + }, "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", diff --git a/package.json b/package.json index 2e9ca30..c9b15b6 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "@wangeditor/editor-for-vue": "^5.1.12", "clipboard": "^2.0.11", "dayjs": "^1.11.10", + "js-base64": "^3.7.7", "vant": "^4.9.7", "vue-quill-editor": "^3.0.6" }, diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json index f848137..5b0e33f 100644 --- a/unpackage/dist/cache/.vite/deps/_metadata.json +++ b/unpackage/dist/cache/.vite/deps/_metadata.json @@ -1,43 +1,49 @@ { - "hash": "d2335b50", + "hash": "3be55fd6", "configHash": "b0659917", - "lockfileHash": "bd53ab4e", - "browserHash": "b117f9d5", + "lockfileHash": "f5a3c466", + "browserHash": "3f2387fa", "optimized": { "@wangeditor/editor": { "src": "../../../../../node_modules/@wangeditor/editor/dist/index.esm.js", "file": "@wangeditor_editor.js", - "fileHash": "0c59de0e", + "fileHash": "6670cc30", "needsInterop": false }, "@wangeditor/editor-for-vue": { "src": "../../../../../node_modules/@wangeditor/editor-for-vue/dist/index.esm.js", "file": "@wangeditor_editor-for-vue.js", - "fileHash": "b0be2a76", + "fileHash": "7f835cda", "needsInterop": false }, "dayjs": { "src": "../../../../../node_modules/dayjs/dayjs.min.js", "file": "dayjs.js", - "fileHash": "3f5a6ccc", + "fileHash": "d66d7f1d", "needsInterop": true }, "vant": { "src": "../../../../../node_modules/vant/es/index.mjs", "file": "vant.js", - "fileHash": "448d5b42", + "fileHash": "0c7c7cc2", "needsInterop": false }, "vue-quill-editor": { "src": "../../../../../node_modules/vue-quill-editor/dist/vue-quill-editor.js", "file": "vue-quill-editor.js", - "fileHash": "fb242545", + "fileHash": "638ada97", "needsInterop": true }, "@icon-park/vue-next": { "src": "../../../../../node_modules/@icon-park/vue-next/es/index.js", "file": "@icon-park_vue-next.js", - "fileHash": "f1f87ffe", + "fileHash": "9fa7c593", + "needsInterop": false + }, + "js-base64": { + "src": "../../../../../node_modules/js-base64/base64.mjs", + "file": "js-base64.js", + "fileHash": "af862ef2", "needsInterop": false } },