diff --git a/src/pages/activity/activity_index.vue b/src/pages/activity/activity_index.vue index c2f8cf3..4050497 100644 --- a/src/pages/activity/activity_index.vue +++ b/src/pages/activity/activity_index.vue @@ -198,7 +198,7 @@ - +
@@ -532,6 +532,7 @@ export default { autoFocus: true, MENU_CONF: { uploadImage: { + maxFileSize: 50 * 1024 * 1024, server: store.state.user.apiUrl + '/api/common/upload', fieldName: 'file', metaWithUrl: false, @@ -545,6 +546,11 @@ export default { // 从 res 中找到 url alt href ,然后插入图片 insertFn(res.data.fullurl, '', '') }, + onError:(file, err, res)=>{ + if(err.message.indexOf('exceeds maximum allowed size') !== -1){ + this.$message.error('限制为50M,请调整好再上传!',2000); + } + }, } } }, @@ -977,6 +983,9 @@ export default { if (res.code == 1) { this.list = res.data.ret; this.pagination.total = res.data.count; + }else{ + this.list = []; + this.pagination.total =0; } }) diff --git a/src/pages/association/index.vue b/src/pages/association/index.vue index 7887b03..914e94e 100644 --- a/src/pages/association/index.vue +++ b/src/pages/association/index.vue @@ -151,6 +151,7 @@ export default { autoFocus: true, MENU_CONF: { uploadImage: { + maxFileSize: 50 * 1024 * 1024, server: store.state.user.apiUrl + '/api/common/upload', fieldName: 'file', meta:{ diff --git a/src/pages/business/index.vue b/src/pages/business/index.vue index 2a79fe3..82933c1 100644 --- a/src/pages/business/index.vue +++ b/src/pages/business/index.vue @@ -144,6 +144,7 @@ export default { autoFocus: true, MENU_CONF: { uploadImage: { + maxFileSize: 50 * 1024 * 1024, server: store.state.user.apiUrl + '/api/common/upload', fieldName: 'file', meta:{ diff --git a/src/pages/news/news_index.vue b/src/pages/news/news_index.vue index d4bb065..cc755e8 100644 --- a/src/pages/news/news_index.vue +++ b/src/pages/news/news_index.vue @@ -59,6 +59,9 @@ + + +
@@ -122,6 +125,7 @@ export default { news_image_show:[], showtime:'', news_hits:0, + wx_url:'', }, addMode: false, isEdit: false, @@ -161,6 +165,7 @@ export default { autoFocus: true, MENU_CONF: { uploadImage: { + maxFileSize: 50 * 1024 * 1024, server: store.state.user.apiUrl + '/api/common/upload', fieldName: 'file', meta:{ @@ -283,6 +288,7 @@ export default { news_image_show:[], showtime:'', news_hits:0, + wx_url:'', }; }, edit(d) { @@ -298,6 +304,7 @@ export default { this.addForm.news_content = d.news_content; this.addForm.showtime = d.showtime this.addForm.news_hits = d.news_hits; + this.addForm.wx_url=d.wx_url; this.addMode = true; this.isEdit = true; }, @@ -351,10 +358,10 @@ export default { this.$message.error('来源不能为空'); return; } - if (this.addForm.news_content == '') { - this.$message.error('详情不能为空'); - return; - } + // if (this.addForm.news_content == '') { + // this.$message.error('详情不能为空'); + // return; + // } if (this.addForm.news_image=='') { this.$message.error('新闻主图不能为空'); return; diff --git a/src/pages/news/news_type.vue b/src/pages/news/news_type.vue index 0f0c729..6ef0b49 100644 --- a/src/pages/news/news_type.vue +++ b/src/pages/news/news_type.vue @@ -47,6 +47,7 @@ export default { editID:0, list: [], columns: [ + {colKey: 'id', title: 'ID'}, {colKey: 'weigh', title: '排序'}, {colKey: 'name', title: '类目名称'}, {colKey: 'createtime', title: '添加时间'}, diff --git a/src/pages/news/wechat_index.vue b/src/pages/news/wechat_index.vue index 8848a29..e31c9b7 100644 --- a/src/pages/news/wechat_index.vue +++ b/src/pages/news/wechat_index.vue @@ -160,6 +160,7 @@ export default { autoFocus: true, MENU_CONF: { uploadImage: { + maxFileSize: 50 * 1024 * 1024, //server: store.state.user.apiUrl + '/api/wx_news/wxuploadimg', server:'/api/wx_news/wxuploadimg', fieldName: 'file', diff --git a/src/pages/pc/pc_news.vue b/src/pages/pc/pc_news.vue index 1450cbd..68000bd 100644 --- a/src/pages/pc/pc_news.vue +++ b/src/pages/pc/pc_news.vue @@ -3,13 +3,13 @@
- 新增 + 添加新闻 - + @@ -52,6 +52,10 @@ +
+ + +
@@ -143,6 +150,7 @@ export default { image_show:[], number_of_views:0, display_time:'', + wx_url:'', }, addMode: false, isEdit: false, @@ -155,6 +163,7 @@ export default { {colKey: 'number_of_views', title: '点击量', align: 'center'}, {colKey: 'article_source', title: '来源', align: 'center'}, {colKey: 'display_time', title: '展示时间', align: 'center'}, + // {colKey: 'top', title: '首页置顶', align: 'center'}, {colKey: 'select', title: '操作', width: 200, align: 'center'}, ], pagination: { @@ -180,6 +189,7 @@ export default { autoFocus: true, MENU_CONF: { uploadImage: { + maxFileSize: 50 * 1024 * 1024, server: store.state.user.apiUrl + '/api/common/upload', fieldName: 'file', meta:{ @@ -192,6 +202,11 @@ export default { // 从 res 中找到 url alt href ,然后插入图片 insertFn(res.data.fullurl, '', '') }, + onError:(file, err, res)=>{ + if(err.message.indexOf('exceeds maximum allowed size') !== -1){ + this.$message.error('限制为50M,请调整好再上传!',2000); + } + }, }, uploadVideo: { server: store.state.user.apiUrl + '/api/common/upload', @@ -266,6 +281,7 @@ export default { image_show:[], number_of_views:0, display_time:'', + wx_url:'', }; }, edit(d) { @@ -279,6 +295,7 @@ export default { this.addForm.content = d.content; this.addForm.number_of_views = d.number_of_views; this.addForm.display_time=d.display_time; + this.addForm.wx_url=d.wx_url; this.addMode = true; this.isEdit = true; }, @@ -294,6 +311,9 @@ export default { if (res.code == 1) { this.list = res.data.ret; this.pagination.total = res.data.count; + }else{ + this.list = []; + this.pagination.total =0; } }) @@ -328,10 +348,10 @@ export default { this.$message.error('来源不能为空'); return; } - if (this.addForm.content == '') { - this.$message.error('详情不能为空'); - return; - } + // if (this.addForm.content == '') { + // this.$message.error('详情不能为空'); + // return; + // } if (this.addForm.image=='') { this.$message.error('新闻主图不能为空'); return; @@ -356,6 +376,40 @@ export default { console.log(e); }); }, + topNews(row){ + console.log(row); + this.$request + .post('/common/listtopping', {id: row.id,type:'pcactivity'}) + .then((res) => { + if (res.code == 1) { + this.$message.success('置顶成功'); + this.getList(); + } else { + this.$message.error(res.msg); + } + console.log(res); + }) + .catch((e) => { + console.log(e); + }); + }, + topNewsDel(row){ + console.log(row); + this.$request + .post('/common/listcancel', {id: row.id,type:'pcactivity'}) + .then((res) => { + if (res.code == 1) { + this.$message.success('取消置顶成功'); + this.getList(); + } else { + this.$message.error(res.msg); + } + console.log(res); + }) + .catch((e) => { + console.log(e); + }); + }, onCloseMy() { this.addMode = false; this.infoMode = false; diff --git a/src/pages/pc/pc_news_type.vue b/src/pages/pc/pc_news_type.vue index 9179fe1..e7a9877 100644 --- a/src/pages/pc/pc_news_type.vue +++ b/src/pages/pc/pc_news_type.vue @@ -16,9 +16,9 @@ @@ -54,23 +54,23 @@ export default { this.getList(); }, methods: { - del(d){ - console.log(d); - this.$request - .post('/pc_news/gorydeletetime',{id:d.id}) - .then((res) => { - if(res.code==1){ - this.$message.success('删除成功!'); - this.getList(); - }else { - this.$message.error(res.msg); - } - console.log(res); - }) - .catch((e) => { - console.log(e); - }); - }, + // del(d){ + // console.log(d); + // this.$request + // .post('/pc_news/gorydeletetime',{id:d.id}) + // .then((res) => { + // if(res.code==1){ + // this.$message.success('删除成功!'); + // this.getList(); + // }else { + // this.$message.error(res.msg); + // } + // console.log(res); + // }) + // .catch((e) => { + // console.log(e); + // }); + // }, add(){ this.category_name= ''; this.addMode=true; diff --git a/src/pages/user/user_add.vue b/src/pages/user/user_add.vue index 7be8410..b2998ee 100644 --- a/src/pages/user/user_add.vue +++ b/src/pages/user/user_add.vue @@ -1,548 +1,802 @@ +