commit

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冲突

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;
+        }
+    }
 }

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) {
+                if (response.data && response.data.code !== 0 && response.data.code !== 99) {
                     if (isMobile) {
                         vant.Toast(response.data.msg)
                     } else {

src/main/resources/views/layouts/platform.html

@@ -44,6 +44,7 @@
         <script src="${base!}/assets/platform/plugins/smooth-signature/index.umd.min.js"></script>
         <!--二维码-->
         <script src="${base!}/assets/platform/plugins/vue-qrcode/index.js"></script>
+        <script src="${base!}/assets/platform/plugins/jr-qrcode/jr-qrcode.js"></script>
         <!--富文本编辑器-->
         <link rel="stylesheet" href="${base!}/assets/platform/plugins/wangEditor4/wangEditor.css" />
         <script src="${base!}/assets/platform/plugins/wangEditor4/wangEditor.js"></script>
@@ -79,15 +80,17 @@
         <script src="${base!}/assets/platform/js/mixin/styleMixin.js"></script>
         <script src="${base!}/assets/platform/js/tool/businessTool.js"></script>
 
+        <script
+                type="text/javascript"
+                src="https://webapi.amap.com/maps?v=2.0&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.Geolocation,AMap.PlaceSearch"
+        ></script>
+
         <script>
             window._AMapSecurityConfig = {
                 securityJsCode: "4fa1e1aeabba7eb9518129cf57ab17c1"
             }
         </script>
-        <!--        <script-->
+
-        <!--            type="text/javascript"-->
-        <!--            src="https://webapi.amap.com/maps?v=2.0&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.Geolocation,AMap.PlaceSearch"-->
-        <!--        ></script>-->
 
         <script type="text/javascript">
             Vue.config.devtools = false