diff --git a/src/App.vue b/src/App.vue index a56ad02..4b039f6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,36 +1,37 @@ - - - - - - - + + + + + + diff --git a/src/assets/css/Header.css b/src/assets/css/Header.css index c6d6541..bc130ab 100644 --- a/src/assets/css/Header.css +++ b/src/assets/css/Header.css @@ -23,6 +23,12 @@ img { display: flex; justify-content: center; } +.nav-v { + padding: 30px 0; + justify-content: left; + width: 250px; + height: 80vh; +} .el-menu-item { font-size: 1.1rem; diff --git a/src/assets/css/common.css b/src/assets/css/common.css index 96967b6..1e34a2a 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -8,7 +8,10 @@ margin: 2vw 0; font-size: 1.1rem; } - +.breadcrumb-admin { + margin: 2vw 0; + font-size: 0.9rem; +} .edit-content { display: flex; flex-direction: column; @@ -25,6 +28,13 @@ align-items: center; /* 水平居中 */ margin: 0vw 6vw 3vw; } + +/* 面板 */ +.admin-content { + display: flex; + flex-direction: column; /* 纵向排列 */ + margin: 0 2vw 2vw; +} .content ul { list-style-type: none; } @@ -36,6 +46,13 @@ box-shadow: 0px 4px 10px 0 rgba(0,0,0,0.15); margin-bottom: 3vw; } + +.card-admin { + width: 83vw; + background-color: white; + box-shadow: 0px 4px 10px 0 rgba(0,0,0,0.15); + margin-bottom: 3vw; +} .card-content { display: block; position: relative; diff --git a/src/assets/font/font.css b/src/assets/font/font.css new file mode 100644 index 0000000..7fdc197 --- /dev/null +++ b/src/assets/font/font.css @@ -0,0 +1,18 @@ +@font-face { + font-family: "fs-gb2312"; + src: url("./fs-gb2312.ttf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "kaiti"; + src: url("./simkai.ttf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "heiti"; + src: url("./simhei.ttf"); + font-weight: normal; + font-style: normal; +} diff --git a/src/assets/font/fs-gb2312.ttf b/src/assets/font/fs-gb2312.ttf new file mode 100644 index 0000000..16eb427 Binary files /dev/null and b/src/assets/font/fs-gb2312.ttf differ diff --git a/src/assets/font/simfang.ttf b/src/assets/font/simfang.ttf new file mode 100644 index 0000000..68334e2 Binary files /dev/null and b/src/assets/font/simfang.ttf differ diff --git a/src/assets/font/simhei.ttf b/src/assets/font/simhei.ttf new file mode 100644 index 0000000..5bd4687 Binary files /dev/null and b/src/assets/font/simhei.ttf differ diff --git a/src/assets/font/simkai.ttf b/src/assets/font/simkai.ttf new file mode 100644 index 0000000..d7c3b90 Binary files /dev/null and b/src/assets/font/simkai.ttf differ diff --git a/src/assets/font/simsun.ttc b/src/assets/font/simsun.ttc new file mode 100644 index 0000000..5f22ce3 Binary files /dev/null and b/src/assets/font/simsun.ttc differ diff --git a/src/assets/logo/apply_total_img.png b/src/assets/logo/apply_total_img.png new file mode 100644 index 0000000..c3c90ca Binary files /dev/null and b/src/assets/logo/apply_total_img.png differ diff --git a/src/assets/logo/submit_total_img.png b/src/assets/logo/submit_total_img.png new file mode 100644 index 0000000..357f130 Binary files /dev/null and b/src/assets/logo/submit_total_img.png differ diff --git a/src/components/AdminHeader.vue b/src/components/AdminHeader.vue index 33ec949..c1e9f74 100644 --- a/src/components/AdminHeader.vue +++ b/src/components/AdminHeader.vue @@ -1,17 +1,42 @@ + + \ No newline at end of file diff --git a/src/layout/AdminLayout.vue b/src/layout/AdminLayout.vue index 7e14987..3c7ec13 100644 --- a/src/layout/AdminLayout.vue +++ b/src/layout/AdminLayout.vue @@ -1,24 +1,28 @@ - - - - - \ No newline at end of file diff --git a/src/main.js b/src/main.js index 6dab1d0..653e511 100644 --- a/src/main.js +++ b/src/main.js @@ -19,6 +19,9 @@ import "/src/assets/icon/iconfont.css" import * as echarts from 'echarts' // 时间 import moment from "moment" + +import "./assets/font/font.css"; + Vue.prototype.$md5 = md5; Vue.use(api) diff --git a/src/pages/Admin/UserManage.vue b/src/pages/Admin/UserManage.vue new file mode 100644 index 0000000..2a56c3b --- /dev/null +++ b/src/pages/Admin/UserManage.vue @@ -0,0 +1,461 @@ + + + + + \ No newline at end of file diff --git a/src/pages/Chat/Chat.vue b/src/pages/Chat/Chat.vue index 88c4b81..36d25cf 100644 --- a/src/pages/Chat/Chat.vue +++ b/src/pages/Chat/Chat.vue @@ -11,23 +11,24 @@
-

交流互动

-
dadasdadsad
-
dsvdsvsdvsdvds
+

交流互动

+
+
+
-
+
参赛资讯
-
+
选手交流
-
+
专家答疑
@@ -52,14 +53,30 @@ export default { chat_link1: "/api/files/chat-icon.png", chat_link2: "/api/files/chat-icon.png", chat_link3: "/api/files/chat-icon.png", - + urlOne:"", + urlTwo:"", + urlThree:"", contentLoading: true, loadingBg: "#FFF", + content: '', + contentMd:'' } }, methods:{ - + goToForum(linkNum){ + switch (linkNum){ + case 1: + window.location.href= this.urlOne + break; + case 2: + window.location.href= this.urlTwo + break; + case 3: + window.location.href= this.urlThree + break; + } + }, initPage(){ pageUtils.checkComp(this.$router,this.$route.params.compId,this.$api); this.$api.getPageData(this.$route.params.compId,'chat').then((res) => { @@ -70,6 +87,11 @@ export default { this.chat_link2 = res.data.logoTwo; this.chat_link3 = res.data.logoThree; this.chat = res.data.imgUrl; + this.content = res.data.content; + this.contentMd = res.data.contentMd; + this.urlOne = res.data.urlOne; + this.urlTwo = res.data.urlTwo; + this.urlThree = res.data.urlThree; this.contentLoading = false; }else { Message.warning("该页面不存在"); @@ -129,3 +151,16 @@ export default { \ No newline at end of file diff --git a/src/pages/Chat/ChatEdit.vue b/src/pages/Chat/ChatEdit.vue index 0613810..2f13492 100644 --- a/src/pages/Chat/ChatEdit.vue +++ b/src/pages/Chat/ChatEdit.vue @@ -8,13 +8,17 @@
提交 - 取消 + 取消
+ \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 8156b5f..89b90cd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -152,6 +152,14 @@ let routes = [ meta: { title: '红山开源社区' }, + }, + { + // 用户管理 + path: "userManage", + component: () => import("@/pages/Admin/UserManage"), + meta: { + title: '红山开源社区' + }, } ] }, diff --git a/src/utils/http/interface.js b/src/utils/http/interface.js index 92d3bc9..bf14e9b 100644 --- a/src/utils/http/interface.js +++ b/src/utils/http/interface.js @@ -54,6 +54,30 @@ export const register = data => { data }) }; + + +export const chatContentUpdate = data => { + return axios({ + headers:{ + "Authorization": localStorage.getItem("systemToken") + }, + url: '/chat/updateContentByCompId', + method: 'post', + data + }) +}; + + +export const homeContentUpdate = data => { + return axios({ + headers:{ + "Authorization": localStorage.getItem("systemToken") + }, + url: '/home/updateContentByCompId', + method: 'post', + data + }) +}; // 默认全部倒出 // 根据需要进行 export default { @@ -62,5 +86,7 @@ export default { getComp, getPageData, login, - register + register, + chatContentUpdate, + homeContentUpdate } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 83636dc..55e8c40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3426,6 +3426,14 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +echarts@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.2.tgz#0a7b3be8c48a48b2e7cb1b82121df0c208d42d2c" + integrity sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ== + dependencies: + tslib "2.3.0" + zrender "5.3.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz" @@ -5863,6 +5871,11 @@ mixin-deep@^1.2.0: dependencies: minimist "^1.2.6" +moment@^2.29.1: + version "2.29.3" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" + integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz" @@ -8466,6 +8479,11 @@ ts-pnp@^1.1.6: resolved "https://registry.npmmirror.com/ts-pnp/-/ts-pnp-1.2.0.tgz" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^1.9.0: version "1.14.1" resolved "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz" @@ -9186,3 +9204,10 @@ yorkie@^2.0.0: is-ci "^1.0.10" normalize-path "^1.0.0" strip-indent "^2.0.0" + +zrender@5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.3.1.tgz#fa8e63ac7e719cfd563831fe8c42a9756c5af384" + integrity sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw== + dependencies: + tslib "2.3.0"