commit

src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/applyForm.js

@@ -121,7 +121,7 @@ const applyForm = {
     },
     methods: {
         async getCourseTimeSelectList(o) {
-            const resp = await $.post('/platform/trainSingUp/apply/getCourseTimeSelectList',{ courseId: o.id })
+            const resp = await $.post('/platform/trainSignUp/apply/getCourseTimeSelectList',{ courseId: o.id })
             if (resp.code === 0) {
                 this.courseTimeSelectList = resp.data
             } else {
@@ -144,14 +144,14 @@ const applyForm = {
             let familyCount = this.formData.trainMobileSignColumnList.filter(o => o.columnCode === 'xdqsrs').reduce((sum, item) => {
                 return sum + (Number(item.columnValue) || 0)
             }, 0)
-            const res = await this.$axios.post("/platform/trainSingUp/apply/validateSignUp", {
+            const res = await this.$axios.post("/platform/trainSignUp/apply/validateSignUp", {
                 courseId: this.formData.courseId,
                 currentFamilyNumber: familyCount
             })
             return res.code === 0
         },
         async validateCourseTime() {
-            const res = await this.$axios.post('/platform/trainSingUp/apply/validateSourceSignUp', {
+            const res = await this.$axios.post('/platform/trainSignUp/apply/validateSourceSignUp', {
                 activityCourseId: this.formData.activityCourseId,
                 courseId: this.courseRow.id
             })
@@ -177,7 +177,7 @@ const applyForm = {
                             }
                         })
                         this.formData.mobileColumnsValue = JSON.stringify(mobileColumnsValue)
-                        const resp = await this.$axios.post("/platform/trainSingUp/apply/doSignUp", this.formData)
+                        const resp = await this.$axios.post("/platform/trainSignUp/apply/doSignUp", this.formData)
                         if (resp.code === 0) {
                             this.signDialog = false
                             this.$message.success(resp.msg)

src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/courseList.js

@@ -188,7 +188,7 @@ const courseList = {
         },
         onSign(row) {
             const course = this.courseTypeList.find((v) => v.id === row.courseType)
-            this.$axios.post("/platform/trainSingUp/apply/validateSignUp", {courseId: row.id})
+            this.$axios.post("/platform/trainSignUp/apply/validateSignUp", {courseId: row.id})
                 .then((res) => {
                     if (res.code !== 0) {
                         this.$alert(res.msg, "提示", {
@@ -213,7 +213,7 @@ const courseList = {
                 cancelButtonText: "取消",
                 type: "info"
             }).then(async () => {
-                const resp = await this.$axios.post("/platform/trainSingUp/apply/cancelSignUp", {
+                const resp = await this.$axios.post("/platform/trainSignUp/apply/cancelSignUp", {
                     activityId: row.activityId,
                     courseId: row.id
                 })
@@ -226,7 +226,7 @@ const courseList = {
             })
         },
         async getCourseTypeList() {
-            const resp = await this.$axios.post("/platform/trainSingUp/type/getAllType")
+            const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType")
             if (resp.code === 0) {
                 this.courseTypeList = resp.data
             }

src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html

@@ -24,8 +24,7 @@ layout("/layouts/platform.html"){
                     <el-select v-model="pageForm.activityType" @change="doSearch" style="width: 100%"
                                placeholder="请选择活动状态" filterable>
                         <el-option :value="1" label="全部"></el-option>
-                        <el-option :value="4" label="即将开始"></el-option>
-                        <el-option :value="2" label="报名中"></el-option>
+                        <el-option :value="2" label="即将开始 & 报名中"></el-option>
                         <el-option :value="3" label="已结束"></el-option>
                     </el-select>
                 </search-item>
@@ -59,8 +58,13 @@ layout("/layouts/platform.html"){
                 </el-table-column>
                 <el-table-column label="操作" width="300">
                     <template v-slot="{row}">
-                        <el-button @click="onView(row)" size="mini" type="primary">查看介绍</el-button>
-                        <el-button @click="onOpen(row)" size="mini" type="primary">去报名</el-button>
+                        <template v-if="$moment().isBefore($moment(row.activitySignUpEndTime))">
+                            <el-button @click="onView(row)" size="mini" type="primary">查看介绍</el-button>
+                            <el-button @click="onOpen(row)" size="mini" type="primary">去报名</el-button>
+                        </template>
+                        <template v-if="$moment().isAfter($moment(row.activitySignUpEndTime))">
+                            <el-button size="mini" type="info">已结束</el-button>
+                        </template>
                     </template>
                 </el-table-column>
             </el-table>
@@ -111,7 +115,7 @@ layout("/layouts/platform.html"){
             return {
                 pageForm: {
                     year: this.$moment().format("YYYY"),
-                    activityType: 4
+                    activityType: 2
                 },
                 tableColumns: [
                     { label: "活动名称", prop: "activityName", width: 600},
@@ -144,7 +148,7 @@ layout("/layouts/platform.html"){
                 })
             },
             pageData() {
-                this.$axios.post("/platform/trainSingUp/apply/activityPageData", this.pageForm).then((res) => {
+                this.$axios.post("/platform/trainSignUp/apply/activityPageData", this.pageForm).then((res) => {
                     if (res.code === 0) {
                         this.tableData = res.data.list
                         this.pageForm.totalCount = res.data.totalCount

src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js

@@ -371,7 +371,7 @@ const basicForm = {
             }
         },
         async getRegisterUserCount(courseId) {
-            const resp = await this.$axios.post("/platform/trainSingUp/manage/getRegisterUserCount", { courseId })
+            const resp = await this.$axios.post("/platform/trainSignUp/manage/getRegisterUserCount", { courseId })
             return resp.code === 0 ? resp.data : 0
         },
         courseTypeChange(val, row) {
@@ -444,7 +444,7 @@ const basicForm = {
             this.formData.courseList.push({ courseTimeList: [], isMobileSign: false, isReceiveGift: false, reserveMode: 1, courseIsLimitApply: false })
         },
         async historicalActChange(val) {
-            const resp = await this.$axios.post("/platform/trainSingUp/manage/findOne", {id: val})
+            const resp = await this.$axios.post("/platform/trainSignUp/manage/findOne", {id: val})
             if (resp.code === 0) {
                 this.formData = resp.data
                 this.typeChange(this.formData.trainType)
@@ -468,7 +468,7 @@ const basicForm = {
             return data
         },
         async getHistoricalActList() {
-            const resp = await this.$axios.post("/platform/trainSingUp/manage/getHistoricalActList", {})
+            const resp = await this.$axios.post("/platform/trainSignUp/manage/getHistoricalActList", {})
             return resp.data
         },
         async onSave() {
@@ -543,7 +543,7 @@ const basicForm = {
                 type: "warning"
             })
             if (confirm !== "confirm") return
-            const resp = await this.$axios.post("/platform/trainSingUp/manage/doHandle", cloneData)
+            const resp = await this.$axios.post("/platform/trainSignUp/manage/doHandle", cloneData)
             if (resp.code === 0) {
                 this.$message.success(resp.msg)
                 this.step = 1
@@ -554,12 +554,12 @@ const basicForm = {
             }
         },
         async getAllType() {
-            const resp = await this.$axios.post("/platform/trainSingUp/type/getAllType", {})
+            const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType", {})
             return resp.data
         },
         async init(row) {
             if (row && row.id) {
-                const resp = await this.$axios.post("/platform/trainSingUp/manage/findOne", {id: row.id})
+                const resp = await this.$axios.post("/platform/trainSignUp/manage/findOne", {id: row.id})
                 if (resp.code === 0) {
                     this.formData = resp.data
                     this.typeChange(this.formData.trainType)

src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/index.html

@@ -165,7 +165,7 @@ layout("/layouts/platform.html"){
                 })
             },
             openActivityCode(id) {
-                this.activityUrl = location.origin + "/platform/trainSingUp/apply/h5?id=" + id
+                this.activityUrl = location.origin + "/platform/trainSignUp/apply/h5?id=" + id
                 this.codeDialogVisible = true
             },
             makeCode(row) {

src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/info.js

@@ -66,7 +66,7 @@ const info = {
     },
     methods: {
         initData(id) {
-            this.$axios.post("/platform/trainSingUp/manage/findOne", { id: id })
+            this.$axios.post("/platform/trainSignUp/manage/findOne", { id: id })
                 .then((resp) => {
                     if (resp.code === 0) {
                         this.viewData = resp.data

src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/makeQrcode.js

@@ -66,7 +66,7 @@ const makeQrcode = {
             this.courseDialog = true
         },
         makeCourseCode(row) {
-            const url = '/platform/trainSingUp/mine/drivingScan'
+            const url = '/platform/trainSignUp/mine/drivingScan'
             const data = url + '?courseId=' + row.id
             console.log(data)
             const content = jrQrcode.getQrBase64(data)

src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/unionForm.js

@@ -150,7 +150,7 @@ const unionForm = {
                 !this.formData.courseList[this.unionLimitIndex].unionLimit ||
                 this.formData.courseList[this.unionLimitIndex].unionLimit.length === 0
             ) {
-                const resp = await this.$axios.get("/platform/trainSingUp/manage/getUnionLimit", {
+                const resp = await this.$axios.get("/platform/trainSignUp/manage/getUnionLimit", {
                     activityScopeId: this.formData.activityGroupId
                 })
                 if (resp.code === 0) {

src/main/resources/views/platform/zhgh/activity/trainSignUp/userManage/index.html

@@ -133,7 +133,7 @@ layout("/layouts/platform.html"){
                     })
                     return
                 }
-                const resp = await this.$axios.post("/platform/trainSingUp/userManage/getReserveUser", { courseId: this.course.id })
+                const resp = await this.$axios.post("/platform/trainSignUp/userManage/getReserveUser", { courseId: this.course.id })
                 this.reserveTableData = resp.data
                 this.reserveDialogVisible = true
             },
@@ -149,7 +149,7 @@ layout("/layouts/platform.html"){
                 })
                     .then(async () => {
                         const ids = this.multipleSelection.map((o) => o.userId)
-                        const resp = await this.$axios.post("/platform/trainSingUp/userManage/reserveSingUp", {
+                        const resp = await this.$axios.post("/platform/trainSignUp/userManage/reserveSingUp", {
                             ids: JSON.stringify(ids),
                             courseId: this.course.id
                         })
@@ -212,7 +212,7 @@ layout("/layouts/platform.html"){
                 await this.doSearch()
             },
             async getActivityList() {
-                const resp = await this.$axios.post("/platform/trainSingUp/statistics/activityList", { year: this.pageForm.year })
+                const resp = await this.$axios.post("/platform/trainSignUp/statistics/activityList", { year: this.pageForm.year })
                 this.activityList = resp.data
                 if (this.activityList && this.activityList.length > 0) {
                     this.pageForm.activityId = this.activityList[0].id