commit

src/main/java/io/v/nutz/activity/controller/site/ActivityTypeController.java

@@ -53,7 +53,10 @@ public class ActivityTypeController {
     @ViReturn
     public Object findAll() {
         List<ActivityType> meetingTypeList = dao.query(ActivityType.class, Cnd.NEW().asc("sortNum"));
-        dao.fetchLinks(meetingTypeList, "^auditStateList$");
+        for (ActivityType activityType : meetingTypeList) {
+            dao.fetchLinks(activityType, "^auditStateList$", Cnd.where("module", "=", activityType.getModuleName()));
+        }
+
         for (ActivityType ActivityType : meetingTypeList) {
             List<AuditState> auditStateList = ActivityType.getAuditStateList();
             dao.fetchLinks(auditStateList, "^auditStateUserList$");

src/main/resources/views/mobile/activity/site/reserve.html

@@ -438,8 +438,7 @@ layout("/mobile/platform.html"){
             },
             //获取最新的一个工作日设为当前时间
             getLatestWorkDay() {
-                //1.首先判断今天是不是工作日
-                const weekNum = moment().day()
+                /*const weekNum = moment().day()
                 let selectDate = null
                 if (weekNum === 0) {
                     //周日
@@ -449,15 +448,23 @@ layout("/mobile/platform.html"){
                     selectDate = moment().add(2, 'd')
                 } else {
                     selectDate = moment()
-                }
-                return selectDate
+                }*/
+                let today = moment().format('YYYY-MM-DD')
+                let d
+                do {
+                    d = moment(today).day()
+                    if(!this.site.openWeekTime.includes(d)) {
+                        today = moment(today).add(1, 'd')
+                    }
+                } while (!this.site.openWeekTime.includes(d))
+                return today
             }
         },
         async created() {
             this.site_id = getQueryString('id')
-            this.selectDate = this.getLatestWorkDay()
             await this.getReserve()
             await this.onLoad()
+            this.selectDate = this.getLatestWorkDay()
             this.setWeekList(this.selectDate)
             await this.getMyReservation()
 

src/main/resources/views/platform/activity/site/SiteType.html

@@ -233,7 +233,7 @@ layout("/layouts/platform.html"){
 
             addState() {
                 this.formData.auditStateList.push({
-                    stateId: null,
+                    stateId: this.maxStateId,
                     stateName: null,
                     selectUserId: [],
                     auditStateUserList: [],
@@ -399,4 +399,4 @@ layout("/layouts/platform.html"){
 
 <!--#
 }
-#-->
+#-->