diff --git a/src/api/platform/label.js b/src/api/platform/label.js
index 3a84f1c..74c3d74 100644
--- a/src/api/platform/label.js
+++ b/src/api/platform/label.js
@@ -4,7 +4,7 @@ export function list(moduleId) {
return request({
url: `aerocraftAdminApi/cpLabel/all`,
method: 'get',
- parems: { moduleId }
+ params: { moduleId }
})
}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index a34007e..c7e69f0 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -30,11 +30,11 @@ export function tree() {
})
}
-export function allAreas(parems) {
+export function allAreas(params) {
return request({
url: 'aerocraftAdminApi/emArea/all',
method: 'get',
- parems
+ params
})
}
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index a5aa7b3..f20e725 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -62,7 +62,7 @@ export default {
async customUpload(file, insertFn) { // JS 语法
upload(_this.imagesUploadApi, file).then(res => {
const data = res.data
- const url = _this.baseApi + '/file/图片/' + data.newFileName
+ const url = data.fileFullPath
// 最后插入图片
insertFn(url, '', '')
})
@@ -73,9 +73,9 @@ export default {
allowedFileTypes: ['video/*'],
// 自定义上传
async customUpload(file, insertFn) { // JS 语法
- upload(_this.fileUploadApi, file).then(res => {
+ upload(_this.imagesUploadApi, file).then(res => {
const data = res.data
- const url = _this.baseApi + '/file/视频/' + data.newFileName
+ const url = data.fileFullPath
// 最后插入视频
insertFn(url, '', '')
})
@@ -91,8 +91,6 @@ export default {
computed: {
...mapGetters([
'imagesUploadApi',
- 'fileUploadApi',
- 'baseApi'
])
},
watch: {
diff --git a/src/views/platform/article/add.vue b/src/views/platform/article/add.vue
index e1a6526..8726b2a 100644
--- a/src/views/platform/article/add.vue
+++ b/src/views/platform/article/add.vue
@@ -145,7 +145,6 @@ export default {
computed: {
...mapGetters([
'imagesUploadApi',
- 'baseApi'
])
},
created(){
@@ -162,11 +161,12 @@ export default {
try {
this.loading = true;
upload(this.imagesUploadApi, uploadFile.raw).then(res => {
+ console.log(res);
+
if(res.status === 200){
- const data = res.data;
- const url = '/file/图片/' + data.newFileName;
+ const url = res.data.fileFullPath;
this.form.photo = url;
- this.form.fileArray = [{url:this.baseApi+url}];
+ this.form.fileArray = [{url:url}];
this.coverHide = true;
}else{
this.$message.error('图片上传失败!');
@@ -230,7 +230,7 @@ export default {
if(res.photo) {
this.coverHide = true;
this.form.photo = res.photo;
- this.form.fileArray = [{url: this.baseApi+this.form.photo}]
+ this.form.fileArray = [{url: this.form.photo}]
}
}else{
this.$message.error('文章获取失败!');
diff --git a/src/views/platform/article/detail.vue b/src/views/platform/article/detail.vue
index 303bef6..0ae0c91 100644
--- a/src/views/platform/article/detail.vue
+++ b/src/views/platform/article/detail.vue
@@ -7,9 +7,9 @@
@@ -90,11 +90,6 @@ export default {
loading: false,
}
},
- computed: {
- ...mapGetters([
- 'baseApi'
- ])
- },
created(){
const { id } = this.$route.query;
if(id) {
diff --git a/src/views/platform/article/index.vue b/src/views/platform/article/index.vue
index e43f82f..1547ddf 100644
--- a/src/views/platform/article/index.vue
+++ b/src/views/platform/article/index.vue
@@ -8,7 +8,7 @@
style="width: 200px" @change="getLabels" filterable>
-
@@ -114,13 +114,12 @@ export default {
},
// 根据模块id查询标签
getLabels(){
+ this.labels = [];
+ delete this.query.cplabelId;
if(this.query.moduleId){
list(this.query.moduleId).then(res => {
this.labels = res;
});
- }else{
- this.labels = [];
- this.query.cplabelId = '';
}
},
// 文章详情
diff --git a/src/views/platform/material/index.vue b/src/views/platform/material/index.vue
index b37dd10..1d6d456 100644
--- a/src/views/platform/material/index.vue
+++ b/src/views/platform/material/index.vue
@@ -95,8 +95,8 @@
-
-
+
+
{
+ upload(this.imagesUploadApi, file.raw).then(res => {
if(res.status === 200){
const data = res.data;
- const url = `/file/${isTypeImage?'图片':'视频'}/` + data.newFileName;
+ const url = data.fileFullPath;
this.form.path = url;
this.loading = false;
}else{
@@ -232,7 +230,7 @@ export default {
},
[CRUD.HOOK.beforeToEdit](crud, form){
this.uploadDisabled = true;
- form.files = [{url:this.baseApi+form.path}]
+ form.files = [{url:form.path}]
console.log('beforeToEdit',crud,form);
},