diff --git a/src/api/index.js b/src/api/index.js index 1c0eec9..759df7b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -17,7 +17,7 @@ export default { sendPhoneOrEmailCode: `iasf/sys/sendPhoneOrEmailCode`, updatePhoneOrEmail: `iasf/sys/updatePhoneOrEmail`, updateUserAvatars: `${host}iasf/sys/updateUserAvatars`, - staffTemplate: `http://192.168.31.136/用户导入模板.xlsx`, + staffTemplate: `https://31k70639y6.zicp.fun/用户导入模板.xlsx`, checkJobNumber: `iasf/sys/checkJobNumber`, checkUsername: `iasf/sys/checkUsername`, resetPwd: `iasf/sys/resetPwd`, diff --git a/src/components/modules/module.vue b/src/components/modules/module.vue index 5c0b989..ae252d5 100644 --- a/src/components/modules/module.vue +++ b/src/components/modules/module.vue @@ -206,7 +206,6 @@ export default { // 处理form表单参数 handleForm() { const { type, forms, form } = this.data - console.log("🚀 ~ file: module.vue ~ line 209 ~ handleForm ~ type", this.data, form) if (type === 'form') { forms.map(e => { // 加必填 @@ -221,7 +220,21 @@ export default { } }) } - + if (type === 'column' && form.articleNumOpt) { + const nums = [ + { + id: '', + name: '默认' + } + ] + for (let i = form.articleNumOpt; i > 1; i--) { + nums.push({ + id: i, + name: i + }) + } + this.articleNums = nums + } form && form.site && this.siteChange(form.site) }, // 站点切换回调 diff --git a/src/const/modules.js b/src/const/modules.js index 947e869..8789fb8 100644 --- a/src/const/modules.js +++ b/src/const/modules.js @@ -43,7 +43,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/about/1.png', + pic: 'https://31k70639y6.zicp.fun/images/about/1.png', title: 'ABOUT', link: { linkName: '无', @@ -92,7 +92,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/about/2.png', + pic: 'https://31k70639y6.zicp.fun/images/about/2.png', title: 'Our History', subTitle: 'Throughout the world, most of the top science and technology innovation centers are distributed', link: { @@ -446,7 +446,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/about/5.png', + pic: 'https://31k70639y6.zicp.fun/images/about/5.png', title: 'Strategic Plan', link: { linkName: '无', @@ -533,7 +533,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/about/6.png', + pic: 'https://31k70639y6.zicp.fun/images/about/6.png', title: 'Sun Dongbai', subTitle: 'Founder and 1st PRESIDENT OF THE INSTITUTE OF ADVANCED SCIENCE FACILITIES, SHENZHEN', link: { @@ -551,7 +551,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/about/7.png', + pic: 'https://31k70639y6.zicp.fun/images/about/7.png', title: 'Yang Xueming', subTitle: 'Vice President of the Institute of Advanced Scienc, Shenzhen', link: { @@ -569,7 +569,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/about/8.png', + pic: 'https://31k70639y6.zicp.fun/images/about/8.png', title: 'Ulf KALSSON', subTitle: 'The Chairman of Science and Technology Advisory Committee', link: { @@ -635,7 +635,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/about/9.png', + pic: 'https://31k70639y6.zicp.fun/images/about/9.png', title: 'Science and Technology', subTitle: '', link: { @@ -679,7 +679,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/about/10.png', + pic: 'https://31k70639y6.zicp.fun/images/about/10.png', title: 'User Committee', subTitle: '', link: { @@ -723,7 +723,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/about/11.png', + pic: 'https://31k70639y6.zicp.fun/images/about/11.png', title: 'Industry Advancement Committee', subTitle: '', link: { @@ -787,7 +787,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/about/12.png', + pic: 'https://31k70639y6.zicp.fun/images/about/12.png', title: 'Throughout the world, most of the top science and technology innovation centers are distributed', subTitle: '', link: { @@ -845,7 +845,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/careers/1.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/1.png', title: 'CAREERS', link: { linkName: '无', @@ -889,7 +889,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/careers/2.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/2.png', title: 'Research', link: { linkName: '无', @@ -932,7 +932,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/careers/3.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/3.png', title: 'Engineering', link: { linkName: '无', @@ -975,7 +975,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/careers/4.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/4.png', title: 'Management Staff', link: { linkName: '无', @@ -1018,7 +1018,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/careers/5.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/5.png', title: 'Post-doc Programs', link: { linkName: '无', @@ -1098,7 +1098,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/careers/6.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/6.png', title: 'IASF started its journey to chase light, push the boundaries forward, and discover the unknown.', link: { linkName: '无', @@ -1115,7 +1115,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/careers/7.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/7.png', title: 'IASF started its journey to chase light, push the boundaries forward, and discover the unknown.', link: { linkName: '无', @@ -1132,7 +1132,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/careers/8.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/8.png', title: 'IASF started its journey to chase light, push the boundaries forward, and discover the unknown.', link: { linkName: '无', @@ -1200,7 +1200,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/careers/9.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/9.png', title: 'Benefits', subTitle: 'YOU ARE IN GOOD HANDS', link: { @@ -1218,7 +1218,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/careers/10.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/10.png', title: 'Traineeships', subTitle: 'YOUR FUTURE STARTS HERE', link: { @@ -1236,7 +1236,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/careers/11.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/11.png', title: 'Programs', subTitle: 'YOUR INSPIRATION HAS GREAT SUPPORTS', link: { @@ -1296,8 +1296,8 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/edu/1.png', - title: 'ABOUT', + pic: 'https://31k70639y6.zicp.fun/images/edu/1.png', + title: 'EDUCATION & COLLABORATION', link: { linkName: '无', connectionType: 1, @@ -1340,7 +1340,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/edu/2.png', + pic: 'https://31k70639y6.zicp.fun/images/edu/2.png', title: 'Partnership', link: { linkName: '无', @@ -1383,7 +1383,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/edu/2.png', + pic: 'https://31k70639y6.zicp.fun/images/edu/2.png', title: 'Programs', link: { linkName: '无', @@ -1469,7 +1469,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/edu/3.png', + pic: 'https://31k70639y6.zicp.fun/images/edu/3.png', title: 'community service', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -1487,7 +1487,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/edu/4.png', + pic: 'https://31k70639y6.zicp.fun/images/edu/4.png', title: 'community service', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -1505,7 +1505,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/edu/5.png', + pic: 'https://31k70639y6.zicp.fun/images/edu/5.png', title: 'community service', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -1565,7 +1565,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/home/1.png', + pic: 'https://31k70639y6.zicp.fun/images/home/1.png', title: 'HOME', link: { linkName: '无', @@ -1629,7 +1629,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/home/2.png', + pic: 'https://31k70639y6.zicp.fun/images/home/2.png', title: 'Shenzhen Innovation Lightsource Facility', link: { linkName: '无', @@ -1672,7 +1672,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/home/3.png', + pic: 'https://31k70639y6.zicp.fun/images/home/3.png', title: 'Shenzhen Soft X-ray Superconducting Free-electron Laser Facility ', link: { linkName: '无', @@ -1788,7 +1788,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/careers/6.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/6.png', title: 'SHAO Jiahang, PH.D.', subTitle: '', link: { @@ -1806,7 +1806,7 @@ export default { des: '“..., The new facility (S3FEL) will provide the brightest soft X-ray laser to both scientific and industrial users worldwide, enabling applications that are beyond imagination, ...”…' }, { - pic: 'http://192.168.31.136/images/careers/7.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/7.png', title: 'PENG Ziling, Ph.D.', subTitle: '', link: { @@ -1824,7 +1824,7 @@ export default { des: '“..., With so many young, professional, and passionate workmates, I treasure the moments we spent on fruitful discussions, brainstorming, teamworking, and the leisure activities on the Guangming farm just next to our worksite, ...”…' }, { - pic: 'http://192.168.31.136/images/careers/8.png', + pic: 'https://31k70639y6.zicp.fun/images/careers/8.png', title: 'CHEN Rikun, M.S.', subTitle: '', link: { @@ -2061,8 +2061,8 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/news/1.png', - title: 'ABOUT', + pic: 'https://31k70639y6.zicp.fun/images/news/1.png', + title: 'NEWS & EVENTS', link: { linkName: '无', connectionType: 1, @@ -2195,6 +2195,7 @@ export default { site: '', column: '', articleNum: '', + articleNumOpt: 8, columnTitle: 1, columnTitleCustom: '' } @@ -2240,8 +2241,8 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/news/1.png', - title: 'ABOUT', + pic: 'https://31k70639y6.zicp.fun/images/news/1.png', + title: 'NEWS & EVENTS', link: { linkName: '无', connectionType: 1, @@ -2307,7 +2308,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/newsPress/1.png', + pic: 'https://31k70639y6.zicp.fun/images/newsPress/1.png', title: 'Reports', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -2325,7 +2326,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/newsPress/2.png', + pic: 'https://31k70639y6.zicp.fun/images/newsPress/2.png', title: 'Brochures', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -2343,7 +2344,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/newsPress/3.png', + pic: 'https://31k70639y6.zicp.fun/images/newsPress/3.png', title: 'Gallery', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -2403,8 +2404,8 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/news/1.png', - title: 'ABOUT', + pic: 'https://31k70639y6.zicp.fun/images/news/1.png', + title: 'NEWS & EVENTS', link: { linkName: '无', connectionType: 1, @@ -2470,7 +2471,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/newsProcurement/1.png', + pic: 'https://31k70639y6.zicp.fun/images/newsProcurement/1.png', title: 'Project ', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -2488,7 +2489,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/newsProcurement/2.png', + pic: 'https://31k70639y6.zicp.fun/images/newsProcurement/2.png', title: 'Goods', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -2506,7 +2507,7 @@ export default { isEnable: 1 }, { - pic: 'http://192.168.31.136/images/newsProcurement/3.png', + pic: 'https://31k70639y6.zicp.fun/images/newsProcurement/3.png', title: 'Service', subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.', link: { @@ -2566,7 +2567,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/research/1.png', + pic: 'https://31k70639y6.zicp.fun/images/research/1.png', title: 'RESEARCH', link: { linkName: '无', @@ -2647,7 +2648,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/research/res1.png', + pic: 'https://31k70639y6.zicp.fun/images/research/res1.png', title: 'Physics', link: { linkName: '无', @@ -2663,7 +2664,7 @@ export default { des: 'Research Field Description', }, { - pic: 'http://192.168.31.136/images/research/res2.png', + pic: 'https://31k70639y6.zicp.fun/images/research/res2.png', title: 'Chemistry', link: { linkName: '无', @@ -2679,7 +2680,7 @@ export default { des: 'Research Field Description', }, { - pic: 'http://192.168.31.136/images/research/res3.png', + pic: 'https://31k70639y6.zicp.fun/images/research/res3.png', title: 'Biology', link: { linkName: '无', @@ -2695,7 +2696,7 @@ export default { des: 'Research Field Description', }, { - pic: 'http://192.168.31.136/images/research/res4.png', + pic: 'https://31k70639y6.zicp.fun/images/research/res4.png', title: 'Advanced Materials ', link: { linkName: '无', @@ -2711,7 +2712,7 @@ export default { des: 'Research Field Description', }, { - pic: 'http://192.168.31.136/images/research/res5.png', + pic: 'https://31k70639y6.zicp.fun/images/research/res5.png', title: 'Advanced Manufacturing', link: { linkName: '无', @@ -2786,7 +2787,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/research/3.png', + pic: 'https://31k70639y6.zicp.fun/images/research/3.png', title: 'Accelerator', link: { linkName: '无', @@ -2801,7 +2802,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/4.png', + pic: 'https://31k70639y6.zicp.fun/images/research/4.png', title: 'Physics', link: { linkName: '无', @@ -2816,7 +2817,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/5.png', + pic: 'https://31k70639y6.zicp.fun/images/research/5.png', title: 'Mechanical Engineering', link: { linkName: '无', @@ -2831,7 +2832,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/6.png', + pic: 'https://31k70639y6.zicp.fun/images/research/6.png', title: 'Digital Light-source', link: { linkName: '无', @@ -2846,7 +2847,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/7.png', + pic: 'https://31k70639y6.zicp.fun/images/research/7.png', title: 'Beam Lines', link: { linkName: '无', @@ -2861,7 +2862,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/8.png', + pic: 'https://31k70639y6.zicp.fun/images/research/8.png', title: 'End Stations', link: { linkName: '无', @@ -2942,7 +2943,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/research/12.png', + pic: 'https://31k70639y6.zicp.fun/images/research/12.png', title: '这里是标题一句话标题', link: { linkName: '无', @@ -2958,7 +2959,7 @@ export default { des: 'Online single-shot characterization of ultrafast pulses from high-gain free-electron lasers, Li Zeng,Chao Feng,Duan Gu,Xiaofan Wang,Kaiqing Zhang,Bo Liu,Zhentang Zhao,Fundamental Research', }, { - pic: 'http://192.168.31.136/images/research/13.png', + pic: 'https://31k70639y6.zicp.fun/images/research/13.png', title: '这里是标题一句话标题', link: { linkName: '无', @@ -2978,7 +2979,7 @@ export default { `, }, { - pic: 'http://192.168.31.136/images/research/14.png', + pic: 'https://31k70639y6.zicp.fun/images/research/14.png', title: '这里是标题一句话标题', link: { linkName: '无', @@ -3038,7 +3039,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/application/1.png', + pic: 'https://31k70639y6.zicp.fun/images/application/1.png', title: 'APPLICATION', link: { linkName: '无', @@ -3087,7 +3088,7 @@ export default { } ], form: { - pic: 'http://192.168.31.136/images/research/2.png', + pic: 'https://31k70639y6.zicp.fun/images/research/2.png', title: 'Why IASF?', subTitle: `IASF started its journey to chase light, The one that can drive innovation, @@ -3356,7 +3357,7 @@ export default { }, list: [ { - pic: 'http://192.168.31.136/images/research/3.png', + pic: 'https://31k70639y6.zicp.fun/images/research/3.png', title: 'Accelerator', link: { linkName: '无', @@ -3371,7 +3372,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/4.png', + pic: 'https://31k70639y6.zicp.fun/images/research/4.png', title: 'Physics', link: { linkName: '无', @@ -3386,7 +3387,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/5.png', + pic: 'https://31k70639y6.zicp.fun/images/research/5.png', title: 'Mechanical Engineering', link: { linkName: '无', @@ -3401,7 +3402,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/6.png', + pic: 'https://31k70639y6.zicp.fun/images/research/6.png', title: 'Digital Light-source', link: { linkName: '无', @@ -3416,7 +3417,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/7.png', + pic: 'https://31k70639y6.zicp.fun/images/research/7.png', title: 'Beam Lines', link: { linkName: '无', @@ -3431,7 +3432,7 @@ export default { } }, { - pic: 'http://192.168.31.136/images/research/8.png', + pic: 'https://31k70639y6.zicp.fun/images/research/8.png', title: 'End Stations', link: { linkName: '无', diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index e51d9ba..4be74ad 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -101,7 +101,7 @@ export default { json: this.handleJson() }).then(res => { load.close() - window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://192.168.31.136/front') + `/#/${this.$route.query.path}?id=${this.columnId}&preview=1&siteId=${this.$route.query.siteId}`) + window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'https://31k70639y6.zicp.fun/front') + `/#/${this.$route.query.path}?id=${this.columnId}&preview=1&siteId=${this.$route.query.siteId}`) }).catch(err => { load.close() }) diff --git a/src/pages/article/add/editor.js b/src/pages/article/add/editor.js index f28e1b9..a0f0d7c 100644 --- a/src/pages/article/add/editor.js +++ b/src/pages/article/add/editor.js @@ -344,6 +344,7 @@ export default { // 设置默认字体 ed.target.editorCommands.execCommand("fontName", false, "PingFang SC") ed.target.editorCommands.execCommand("fontSize", false, "19px") + ed.target.editorCommands.execCommand("lineHeight", false, "1.5") top.document.querySelector('#articleTitle').focus() // 第一个字段聚焦 }) }, diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue index 891243d..6b967ba 100644 --- a/src/pages/article/add/index.vue +++ b/src/pages/article/add/index.vue @@ -933,7 +933,7 @@ export default { }, // 预览 preview() { - window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://192.168.31.136/front') + `/#/article?id=${this.form.id}&siteId=${this.form.siteId}`) + window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'https://31k70639y6.zicp.fun/front') + `/#/article?id=${this.form.id}&siteId=${this.form.siteId}`) }, // 返回 back() { @@ -952,6 +952,17 @@ export default { this.$router.back() } }, + // 更新附件的状态为发布 + updateFile(files, form, quoteId) { + files.map(e => { + this.$post(this.api.updateFile, { + id: e, + isRelease: form.isRelease, + quote: form.title, + quoteId + }).then(res => {}).catch(err => {}) + }) + }, // 提交 submit(isRelease, next) { if (this.submiting) return false @@ -996,17 +1007,9 @@ export default { if (bannerImg) fileId.push(bannerImg.substr(bannerImg.lastIndexOf('/') + 1)) if (titleImg) fileId.push(titleImg.substr(titleImg.lastIndexOf('/') + 1)) fileList && fileList.map(e => { - e.url && fileId.push(e.url.substr(e.url.lastIndexOf('/') + 1)) + fileId.push(e[e.url ? 'url' : 'filePath'].substr(e[e.url ? 'url' : 'filePath'].lastIndexOf('/') + 1)) }) form.lableId = form.lableId.join(',') - // 更新附件的状态为发布 - fileId.map(e => { - this.$post(this.api.updateFile, { - id: e, - isRelease, - quote: form.title - }).then(res => {}).catch(err => {}) - }) form.isRelease = isRelease this.submiting = true @@ -1014,6 +1017,7 @@ export default { delete form.children form.editorId = +this.$store.state.user.userId this.$post(this.api.updateArticle, form).then(res => { + this.updateFile(fileId, form, form.id) util.successMsg('修改成功') next ? next() : this.$router.push(`list?columnId=` + form.columnId) }).catch(err => { @@ -1021,6 +1025,7 @@ export default { }) } else { this.$post(this.api.saveArticle, form).then(({ data }) => { + this.updateFile(fileId, form, data) // 新增文章完后需要把上传的附件添加到文章附件表 form.fileList.map(e => { this.$post(this.api.saveContentFile, { diff --git a/src/pages/article/list/index.vue b/src/pages/article/list/index.vue index 0fb0ed0..30d768b 100644 --- a/src/pages/article/list/index.vue +++ b/src/pages/article/list/index.vue @@ -289,7 +289,7 @@ export default { }, // 预览 preview(row) { - window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://192.168.31.136/front') + `/#/article?id=${row.id}&siteId=${this.$refs.column.getCurrentNode().siteId}`) + window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'https://31k70639y6.zicp.fun/front') + `/#/article?id=${row.id}&siteId=${this.$refs.column.getCurrentNode().siteId}`) }, // 编辑 edit(row) { diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue index b44d74f..6269215 100644 --- a/src/pages/column/add/index.vue +++ b/src/pages/column/add/index.vue @@ -458,6 +458,7 @@ export default { this.getStyle() } else if (val == 3) { this.form.templateId = 9 + if (this.pageStyle.length) this.form.listStyleId = this.pageStyle[0].id } }, // 获取栏目模板 @@ -635,6 +636,7 @@ export default { if (otherArticle) form.linkAddress += '-' + otherArticle } } + if (form.typeId !== 2 && !form.listStyleId) return util.errorMsg('请选择列表样式') // 更新附件的状态为发布 this.fileId && this.$post(this.api.updateFile, { id: this.fileId, diff --git a/src/pages/column/list/index.vue b/src/pages/column/list/index.vue index 5717c43..bfc3e56 100644 --- a/src/pages/column/list/index.vue +++ b/src/pages/column/list/index.vue @@ -62,8 +62,8 @@ 新增下级 编辑 删除 - 预览 - 页面设置 + 预览 + 页面设置 @@ -294,7 +294,7 @@ export default { const item = this.pageStyle.find(e => e.id == row.listStyleId) if (item) path = item.path } - window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://192.168.31.136/front') + `/#/${row.typeId === 3 ? row.path : 'column'}?id=${row.id}&siteId=${row.siteId}`) + window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'https://31k70639y6.zicp.fun/front') + `/#/${row.typeId === 3 ? row.path : 'column'}?id=${row.id}&siteId=${row.siteId}`) }, // 页面管理 page(row) { diff --git a/src/pages/column/page/application.vue b/src/pages/column/page/application.vue index 1a7786c..67a9727 100644 --- a/src/pages/column/page/application.vue +++ b/src/pages/column/page/application.vue @@ -81,7 +81,7 @@