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:
齐天大圣 2024-06-05 16:29:19 +08:00
commit c392e64f59
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin/.env.development
View File

@ -11,8 +11,6 @@ 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:8081'
VUE_APP_SERVER_URL = 'http://localhost:8080/'
# http://192.168.0.121:8080/

7
fuintAdmin_zt/.env.development
View File

@ -11,8 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
VUE_APP_SERVER_URL = 'http://localhost:8080/'
# cp端地址
VUE_PC_SERVER_URL = 'http://47.95.206.185:85/'
# VUE_PC_SERVER_URL = 'http://47.95.206.185:85/'

2
fuintBackend/configure/dev/application.properties
View File

@ -33,7 +33,7 @@ spring.redis.pool.min-idle=0
spring.redis.timeout=5000
# \u7CFB\u7EDF\u540D\u79F0
system.name = \u84DD\u9CB8\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF
system.name = \u767E\u4E1A\u5174\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF
# \u524D\u7AEFh5\u5730\u5740
website.url=https://www.fuint.cn/h5/

2
fuintBackend/configure/prod/application.properties
View File

@ -33,7 +33,7 @@ spring.redis.pool.min-idle=0
spring.redis.timeout=5000
# \u7CFB\u7EDF\u540D\u79F0
system.name = \u84DD\u9CB8\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF
system.name = \u767E\u4E1A\u5174\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF
# \u524D\u7AEFh5\u5730\u5740
website.url=https://www.fuint.cn/h5/

4
fuintCashierWeb/.env.development
View File

@ -11,5 +11,5 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
#VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'
VUE_APP_SERVER_URL = 'http://localhost:8080/'

2
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -734,7 +734,7 @@
@click="recharge(index)">
<!-- <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>-->
<div style="font-size: 14px">售价<span style="color: #00afff;">{{ item.rechargeBalance }}</span>元</div>
<div style="font-size: 14px">锁价<span style="color: #00afff;">{{ item.lockupPrice }}</span>/升</div>
<div style="font-size: 14px">锁价<span style="color: #00afff;">{{ item.lockPrice }}</span>/升</div>
</div>
</div>
</el-col>