diff --git a/fuintAdmin/vue.config.js b/fuintAdmin/vue.config.js
index c6b8355d2..e80b019cf 100644
--- a/fuintAdmin/vue.config.js
+++ b/fuintAdmin/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
-const name = process.env.VUE_APP_TITLE || '蓝鲸智慧油站系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '百业兴智慧油站系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 81 // 端口
diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development
index 982ea93da..e3ad97772 100644
--- a/fuintAdmin_zt/.env.development
+++ b/fuintAdmin_zt/.env.development
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 蓝鲸智慧油站系统
+VUE_APP_TITLE = 百业兴智慧油站系统
# 开发环境配置
ENV = 'development'
@@ -11,6 +11,8 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
-#VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'
-VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/'
+VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
+# cp端地址
+VUE_PC_SERVER_URL = 'http://47.95.206.185:85/'
+
diff --git a/fuintAdmin_zt/.env.production b/fuintAdmin_zt/.env.production
index aa94bd113..f50347055 100644
--- a/fuintAdmin_zt/.env.production
+++ b/fuintAdmin_zt/.env.production
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 蓝鲸智慧油站系统
+VUE_APP_TITLE = 百业兴智慧油站系统
# 生产环境配置
ENV = 'production'
@@ -14,4 +14,4 @@ VUE_APP_PUBLIC_PATH = '/oilZt/'
VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
# cp端地址
-VUE_PC_SERVER_URL = 'http://192.168.1.6:82/'
+VUE_PC_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
diff --git a/fuintAdmin_zt/.env.staging b/fuintAdmin_zt/.env.staging
index de892d03f..8fef4f477 100644
--- a/fuintAdmin_zt/.env.staging
+++ b/fuintAdmin_zt/.env.staging
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 蓝鲸智慧油站系统
+VUE_APP_TITLE = 百业兴智慧油站系统
# 测试环境配置
ENV = 'staging'
@@ -11,6 +11,6 @@ VUE_APP_BASE_API = '/stage-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.1.6:8008/'
+VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
# cp端地址
-VUE_PC_SERVER_URL = 'http://192.168.1.6:82/'
+VUE_PC_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
diff --git a/fuintAdmin_zt/src/assets/styles/variables.scss b/fuintAdmin_zt/src/assets/styles/variables.scss
index eb9939779..54baf043c 100644
--- a/fuintAdmin_zt/src/assets/styles/variables.scss
+++ b/fuintAdmin_zt/src/assets/styles/variables.scss
@@ -9,17 +9,17 @@ $yellow:#FEC171;
$panGreen: #30B08F;
// 默认菜单主题风格
-$base-menu-color:#ffffff;// 菜单全部字体颜色
-$base-menu-color-active:#ffffff;// 父级菜单激活的字体颜色
-$base-menu-background:#5a91ff;
-$base-logo-title-color: #ffffff;
+$base-menu-color:#144a6e;// 菜单全部字体颜色
+$base-menu-color-active:#144a6e;// 父级菜单激活的字体颜色
+$base-menu-background:#fff;
+$base-logo-title-color: #455ced;
$base-menu-light-color:#ffffff;
$base-menu-light-background:#ffffff;
$base-logo-light-title-color: #1a5982;
-$base-sub-menu-background: #4e77cc;//展开的背景色
-$base-sub-menu-hover:#001528;
+$base-sub-menu-background: #c6c6c6;//展开的背景色
+$base-sub-menu-hover: #adadad;
$base-sidebar-width: 200px;
diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index 3378ea6be..e3de86a63 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -28,11 +28,9 @@
-
-

-
+
- 蓝鲸智慧油站欢迎您
+ 百业兴智慧油站欢迎您
@@ -107,8 +105,8 @@ export default {
height: 90px;
overflow: hidden;
position: relative;
- background: #144a6e;
- background-image: url("../../assets/images/kkx.png") ;
+ background: #455ced;
+ //background-image: url("../../assets/images/kkx.png") ;
background-size: 100% 100%;
background-size: cover;
background-repeat: no-repeat;
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue b/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
index 116863e0a..20d78d211 100644
--- a/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
+++ b/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
@@ -2,11 +2,11 @@