diff --git a/jshERP-web/public/static/favicon.ico b/jshERP-web/public/static/favicon.ico index 14d69bef..2355a6cf 100644 Binary files a/jshERP-web/public/static/favicon.ico and b/jshERP-web/public/static/favicon.ico differ diff --git a/jshERP-web/src/components/layouts/UserLayout.vue b/jshERP-web/src/components/layouts/UserLayout.vue index 6914e192..c7418a0e 100644 --- a/jshERP-web/src/components/layouts/UserLayout.vue +++ b/jshERP-web/src/components/layouts/UserLayout.vue @@ -63,7 +63,6 @@ 取消
-
管伊佳ERP为华夏ERP旗下产品
diff --git a/jshERP-web/src/components/page/GlobalHeader.vue b/jshERP-web/src/components/page/GlobalHeader.vue index ae5164ba..7515396c 100644 --- a/jshERP-web/src/components/page/GlobalHeader.vue +++ b/jshERP-web/src/components/page/GlobalHeader.vue @@ -14,6 +14,7 @@ {{ companyName }} {{ systemTitle }} + 华夏ERP正式更名为管伊佳ERP,请尽快使用新网址:https://cloud.gyjerp.com @@ -87,6 +88,7 @@ headerBarFixed: false, systemTitle: window.SYS_TITLE, companyName: '', + isShowChange: false, //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮----- topMenuStyle: { headerIndexLeft: {}, @@ -121,6 +123,11 @@ }, created () { this.initSystemConfig() + if(window.location.host === 'cloud.huaxiaerp.vip' || window.location.host === 'cloud.huaxiaerp.com') { + this.isShowChange = true + } else { + this.isShowChange = false + } }, methods: { handleScroll() { @@ -228,6 +235,18 @@ padding-left:16px } + .change-title { + font-size:14px; + padding-left:16px; + color:yellow; + } + + .change-title a { + font-size:14px; + color:yellow; + text-decoration:underline; + } + /* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/ \ No newline at end of file diff --git a/jshERP-web/src/components/tools/UserMenu.vue b/jshERP-web/src/components/tools/UserMenu.vue index 0d4fb494..982640ca 100644 --- a/jshERP-web/src/components/tools/UserMenu.vue +++ b/jshERP-web/src/components/tools/UserMenu.vue @@ -3,7 +3,7 @@ - 华夏ERP网络版158元1年 + 管伊佳ERP网络版158元1年 diff --git a/jshERP-web/src/views/dashboard/IndexChart.vue b/jshERP-web/src/views/dashboard/IndexChart.vue index 7541baac..f89f12a3 100644 --- a/jshERP-web/src/views/dashboard/IndexChart.vue +++ b/jshERP-web/src/views/dashboard/IndexChart.vue @@ -131,7 +131,7 @@
- 华夏ERP微信小程序 + 管伊佳ERP微信小程序 © 2015-2030 {{systemTitle}} V3.3