diff --git a/.env.development b/.env.development index eec3e74..15fe17d 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,6 @@ ENV='development' # base api -VUE_APP_BASE_API=http://starter.ali251.langye.net -VUE_APP_UPLOAD_API=http://starter.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API=http://yikangyang.ali251.langye.net +VUE_APP_UPLOAD_API=http://yikangyang.ali251.langye.net/api/admin/upload-file VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview diff --git a/.env.production b/.env.production index aaeb0c2..1acfcce 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ # just a flag -ENV = 'production' +ENV='production' # base api -VUE_APP_BASE_API = http://starter.ali251.langye.net -VUE_APP_UPLOAD_API =http://starter.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API=http://yikangyang.ali251.langye.net +VUE_APP_UPLOAD_API=http://yikangyang.ali251.langye.net/api/admin/upload-file VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview diff --git a/.env.staging b/.env.staging index abeafcc..1727358 100644 --- a/.env.staging +++ b/.env.staging @@ -1,9 +1,9 @@ -NODE_ENV = production +NODE_ENV=production # just a flag -ENV = 'staging' +ENV='staging' # base api -VUE_APP_BASE_API=http://starter.ali251.langye.net -VUE_APP_UPLOAD_API=http://starter.ali251.langye.net/api/admin/upload-file - +VUE_APP_BASE_API=http://yikangyang.ali251.langye.net +VUE_APP_UPLOAD_API=http://yikangyang.ali251.langye.net/api/admin/upload-file +VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview diff --git a/src/assets/logo.png b/src/assets/logo.png index 6405818..fa54a9f 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue index 8c95167..370888b 100644 --- a/src/components/LxHeader/index.vue +++ b/src/components/LxHeader/index.vue @@ -31,7 +31,7 @@ export default { }, }; - diff --git a/src/settings.js b/src/settings.js index 8c81eae..e1d2f09 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,7 +1,7 @@ module.exports = { - title: '朗业基础平台', - TOKEN_KEY: 'starter_token', + title: '医康养', + TOKEN_KEY: 'yikangyang_web_token', /** * @type {boolean} true | false * @description Whether fix the header diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 1f62d31..9169d0a 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,7 +1,7 @@ /* 改变主题色变量 */ -$--color-primary: #0077CC; +$--color-primary: #b3241d; /* 改变 icon 字体路径变量,必需 */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; -@import "~element-ui/packages/theme-chalk/src/index"; \ No newline at end of file +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 0968334..57f9e8c 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -11,7 +11,7 @@ transition: width 0.28s; width: $sideBarWidth !important; //background-color: $menuBg; - background: linear-gradient(180deg, #0284cd, #0077CC); + background: transparent; box-shadow: 1px 1px 15px 0px rgba(17, 76, 157, 0.2); height: 100%; position: fixed; @@ -89,7 +89,7 @@ //border-right: 5px solid $subMenuActiveText !important; } .is-active>.el-submenu__title { - color: $subMenuActiveText !important; + color: $primaryColor !important; } @@ -104,7 +104,7 @@ } &.is-active{ background-color: $submenuActiveBg !important; - border-right: 5px solid $subMenuActiveText !important; + border-right: 5px solid $subMenuHover !important; color: $subMenuActiveText !important; } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 03544c7..3802205 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,19 +1,20 @@ +$primaryColor: #b3241d; + // sidebar -$menuText:#ffffff; +$menuText:#606266; $menuActiveText:#ffffff; $subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:rgb(255, 255, 255,0);//#304156 -$menuHover:rgba(242, 242, 242, .4); -$menuActiveBg:rgba(242, 242, 242, .4); +$menuBg:#ffffff;//#304156 +$menuHover:#d96d68; +$menuActiveBg:#b3241d; -$subMenuBg:rgb(255, 255, 255,0);//#304156 -$subMenuHover:rgba(242, 242, 242, .4); -$submenuActiveBg:rgba(242, 242, 242, .4); +$subMenuBg:#ffffff;//#1f2d3d +$subMenuHover:#d96d68; +$submenuActiveBg: #b3241d; $sideBarWidth: 210px; -$primaryColor: #0077CC; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { diff --git a/src/styles/viewui-mine.less b/src/styles/viewui-mine.less index 9d4c218..6de2fae 100644 --- a/src/styles/viewui-mine.less +++ b/src/styles/viewui-mine.less @@ -1,4 +1,4 @@ @import '~view-design/src/styles/index.less'; // Here are the variables to cover, such as: -@primary-color: #0077CC; +@primary-color: #b3241d;