diff --git a/fuintAdmin/src/views/indexcomponents/centenrindex.vue b/fuintAdmin/src/views/indexcomponents/centenrindex.vue index 621e9500f..a06592a69 100644 --- a/fuintAdmin/src/views/indexcomponents/centenrindex.vue +++ b/fuintAdmin/src/views/indexcomponents/centenrindex.vue @@ -31,21 +31,22 @@
总销售额(元)
- @@ -319,4 +320,9 @@ export default { width: 30%; text-align: center; } +.box-kuang{ + width: 100%; + height: 345px; + overflow: auto; +} diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 9ef43d75c..41ef9cc76 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -102,68 +102,54 @@ -
统计
+ @@ -856,4 +842,18 @@ export default { color: red; font-size: 18px; } + .ds-dbox{ + display: flex; + align-items: center; + box-sizing: border-box; + padding: 20px; + } + .k-one{ + width: 20%; + border-radius: 10px; + border: 1px solid #F5DF1A; + background: rgba(252,238,109,0.1); + box-sizing: border-box; + padding: 20px; + } diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development index 2836caf9a..3f0000c2e 100644 --- a/fuintAdmin_zt/.env.development +++ b/fuintAdmin_zt/.env.development @@ -11,9 +11,8 @@ 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.178:8081' -VUE_APP_SERVER_URL = 'http://192.168.31.54:8085/' + +VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/' # cp端地址 -# VUE_PC_SERVER_URL = 'http://47.95.206.185:85/' +# VUE_PC_SERVER_URL = 'http://192.168.31.72:8081/' diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index ea00df2a1..547e8b897 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -2036,9 +2036,6 @@ export default { }, // 角色过滤 - - - /** 重置密码按钮操作 */ handleResetPwd(row) { diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties index 0d64c6837..4183cdf5c 100644 --- a/fuintBackend/fuint-application/src/main/resources/application.properties +++ b/fuintBackend/fuint-application/src/main/resources/application.properties @@ -1,7 +1,8 @@ # \u57FA\u672C\u914D\u7F6E -server.port=8080 +server.port=8081 env.profile=dev -env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/ + +env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/ #env.properties.path=D:/code/oilSystem/fuintBackend/configure/ #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/