diff --git a/src/api/system/area.js b/src/api/system/area.js index 90df8be..b634d4c 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -23,4 +23,11 @@ export function edit(data) { }) } -export default { add, edit, del } +export function tree() { + return request({ + url: 'aerocraftAdminApi/emArea/areaTree', + method: 'get', + }) +} + +export default { tree, add, edit, del } diff --git a/src/api/system/customer.js b/src/api/system/customer.js index e05bfaa..9bd561d 100644 --- a/src/api/system/customer.js +++ b/src/api/system/customer.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function add(data) { return request({ - url: 'api/cnCustomer', + url: 'aerocraftAdminApi/cnCustomer', method: 'post', data }) @@ -10,17 +10,26 @@ export function add(data) { export function del(id) { return request({ - url: `api/cnCustomer/${id}`, + url: `aerocraftAdminApi/cnCustomer/${id}`, method: 'delete', }) } + export function enable(data) { return request({ - url: 'api/cnCustomer', + url: 'aerocraftAdminApi/cnCustomer', method: 'put', data }) } -export default { add, enable, del } +export function edit(data) { + return request({ + url: 'aerocraftAdminApi/cnCustomer', + method: 'put', + data + }) +} + +export default { add, enable, del, edit } diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue index 221a4ef..5c2db1f 100644 --- a/src/components/Crud/UD.operation.vue +++ b/src/components/Crud/UD.operation.vue @@ -1,13 +1,19 @@ @@ -35,7 +41,19 @@ export default { msg: { type: String, default: '确定删除本条数据吗?' - } + }, + showPop: { + type: Array, + default: () => { return ['edit','del'] } + }, + delText: { + type: String, + default: '' + }, + editText: { + type: String, + default: '' + }, }, data() { return { diff --git a/src/views/platform/article/add.vue b/src/views/platform/article/add.vue index a5037c7..972a6f4 100644 --- a/src/views/platform/article/add.vue +++ b/src/views/platform/article/add.vue @@ -26,16 +26,16 @@ - - - + + + - - - + + + @@ -83,7 +83,7 @@ import WangEditor from '@/components/WangEditor/index' import { add, edit } from '@/api/platform/article' import { all } from '@/api/platform/module' -import { tree } from '@/api/platform/label' +import { list } from '@/api/platform/label' import { upload } from '@/utils/upload' import { mapGetters } from 'vuex' import { single } from '@/api/platform/article' @@ -112,14 +112,14 @@ export default { loading: false, isAdd: this.$route.path==='/platform/article/add', form:{ - labelName: '', - moduleName: '', + labelId: '', + moduleId: '', title: '', articleType: '', photo: '', text: '', top: false,// 是否置顶,这里提交的时候要换成0或1 - cplabelId: '', + labelId: '', fileArray:[]// 编辑进来时,如果已经上传了图片,则保存图片地址 }, // 模块列表 @@ -127,8 +127,8 @@ export default { // 标签列表 labelList: [], rules:{ - moduleName: { required: true, message: '请选择模块', trigger: 'change' }, - labelName: { required: true, message: '请输入标签名称', trigger: 'blur' }, + moduleId: { required: true, message: '请选择模块', trigger: 'change' }, + labelId: { required: true, message: '请输入标签名称', trigger: 'blur' }, title: { required: true, message: '请输入标题', trigger: 'blur' }, articleType: { required: true, message: '请选择文章类型', trigger: 'change' }, top: { required: true, message: '请选择是否置顶', trigger: 'blur' }, @@ -166,7 +166,7 @@ export default { const data = res.data; const url = '/file/图片/' + data.newFileName; this.form.photo = url; - this.form.fileArray = [this.baseApi+url]; + this.form.fileArray = [{url:this.baseApi+url}]; this.coverHide = true; }else{ this.$message.error('图片上传失败!'); @@ -204,16 +204,16 @@ export default { }, // 根据模块id查询标签 getLabels(val){ - this.form.labelName = ''; - if(!val){this.labelList=[]; this.form.cplabelId = '';return;} + this.form.labelId = ''; + if(!val){this.labelList=[]; this.form.labelId = '';return;} const op = event.currentTarget; - tree(op.dataset.op).then(res => { + list(op.dataset.op).then(res => { this.labelList = res; }); }, // 标签选择 handleChangeLabel(val){ - this.form.cplabelId = val ? event.currentTarget.dataset.op : ''; + this.form.labelId = val ? event.currentTarget.dataset.op : ''; }, // 获取文章详情-根据id getArticleDetailById(id){ @@ -223,6 +223,10 @@ export default { if(res){ res.top = res.top ? true : false; this.form = res; + this.form.labelId = res.cplabelId; + list(res.moduleId).then(resp => { + this.labelList = resp; + }); if(res.photo) { this.coverHide = true; this.form.photo = res.photo; @@ -254,6 +258,8 @@ export default { delete articleForm.fileArray; const ft = this.isAdd? add : edit; ft(articleForm).then(res => { + console.log(res); + this.$message.success(`文章${this.isAdd?'添加':'编辑'}成功!`); this.cancel(); }) diff --git a/src/views/platform/article/detail.vue b/src/views/platform/article/detail.vue index a4c7d1b..303bef6 100644 --- a/src/views/platform/article/detail.vue +++ b/src/views/platform/article/detail.vue @@ -41,7 +41,7 @@ - {{ data.view || 0 }} + {{ data.viewCount || 0 }} @@ -85,7 +85,7 @@ export default { photo: '', text: '', top: '', - view: '', + viewCount: '', }, loading: false, } diff --git a/src/views/platform/article/index.vue b/src/views/platform/article/index.vue index 16e3957..1efa50e 100644 --- a/src/views/platform/article/index.vue +++ b/src/views/platform/article/index.vue @@ -12,7 +12,7 @@ style="width: 200px"> - - + @@ -33,14 +33,14 @@ - - + + - +