Merge remote-tracking branch 'origin/master'

fuintAdmin/src/views/login.vue

@@ -142,12 +142,12 @@
 <!--      </div>-->
 
 
-      <div class="login-form">
+<!--      <div class="login-form">-->
 
-         <div class="copy-right">
-           <span>Copyright © 2020-2023 <a class="link" href="https://www.fuint.cn">fuint.cn</a> All Rights Reserved.</span>
-          </div>
-      </div>
+<!--         <div class="copy-right">-->
+<!--           <span>Copyright © 2020-2023 <a class="link" href="https://www.fuint.cn">fuint.cn</a> All Rights Reserved.</span>-->
+<!--          </div>-->
+<!--      </div>-->
   </div>
 </template>
 
@@ -314,7 +314,7 @@ export default {
   height: 100vh;
   width: 100%;
   position: relative;
-  background-image: url("../assets/images/loginback.png");
+  background-image: url("../assets/images/backbbj.png");
   overflow: hidden;
   background-size: cover;
   background-repeat: no-repeat;

fuintCashierWeb/src/views/login/index.vue

@@ -319,7 +319,8 @@ $light_gray: #eee;
   height: 100vh;
   width: 100%;
   position: relative;
-  background-image: url("../../assets/images/loginback.png");
+  background-image: url("../../assets/images/backbbj.png");
+  //background-image: url("../assets/images/backbbj.png");
   overflow: hidden;
   background-size: cover;
   background-repeat: no-repeat;

gasStation-uni/config.js

@@ -2,7 +2,11 @@
 module.exports = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	// baseUrl: 'http://192.168.0.196:8081/',
+<<<<<<< HEAD
+	baseUrl: 'http://192.168.1.6:8008/',
+=======
 	baseUrl: 'http://192.168.0.196:8080/',
+>>>>>>> 6a67ef9347914e251c82bfcd14c04a8964fd161f
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',