From d2d8f6e14a01e10a1278cea20388c7f3f3a5ff87 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 18 Mar 2022 17:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- src/api/material/material.js | 6 + src/views/components/upload_img.vue | 105 ++++++++++ src/views/components/upload_img2.vue | 161 +++++++++++++++ src/views/components/upload_img3.vue | 187 ++++++++++++++++++ .../materialContent/materialList/index.vue | 22 ++- 6 files changed, 478 insertions(+), 11 deletions(-) create mode 100644 src/views/components/upload_img.vue create mode 100644 src/views/components/upload_img2.vue create mode 100644 src/views/components/upload_img3.vue diff --git a/.env.development b/.env.development index 3ce420b..9f272b0 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,16 @@ ENV = 'development' # 本地接口地址 -VUE_APP_BASE_API = '/dev-api' +#VUE_APP_BASE_API = '/dev-api' + +# 刘力本地服 #VUE_APP_BASE_API = 'http://192.168.99.103:7000' #VUE_APP_WS_API = 'ws://192.168.99.103:7000' +# 许镇本地服 +VUE_APP_BASE_API = 'http://192.168.99.84:7000' +VUE_APP_WS_API = 'ws://http://192.168.99.84:7000' + #VUE_APP_BASE_API = 'http://192.168.99.207:7000' #VUE_APP_WS_API = 'ws://192.168.99.207:7000' diff --git a/src/api/material/material.js b/src/api/material/material.js index e8787ad..70a0ea3 100644 --- a/src/api/material/material.js +++ b/src/api/material/material.js @@ -7,3 +7,9 @@ export function getMaterialList(parameter) { data: parameter }) } +export function getQiniuToken() { + return request({ + url: 'api/qiniu/uploadTokenCover', + method: 'get' + }) +} diff --git a/src/views/components/upload_img.vue b/src/views/components/upload_img.vue new file mode 100644 index 0000000..eada5a7 --- /dev/null +++ b/src/views/components/upload_img.vue @@ -0,0 +1,105 @@ + + + diff --git a/src/views/components/upload_img2.vue b/src/views/components/upload_img2.vue new file mode 100644 index 0000000..5b346eb --- /dev/null +++ b/src/views/components/upload_img2.vue @@ -0,0 +1,161 @@ + + + + diff --git a/src/views/components/upload_img3.vue b/src/views/components/upload_img3.vue new file mode 100644 index 0000000..f6ef1e3 --- /dev/null +++ b/src/views/components/upload_img3.vue @@ -0,0 +1,187 @@ + + + + + + diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue index 7f52a14..dae89b7 100644 --- a/src/views/materialContent/materialList/index.vue +++ b/src/views/materialContent/materialList/index.vue @@ -3,13 +3,14 @@
上传 - - + + 创建文件夹
@@ -27,10 +28,10 @@ :class="['material_item', 'item_cont', { 'item_multi': contentIds.includes(item.id) }]" > -
+
{{ item.material_type }} - 03:00 + 03:00
{{ item.material_name }}
@@ -84,9 +85,9 @@ height="384px" > - - - + + +
import { getMaterialList } from '@/api/material/material' +import Upload from '../../components/upload_img' export default { name: 'MaterialList', - components: {}, + components: { Upload }, props: { isMultiSelected: { type: Boolean,