diff --git a/src/main/java/com/budwk/app/base/constant/RoleConstant.java b/src/main/java/com/budwk/app/base/constant/RoleConstant.java index c5a8af7a..0458b49c 100644 --- a/src/main/java/com/budwk/app/base/constant/RoleConstant.java +++ b/src/main/java/com/budwk/app/base/constant/RoleConstant.java @@ -84,6 +84,7 @@ RoleConstant { LOVE_ASSIST_WORK_GROUP_LEADER("爱心扶助小组组长"), LOVE_ASSIST_WORK_GROUP_MEMBER("爱心扶助小组审批员"), + PSYCHOLOGY_DOCTOR("心理咨询师"), ; /** * 避免和枚举类的name冲突 diff --git a/src/main/java/com/budwk/app/base/utils/DateUtil.java b/src/main/java/com/budwk/app/base/utils/DateUtil.java index de04d00e..8724bbe8 100644 --- a/src/main/java/com/budwk/app/base/utils/DateUtil.java +++ b/src/main/java/com/budwk/app/base/utils/DateUtil.java @@ -136,4 +136,12 @@ public class DateUtil { return day + "天" + hour + "小时" + min + "分钟"; } + public static long formatDate(String data) { + try { + return new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(data).getTime(); + } catch (ParseException e) { + e.printStackTrace(); + return 0; + } + } } diff --git a/src/main/resources/static/assets/platform/js/util/commonUtil.js b/src/main/resources/static/assets/platform/js/util/commonUtil.js index d6142d61..b16a6d55 100644 --- a/src/main/resources/static/assets/platform/js/util/commonUtil.js +++ b/src/main/resources/static/assets/platform/js/util/commonUtil.js @@ -17,7 +17,7 @@ const commonUtil = { if (response.config.responseType === "blob") { return response } - if (response.data && response.data.code !== 0 && response.data.code !== 200) { + if (response.data && response.data.code !== 0 && response.data.code !== 99) { if (isMobile) { vant.Toast(response.data.msg) } else { @@ -25,7 +25,7 @@ const commonUtil = { } return Promise.reject(response.data) } - return response.data || response.result + return response.data }, (error) => { const userAgent = navigator.userAgent || navigator.vendor || window.opera @@ -217,7 +217,6 @@ const commonUtil = { function doSm2Encrypt(msgString) { return sm2.doEncrypt(msgString, publicKey, cipherMode) } - // SM2数组加密 function doSm2ArrayEncrypt(msgString) { return sm2.doEncrypt(msgString, publicKey, cipherMode)