server_commit

src/main/java/io/v/nutz/meeting/controller/pc/MeetingManageController.java

@@ -188,7 +188,8 @@ public class MeetingManageController {
         Sql sql = Sqls.create("""
                 SELECT
                 	u.username,
-                	u.loginname
+                	u.loginname,
+                	u.mobile
                 FROM
                 	`meeting_user` mu
                 	LEFT JOIN USER u ON mu.userid = u.id
@@ -198,7 +199,7 @@ public class MeetingManageController {
         cnd.and("mu.meetingId", "=", id);
         sql.setCondition(cnd);
         List<NutMap> list = meetingManageService.listMap(sql);
-        List<String> loginnameList = list.stream().map(o -> o.getString("loginname")).collect(Collectors.toList());
+        List<String> sendUserList = list.stream().map(o -> o.getString("mobile")).collect(Collectors.toList());
 
         //生成短链
         String shortUrl;
@@ -214,15 +215,14 @@ public class MeetingManageController {
         } else {
             content += "，";
         }
-        content += "请点击" + Globals.AppDomain + shortUrl + "，确认是否参加。";
+        content += "请点击" + Globals.AppDomain + "/s/" + shortUrl + "，确认是否参加。";
-        System.out.println(content);
 
         ShortUrl sUrl = new ShortUrl();
         sUrl.setShortUrl(shortUrl);
         sUrl.setRealUrl("/mobile/meeting/notify?meetingId=" + id);
         dao.insert(sUrl);
 
-        msgNotifyService.sendMsg(List.of("msg"), loginnameList, content);
+        msgNotifyService.sendMsg(List.of("msg"), sendUserList, content);
         return null;
     }
 

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

@@ -24,6 +24,12 @@
     <link rel="stylesheet" href="${base!}/assets/platform/plugins/video/css/video-js.min.css">
     <link rel="stylesheet" href="${base!}/assets/platform/css/vivify.min.css">
 
+    <script>
+        window._AMapSecurityConfig = {
+            securityJsCode: '4fa1e1aeabba7eb9518129cf57ab17c1'
+        }
+    </script>
+
     <!-- import Vue before Element -->
     <script src="${base!}/assets/platform/plugins/vue/vue.min.js"></script>
 
@@ -70,7 +76,7 @@
     <script src="${base!}/assets/platform/plugins/wangeditor/wangEditor.js"></script>
     <!--    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/wangeditor@4.6.15/dist/wangEditor.min.js"></script>-->
     <script type="text/javascript"
-            src="https://webapi.amap.com/maps?v=1.4.15&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.PlaceSearch"></script>
+            src="https://webapi.amap.com/maps?v=1.4.15&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.PlaceSearch"></script>
 
     <!--viewer-->
     <script src="${base!}/assets/platform/plugins/viewer/viewer.min.js"></script>

src/main/resources/views/mobile/home.html

@@ -346,8 +346,8 @@ layout("/mobile/platform.html"){
 
     <div v-if="paramType === '大病互助'"></div>
 
-    <div v-if="paramType === '建言献策'">
+    <div v-if="paramType === '活动管理'">
-        <div class="van-sidebar-item van-sidebar-item&#45;&#45;select">
+        <!--<div class="van-sidebar-item van-sidebar-item&#45;&#45;select">
             疗休养
         </div>
         <van-grid :border="false" :column-num="3">
@@ -360,7 +360,7 @@ layout("/mobile/platform.html"){
                 <image src="/assets/mobile/svg/proposal/cx.svg"></image>
                 <span class="icon_text"> 我的疗休养</span>
             </van-grid-item>
-        </van-grid>
+        </van-grid>-->
 
 
         <div class="van-sidebar-item van-sidebar-item&#45;&#45;select">

src/main/resources/views/mobile/newHome.html

@@ -115,13 +115,13 @@ layout("/mobile/platform.html"){
                     {
                         src: '/assets/platform/img/quickentry/db.png',
                         text: '大病互助',
-                        isOpen: true,
+                        isOpen: false,
                         backGroundColor: '#dd5858'
                     },
                     {
                         src: '/assets/platform/img/quickentry/jy.png',
                         text: '建言献策',
-                        isOpen: true,
+                        isOpen: false,
                         backGroundColor: '#2fbabf'
                     }
                 ]

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

@@ -14,6 +14,12 @@
     <link rel="stylesheet" href="${base!}/assets/mobile/css/theme.css">
     <link rel="stylesheet" href="${base!}/assets/mobile/css/main.css">
 
+    <script>
+        window._AMapSecurityConfig = {
+            securityJsCode: '4fa1e1aeabba7eb9518129cf57ab17c1'
+        }
+    </script>
+
     <script src="${base!}/assets/platform/plugins/vue/vue.min.js"></script>
     <script src="${base!}/assets/platform/plugins/vant/vant.min.js"></script>
     <script src="${base!}/assets/platform/plugins/vue-loader/httpVueLoader.js"></script>
@@ -46,7 +52,7 @@
     <script src="${base!}/assets/platform/js/scannerQrCodeJs.js"></script>
 
     <script type="text/javascript"
-            src="https://webapi.amap.com/maps?v=2.0&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.Geolocation"></script>
+            src="https://webapi.amap.com/maps?v=2.0&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.Geolocation"></script>
 
     <script src="https://cdn-go.cn/cdn/vod-js-sdk-v6/latest/vod-js-sdk-v6.js"></script>
     <link href="https://web.sdk.qcloud.com/player/tcplayer/release/v4.5.2/tcplayer.min.css" rel="stylesheet"/>

src/main/resources/views/platform/wakeshome/review/statistics.html

@@ -329,22 +329,20 @@ layout("/layouts/platform.html"){
                     window.open(loc() + '/doDownLoadZipByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id)
                 }
             },
-            downloadFilesByUnion(row) {
+            async downloadFilesByUnion(row) {
-                const result = this.validateHasFiles({unionId: row.id, zbId: this.pageForm.zbId})
+                const result = await this.validateHasFiles({unionId: row.id, zbId: this.pageForm.zbId})
-                if (!result) {
+                if (result) {
-                    return
+                    window.open(loc() + '/exportFilesByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id)
                 }
-                window.open(loc() + '/exportFilesByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id)
             },
             downloadByPeoId(row) {
                 window.open(loc() + '/exportByPeoId?peoId=' + row.id)
             },
             async downloadFilesByPeoId(row) {
-                const result = this.validateHasFiles({peoId: row.id})
+                const result = await this.validateHasFiles({peoId: row.id})
-                if (!result) {
+                if (result) {
-                    return
+                    window.open(loc() + '/exportFilesByPeoId?peoId=' + row.id)
                 }
-                window.open(loc() + '/exportFilesByPeoId?peoId=' + row.id)
             },
             async validateHasFiles(data) {
                 const res = await $.post('/platform/wakeshome/review/statistics/validateHasFiles', {