diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b5a974b..43968f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8282 server.session.timeout=7200 server.context-path=/fourcal app.version=0.0.1 -spring.profiles.active=prod +spring.profiles.active=sit spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js index 7779882..88e1cee 100644 --- a/src/main/resources/static/assets/js/project_common.js +++ b/src/main/resources/static/assets/js/project_common.js @@ -36,6 +36,9 @@ function f2(x) { * @returns {string} */ function f2Fixed(f) { + if(!x){ + return f2Fixed(0); + } //return Number(f).toFixed(2); //格式化413,423,423.24 f = Number(f).toLocaleString('en-US',{minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true});