diff --git a/linkwe-ui/.npmrc b/linkwe-ui/.npmrc new file mode 100644 index 0000000000000000000000000000000000000000..21ac9cc1058011bee15d135886e2db9db483957a --- /dev/null +++ b/linkwe-ui/.npmrc @@ -0,0 +1,2 @@ +tag-version-prefix="" +registry=https://registry.npm.taobao.org \ No newline at end of file diff --git a/linkwe-ui/package.json b/linkwe-ui/package.json index 60cf0b4bb0e2cb47e5dcd0921e06e97433721b33..5ccc65a597005eefe2f30dacc4e8710e6e24ea28 100644 --- a/linkwe-ui/package.json +++ b/linkwe-ui/package.json @@ -42,6 +42,8 @@ "axios": "0.18.1", "clipboard": "2.0.4", "core-js": "3.6.5", + "fabric": "^3.5.1", + "tui-image-editor": "^3.7.1", "echarts": "4.2.1", "element-ui": "2.13.2", "file-saver": "2.0.1", diff --git a/linkwe-ui/src/assets/poster/icon-a.svg b/linkwe-ui/src/assets/poster/icon-a.svg new file mode 100644 index 0000000000000000000000000000000000000000..7e1efb817ce05f248f7e0700a423a5186bb0479d --- /dev/null +++ b/linkwe-ui/src/assets/poster/icon-a.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/linkwe-ui/src/assets/poster/icon-b.svg b/linkwe-ui/src/assets/poster/icon-b.svg new file mode 100644 index 0000000000000000000000000000000000000000..c1ea6256a031597ff609f27e83119549098299fe --- /dev/null +++ b/linkwe-ui/src/assets/poster/icon-b.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/linkwe-ui/src/assets/poster/icon-c.svg b/linkwe-ui/src/assets/poster/icon-c.svg new file mode 100644 index 0000000000000000000000000000000000000000..8074cf08d2a6bc4fa55b65107ebe7777ded1c8a7 --- /dev/null +++ b/linkwe-ui/src/assets/poster/icon-c.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/linkwe-ui/src/assets/poster/icon-d.svg b/linkwe-ui/src/assets/poster/icon-d.svg new file mode 100644 index 0000000000000000000000000000000000000000..52e6ffa30588c3352bdf6d3254824095c0dd3750 --- /dev/null +++ b/linkwe-ui/src/assets/poster/icon-d.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/linkwe-ui/src/assets/poster/img/Thumbs.db b/linkwe-ui/src/assets/poster/img/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..e069ad4caaa78343129130ba09afd0eda6d7c28d Binary files /dev/null and b/linkwe-ui/src/assets/poster/img/Thumbs.db differ diff --git a/linkwe-ui/src/assets/poster/img/bg.png b/linkwe-ui/src/assets/poster/img/bg.png new file mode 100644 index 0000000000000000000000000000000000000000..55e234d40f21b09a44e5a74d3a1322f1f79fd0fa Binary files /dev/null and b/linkwe-ui/src/assets/poster/img/bg.png differ diff --git a/linkwe-ui/src/views/material/components/MaPage.vue b/linkwe-ui/src/views/material/components/MaPage.vue index ac6083f993a2507793e17270b1bb4a095ae17004..0b071e7669dadf6e86682b37fa329f486ff223cc 100644 --- a/linkwe-ui/src/views/material/components/MaPage.vue +++ b/linkwe-ui/src/views/material/components/MaPage.vue @@ -103,6 +103,7 @@ export default { }, // 获取素材列表 getList(page) { + console.log('getList', page, JSON.stringify(this.query)) page && (this.query.pageNum = page) this.loading = true getList(this.query) @@ -161,14 +162,22 @@ export default { }, // 素材添加/编辑 edit(data, type) { - this.form = Object.assign( - {}, - data || { categoryId: this.query.categoryId } - ) - this.dialogVisible = true - this.$nextTick(() => { - this.$refs['form'].clearValidate() - }) + switch (type) { + case 5: + this.$parent.posterEdit.step = 0 + this.$parent.dialog.edit = true + break + default: + this.form = Object.assign( + {}, + data || { categoryId: this.query.categoryId } + ) + this.dialogVisible = true + this.$nextTick(() => { + this.$refs['form'].clearValidate() + }) + break; + } // type || !data ? (this.disabled = false) : (this.disabled = true) }, // 素材提交 @@ -323,7 +332,7 @@ export default { 添加{{ typeTitle[type] }} diff --git a/linkwe-ui/src/views/material/components/PosterPage.vue b/linkwe-ui/src/views/material/components/PosterPage.vue new file mode 100644 index 0000000000000000000000000000000000000000..6648367071078de89056cffd868f63136bf960c6 --- /dev/null +++ b/linkwe-ui/src/views/material/components/PosterPage.vue @@ -0,0 +1,119 @@ + + diff --git a/linkwe-ui/src/views/material/poster.vue b/linkwe-ui/src/views/material/poster.vue index 44462bca200db53ed5861057b78087d1e24d9822..0babb0e9d863f80c3e44c761e726d8bdd06d42ab 100644 --- a/linkwe-ui/src/views/material/poster.vue +++ b/linkwe-ui/src/views/material/poster.vue @@ -1,10 +1,25 @@