diff --git a/package-lock.json b/package-lock.json index 3b9d64c..df61d85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3917,7 +3917,6 @@ "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz", "integrity": "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=", - "dev": true, "requires": { "is-arguments": "^1.0.4", "is-date-object": "^1.0.1", @@ -4066,7 +4065,6 @@ "version": "1.1.3", "resolved": "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz", "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", - "dev": true, "requires": { "object-keys": "^1.0.12" } @@ -4537,7 +4535,6 @@ "version": "1.17.5", "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.5.tgz?cache=0&sync_timestamp=1584909155190&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.5.tgz", "integrity": "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk=", - "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -4556,7 +4553,6 @@ "version": "1.2.1", "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz", "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=", - "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -4970,8 +4966,7 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz", - "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", - "dev": true + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=" }, "extend-shallow": { "version": "3.0.2", @@ -5082,6 +5077,11 @@ "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ=", "dev": true }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" + }, "fast-glob": { "version": "2.2.7", "resolved": "https://registry.npm.taobao.org/fast-glob/download/fast-glob-2.2.7.tgz?cache=0&sync_timestamp=1582318805379&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-glob%2Fdownload%2Ffast-glob-2.2.7.tgz", @@ -5415,8 +5415,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz", - "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", - "dev": true + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=" }, "functional-red-black-tree": { "version": "1.0.1", @@ -5644,7 +5643,6 @@ "version": "1.0.3", "resolved": "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz", "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -5674,8 +5672,7 @@ "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz?cache=0&sync_timestamp=1573950844856&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.1.tgz", - "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg=", - "dev": true + "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg=" }, "has-unicode": { "version": "2.0.1", @@ -6334,8 +6331,7 @@ "is-arguments": { "version": "1.0.4", "resolved": "https://registry.npm.taobao.org/is-arguments/download/is-arguments-1.0.4.tgz", - "integrity": "sha1-P6+WbHy6D/Q3+zH2JQCC/PBEjPM=", - "dev": true + "integrity": "sha1-P6+WbHy6D/Q3+zH2JQCC/PBEjPM=" }, "is-arrayish": { "version": "0.2.1", @@ -6361,8 +6357,7 @@ "is-callable": { "version": "1.1.5", "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz?cache=0&sync_timestamp=1576778289528&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-callable%2Fdownload%2Fis-callable-1.1.5.tgz", - "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs=", - "dev": true + "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs=" }, "is-ci": { "version": "1.2.1", @@ -6410,8 +6405,7 @@ "is-date-object": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.2.tgz?cache=0&sync_timestamp=1576729165697&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.2.tgz", - "integrity": "sha1-vac28s2P0G0yhE53Q7+nSUw7/X4=", - "dev": true + "integrity": "sha1-vac28s2P0G0yhE53Q7+nSUw7/X4=" }, "is-descriptor": { "version": "0.1.6", @@ -6546,7 +6540,6 @@ "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&sync_timestamp=1576454499491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz", "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=", - "dev": true, "requires": { "has": "^1.0.3" } @@ -6576,7 +6569,6 @@ "version": "1.0.3", "resolved": "https://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.3.tgz?cache=0&sync_timestamp=1574296307739&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.3.tgz", "integrity": "sha1-OOEBS55jKb4N6dJKQU/XRB7GGTc=", - "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -7793,8 +7785,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-copy": { "version": "0.1.0", @@ -7836,14 +7827,12 @@ "object-inspect": { "version": "1.7.0", "resolved": "https://registry.npm.taobao.org/object-inspect/download/object-inspect-1.7.0.tgz?cache=0&sync_timestamp=1573451929207&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.7.0.tgz", - "integrity": "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc=", - "dev": true + "integrity": "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc=" }, "object-is": { "version": "1.1.2", "resolved": "https://registry.npm.taobao.org/object-is/download/object-is-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-is%2Fdownload%2Fobject-is-1.1.2.tgz", "integrity": "sha1-xdLof/nhGfeLegiEQVGeLuwVc7Y=", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -7852,8 +7841,7 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz", - "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=", - "dev": true + "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=" }, "object-visit": { "version": "1.0.1", @@ -7868,7 +7856,6 @@ "version": "4.1.0", "resolved": "https://registry.npm.taobao.org/object.assign/download/object.assign-4.1.0.tgz", "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=", - "dev": true, "requires": { "define-properties": "^1.1.2", "function-bind": "^1.1.1", @@ -8120,6 +8107,11 @@ "no-case": "^2.2.0" } }, + "parchment": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz", + "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==" + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/parent-module/download/parent-module-1.0.1.tgz", @@ -9160,6 +9152,41 @@ "integrity": "sha1-YOWl/WSn+L+k0qsu1v30yFutFU4=", "dev": true }, + "quill": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz", + "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", + "requires": { + "clone": "^2.1.1", + "deep-equal": "^1.0.1", + "eventemitter3": "^2.0.3", + "extend": "^3.0.2", + "parchment": "^1.1.4", + "quill-delta": "^3.6.2" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" + }, + "eventemitter3": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz", + "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=" + } + } + }, + "quill-delta": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz", + "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==", + "requires": { + "deep-equal": "^1.0.1", + "extend": "^3.0.2", + "fast-diff": "1.1.2" + } + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz", @@ -9369,7 +9396,6 @@ "version": "1.3.0", "resolved": "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.3.0.tgz?cache=0&sync_timestamp=1576388236739&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregexp.prototype.flags%2Fdownload%2Fregexp.prototype.flags-1.3.0.tgz", "integrity": "sha1-erqJs8E6ZFCdq888qNn7ub31y3U=", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.0-next.1" @@ -10641,7 +10667,6 @@ "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.1.tgz", "integrity": "sha1-hYEqa4R6wAInD1gIFGBkyZX7aRM=", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -10651,7 +10676,6 @@ "version": "2.1.2", "resolved": "https://registry.npm.taobao.org/string.prototype.trimleft/download/string.prototype.trimleft-2.1.2.tgz", "integrity": "sha1-RAiqLl1t3QyagHObCH+8BnwDs8w=", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -10662,7 +10686,6 @@ "version": "2.1.2", "resolved": "https://registry.npm.taobao.org/string.prototype.trimright/download/string.prototype.trimright-2.1.2.tgz?cache=0&sync_timestamp=1585557103516&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimright%2Fdownload%2Fstring.prototype.trimright-2.1.2.tgz", "integrity": "sha1-x28c7zDyG7rYr+uNsVEUls+w8qM=", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -10673,7 +10696,6 @@ "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.1.tgz", "integrity": "sha1-FK9tnzSwU/fPyJty+PLuFLkDmlQ=", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -11538,6 +11560,15 @@ } } }, + "vue-quill-editor": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz", + "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==", + "requires": { + "object-assign": "^4.1.1", + "quill": "^1.3.4" + } + }, "vue-router": { "version": "3.1.6", "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.1.6.tgz", diff --git a/package.json b/package.json index 1be00e2..54b752f 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "qs": "^6.9.4", "vue": "^2.6.11", "vue-loader": "^15.9.2", + "vue-quill-editor": "^3.0.6", "vue-router": "^3.1.6", "vuex": "^3.1.3" }, diff --git a/public/config.js b/public/config.js index dcb3150..672aeaa 100644 --- a/public/config.js +++ b/public/config.js @@ -1,5 +1,5 @@ config = { - API_URL: 'http://121.36.65.171:8204', + API_URL: 'http://172.119.51.18:8081', COCKPIT_API_URL: 'http://www.fatoaniic.com/api', LOGIN_URL: 'http://www.fatoaniic.com/#/login', APP_URL:'http://nmsj.org.cn/', diff --git a/src/api/notice.js b/src/api/notice.js new file mode 100644 index 0000000..fe383e3 --- /dev/null +++ b/src/api/notice.js @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +//获取文章详情 +export function getNoticeInfo(params) { + return request({ + url: '/contentWeb/get/'+params, + method: 'get' + }); +} diff --git a/src/router/index.js b/src/router/index.js index c911ea5..3ad407d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,12 +56,12 @@ const routes = [ { path: 'introduce', name: 'introduceMeeting', - meta: {title: '大会介绍', icon: 'register', noCache: true}, + meta: {title: '大会介绍', icon: 'register', noCache: true,titleId:'4'}, }, { path: 'schedule', name: 'scheduleMeeting', - meta: {title: '会议日程', icon: 'register', noCache: true}, + meta: {title: '会议日程', icon: 'register', noCache: true,titleId:'7'}, }, { path: 'news', @@ -169,9 +169,18 @@ const routes = [ name: 'retrievePassword', hidden: true, meta: {title: '找回密码', icon: 'eye', noCache: true}, - }, + }, + { + path: '/noticeShow', + name:'noticeShow', + component: () => + import ('../views/noticeShow.vue'), + hidden: true + }, ], }, + + { path: '/404', component: () => diff --git a/src/utils/request.js b/src/utils/request.js index 13942ce..f3e52ef 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -67,10 +67,10 @@ service.interceptors.response.use( */ const res = response.data // const res = JSON.parse(response.data) - if (res.code !== 200) { + if (res.status !== 200) { // 300:失效的token; - if (res.code === 511) { + if (res.status === 511) { if (isToken) { isToken = false MessageBox.alert('你已被登出，请重新登录', '确定登出', { @@ -87,7 +87,7 @@ service.interceptors.response.use( } } else { Message({ - message: res.msg, + message: res.message, type: 'error', duration: 5 * 1000 }) @@ -101,7 +101,7 @@ service.interceptors.response.use( console.log('err' + error)// for debug const res = error.response.data; Message({ - message: res.msg, + message: res.message, type: 'error', duration: 3 * 1000 }) diff --git a/src/views/layout/components/header.vue b/src/views/layout/components/header.vue index b4516e8..1c79144 100644 --- a/src/views/layout/components/header.vue +++ b/src/views/layout/components/header.vue @@ -39,7 +39,7 @@ {{item.meta.title}}