diff --git a/package.json b/package.json index 6e0353f..f906320 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "view-design": "^4.7.0", "vue": "2.6.10", "vue-count-to": "^1.0.13", + "vue-particles": "^1.0.9", "vue-router": "3.0.6", "vuex": "3.1.0" }, diff --git a/public/favicon.ico b/public/favicon.ico index cec8668..92d45c6 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/bg.jpg b/src/assets/bg.jpg new file mode 100644 index 0000000..021b6d1 Binary files /dev/null and b/src/assets/bg.jpg differ diff --git a/src/assets/face.png b/src/assets/face.png new file mode 100644 index 0000000..408e320 Binary files /dev/null and b/src/assets/face.png differ diff --git a/src/assets/logo-mini.png b/src/assets/logo-mini.png index 890cbd2..a57c3dd 100644 Binary files a/src/assets/logo-mini.png and b/src/assets/logo-mini.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 42bd527..3d1fdae 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index 52792d3..e458afb 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -19,7 +19,7 @@ import load from './dynamicLoadScript' // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one // const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js' - const tinymceCDN = '/tinymce/tinymce.min.js' + const tinymceCDN = '/admin/tinymce/tinymce.min.js' export default { name: 'Tinymce', components: { editorImage }, diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index bfcdc99..f66a858 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -7,7 +7,7 @@
- +
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index fdb8e5e..6e052c2 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -37,7 +37,7 @@ } .sidebar-name-logo { width: 200px; - height: 20px; + height: 50px; } .sidebarLogoFade-enter, diff --git a/src/main.js b/src/main.js index 3d59f8c..24c3d9e 100644 --- a/src/main.js +++ b/src/main.js @@ -23,6 +23,8 @@ Vue.prototype.base = base; import '@/icons' // icon import '@/permission' // permission control +import VueParticles from 'vue-particles' +Vue.use(VueParticles) /** * If you don't want to use mock-server * you want to use MockJs for mock api diff --git a/src/router/index.js b/src/router/index.js index d16e88f..bf7bdcf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -51,7 +51,7 @@ export const constantRoutes = [{ component: () => import('@/views/dashboard/index'), meta: { title: '系统首页', - icon: 'dashboard' + icon: 'iconfont/icon-houtaitubiao-01' } }] } diff --git a/src/styles/iconfont.css b/src/styles/iconfont.css index 5babe17..881e39e 100644 --- a/src/styles/iconfont.css +++ b/src/styles/iconfont.css @@ -1,8 +1,11 @@ @font-face { - font-family: 'iconfont'; /* Project id 3356385 */ - src: url('//at.alicdn.com/t/font_3356385_p1159rz3ar.woff2?t=1650945259111') format('woff2'), - url('//at.alicdn.com/t/font_3356385_p1159rz3ar.woff?t=1650945259111') format('woff'), - url('//at.alicdn.com/t/font_3356385_p1159rz3ar.ttf?t=1650945259111') format('truetype'); + font-family: 'iconfont'; /* project id 3397834 */ + src: url(''); + src: url('?#iefix') format('embedded-opentype'), + url('//at.alicdn.com/t/font_3397834_7rrnwaxi4pk.woff2') format('woff2'), + url('//at.alicdn.com/t/font_3397834_7rrnwaxi4pk.woff') format('woff'), + url('//at.alicdn.com/t/font_3397834_7rrnwaxi4pk.ttf') format('truetype'), + url('#iconfont') format('svg'); } .iconfont { @@ -13,47 +16,163 @@ -moz-osx-font-smoothing: grayscale; } -.icon-shuzhuangtu:before { - content: "\e600"; +.icon-tuandui:before { + content: "\e603"; +} + +.icon-tuanduiguanli:before { + content: "\e7b2"; +} + +.icon-yuyue:before { + content: "\e60d"; +} + +.icon-gerenshuju:before { + content: "\e602"; +} + +.icon-jifangcanguanjiaoliushenqing:before { + content: "\e6a2"; +} + +.icon-houtaitubiao-01:before { + content: "\e639"; +} + +.icon-houtaitubiao-17:before { + content: "\e63a"; +} + +.icon-zhuceyaoqing:before { + content: "\e60f"; } -.icon-zhinan:before { - content: "\e8d0"; +.icon-Reply:before { + content: "\e60a"; } -.icon-dingdan:before { - content: "\e645"; +.icon-back:before { + content: "\e670"; } -.icon-mingxinghuodong:before { - content: "\e8b3"; +.icon-dianzan:before { + content: "\ec7f"; } -.icon-yuyuezhongxin:before { - content: "\e626"; +.icon-fenxiang:before { + content: "\e617"; } -.icon-huodongzhongxin:before { - content: "\e628"; +.icon-dayin:before { + content: "\e620"; } -.icon-weizhixiangqing:before { - content: "\e8ab"; +.icon-yanjing:before { + content: "\e68d"; } -.icon-tingchewei:before { - content: "\e655"; +.icon-yanjing1:before { + content: "\e6cf"; } -.icon-ziyuanzhongxin:before { - content: "\e604"; +.icon-zuzhiguanli:before { + content: "\e60e"; } -.icon-tuijian:before { +.icon-lianjie:before { + content: "\e609"; +} + +.icon-guanbi:before { + content: "\e600"; +} + +.icon-geren:before { + content: "\e61e"; +} + +.icon-lujing16221:before { + content: "\e7d2"; +} + +.icon-hezuo1:before { + content: "\e61c"; +} + +.icon-shehuizuzhi_shequzhiyuanfuwu:before { + content: "\e699"; +} + +.icon-fabuxuqiu:before { content: "\e627"; } -.icon-icon-jiantou2:before { - content: "\e603"; +.icon-chengjiaokehu:before { + content: "\e657"; +} + +.icon-jine:before { + content: "\e658"; +} + +.icon-gongyingshangguanli:before { + content: "\e623"; +} + +.icon-wodehuodong:before { + content: "\e601"; +} + +.icon-chengjiao:before { + content: "\eb91"; +} + +.icon-gongyingshangguanli_icox:before { + content: "\e6ce"; +} + +.icon-huati:before { + content: "\e8b1"; +} + +.icon-huodongshuju:before { + content: "\e635"; +} + +.icon-fabuxuqiu1:before { + content: "\e667"; +} + +.icon-qiyeguanli:before { + content: "\e62f"; +} + +.icon-huati1:before { + content: "\e665"; +} + +.icon-zhaopinxuqiu:before { + content: "\eabd"; +} + +.icon-shequfuwu:before { + content: "\ea69"; +} + +.icon-shequfuwu1:before { + content: "\f74b"; +} + +.icon-zhuceyonghu:before { + content: "\e68c"; +} + +.icon-shehuizuzhiguanli:before { + content: "\e614"; +} + +.icon-10:before { + content: "\e61d"; } diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 302d239..802f8c2 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -10,7 +10,9 @@ .sidebar-container { transition: width 0.28s; width: $sideBarWidth !important; - background-color: $menuBg; + //background-color: $menuBg; + background: linear-gradient(0deg, #2885E1, #46CED3); + box-shadow: 1px 1px 15px 0px rgba(17, 76, 157, 0.2); height: 100%; position: fixed; font-size: 0px; @@ -83,7 +85,7 @@ .is-active{ - background-color: $menuActiveBg !important; + //background-color: $menuActiveBg !important; //border-right: 5px solid $subMenuActiveText !important; } .is-active>.el-submenu__title { @@ -103,7 +105,7 @@ &.is-active{ background-color: $submenuActiveBg !important; border-right: 5px solid $subMenuActiveText !important; - color: $subMenuActiveText !important; + color: $subMenuActiveText !important; } } } @@ -227,6 +229,7 @@ >.el-menu--popup { max-height: 100vh; overflow-y: auto; + background: #46CED3 !important; &::-webkit-scrollbar-track-piece { background: #d3dce6; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 00ed35d..6b3e308 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,16 +1,16 @@ // sidebar -$menuText:#606266; -$menuActiveText:#319bdd; -$subMenuActiveText:#319bdd; //https://github.com/ElemeFE/element/issues/12951 +$menuText:#ffffff; +$menuActiveText:#ffffff; +$subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#ffffff;//#304156 -$menuHover:#4ad8d1; -$menuActiveBg:#4ad8d1; +$menuBg:rgb(255, 255, 255,0);//#304156 +$menuHover:rgba(242, 242, 242, .4); +$menuActiveBg:rgba(242, 242, 242, .4); -$subMenuBg:#ffffff;//#1f2d3d -$subMenuHover:#4ad8d1; -$submenuActiveBg:#4ad8d1; +$subMenuBg:rgb(255, 255, 255,0);//#304156 +$subMenuHover:rgba(242, 242, 242, .4); +$submenuActiveBg:rgba(242, 242, 242, .4); $sideBarWidth: 210px; $primaryColor: #319bdd; diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index d0701b8..7be23a2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -22,7 +22,7 @@
- 团队数量 + 企业主体
@@ -35,7 +35,7 @@
- 预约数量 + 个人用户
@@ -48,7 +48,7 @@
- 游客数量 + 认定企业
diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5ddbf49..6799d15 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,10 +1,15 @@