合并冲突

# Conflicts:
#	.env.development

.env.development

@@ -4,7 +4,6 @@ VUE_APP_ENV = '物业(测试)'
 NODE_ENV = 'production'
 
 # base api
-# 玫苑
-#VUE_APP_BASE_API = 'http://101.201.121.115:8092'
 # 和瑞 
-VUE_APP_BASE_API = 'http://101.201.121.115:8094'
+VUE_APP_BASE_API = 'http://8.131.69.197:8094'
+

.env.production

@@ -4,7 +4,6 @@ VUE_APP_ENV = '物业(测试)'
 NODE_ENV = 'production'
 
 # base api
-# 玫苑
-# VUE_APP_BASE_API = 'http://101.201.121.115:8092'
 # 和瑞 
-VUE_APP_BASE_API = 'http://101.201.121.115:8094'
+VUE_APP_BASE_API = 'http://8.131.69.197:8094'
+

.env.staging

@@ -4,8 +4,6 @@ VUE_APP_ENV = '物业(测试)'
 NODE_ENV = 'production'
 
 # base api
-# 玫苑
-# VUE_APP_BASE_API = 'http://101.201.121.115:8092'
 # 和瑞 
-VUE_APP_BASE_API = 'http://101.201.121.115:8094'
+VUE_APP_BASE_API = 'http://8.131.69.197:8094'
 

src/views/login/index.vue

@@ -237,7 +237,7 @@ $cursor: #fff;
   }
 
   .el-form-item {
-    border-bottom: 1px solid #248af0;
+    border-bottom: 1px solid #95B6F1;
     color: #1467ff;
   }
 }
@@ -254,7 +254,7 @@ $light_gray: #eee;
   background-color: $bg;
   overflow: hidden;
   background-image: url('../../assets/imgs/login_bg.png');
-  background-size: 60% 100%;
+  background-size: 100% 100%;
   background-repeat: no-repeat;
   .login-form {
     position: relative;
@@ -279,7 +279,7 @@ $light_gray: #eee;
   .title-container {
     position: relative;
     .title {
-      background: linear-gradient(180deg, #399cff 0%, #0969c4 100%);
+      background: linear-gradient(180deg, #1467FF 0%, #5F97FF 100%);
       background-clip: text;
       color: transparent;
       margin: 0px auto 40px auto;