dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cun-nan 2023-12-05 12:04:15 +08:00
commit e56b940fb5
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fuintAdmin/src/assets/images/backbbj.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB

12
fuintAdmin/src/views/login.vue
View File

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

BIN
fuintCashierWeb/src/assets/images/backbbj.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB

3
fuintCashierWeb/src/views/login/index.vue
View File

@ -319,7 +319,8 @@ $light_gray: #eee;
height: 100vh; height: 100vh;
width: 100%; width: 100%;
position: relative; 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; overflow: hidden;
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;

4
gasStation-uni/config.js
View File

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

BIN
gasStation-uni/static/imgs/fmbj.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 226 KiB

BIN
gasStation-uni/static/imgs/haabbj.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB