diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java b/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java index 273c9e2c..baf4c40c 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java @@ -138,7 +138,7 @@ public class FamilyActivity extends BaseModel implements Serializable, SysHomeCo sysHomeActivity.setId(this.getId()); sysHomeActivity.setName(this.getActivityName()); sysHomeActivity.setCover(this.getCover()); - sysHomeActivity.setUrl("/platform/family/apply"); + sysHomeActivity.setUrl("/platform/family/apply?id=" + this.getId()); sysHomeActivity.setH5Url("/platform/family/apply/h5?id=" + this.getId()); if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) { sysHomeActivity.setStartDate(this.getActivitySignUpStartTime()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java index 9da05d61..536c1d49 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java @@ -120,7 +120,7 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH sysHomeActivity.setId(this.getId()); sysHomeActivity.setName(this.getActivityName()); sysHomeActivity.setCover(this.getCover()); - sysHomeActivity.setUrl("/platform/trainSignUp/apply"); + sysHomeActivity.setUrl("/platform/trainSignUp/apply?id=" + this.getId()); sysHomeActivity.setH5Url("/platform/trainSignUp/apply/h5?id=" + this.getId()); if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) { sysHomeActivity.setStartDate(this.getActivitySignUpStartTime()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyActivity.java b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyActivity.java index 735ab1f8..43a2f4d1 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyActivity.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyActivity.java @@ -120,7 +120,7 @@ public class LiteracyActivity extends BaseModel implements Serializable, SysHome sysHomeActivity.setId(this.getId()); sysHomeActivity.setName(this.getActivityName()); sysHomeActivity.setCover(this.getCover()); - sysHomeActivity.setUrl("/platform/literacy/apply"); + sysHomeActivity.setUrl("/platform/literacy/apply?id=" + this.getId()); sysHomeActivity.setH5Url("/platform/literacy/apply/h5?id=" + this.getId()); if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) { sysHomeActivity.setStartDate(this.getActivitySignUpStartTime()); diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index f7c7d38e..74868ea6 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -324,48 +324,12 @@ layout("/layouts/v4/baseLayout.html"){ this.menus = res.data window.sessionStorage.setItem("zhgh_sub_app_menus", JSON.stringify(res.data)) this.echoMenus() - // this.matchUrlToMenu() } else { this.menus = [] } }) }, - // 按 URL 精准激活 - matchUrlToMenu() { - // 跳转带过来的地址 - const pathname = window.location.pathname - const find = (list, parentIds = []) => { - for (const m of list) { - if (m.href && pathname.includes(m.href.split('?')[0])) { - return {menu: m, parentIds} - } - if (m.children?.length) { - const hit = find(m.children, [...parentIds, m.id]) - if (hit) return hit - } - } - return null - } - - const hit = find(this.menus) - if (hit) { - // 激活跳转菜单 - this.activeMenuIndex = hit.menu.id - this.openedMenus = hit.parentIds - const app = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app")) - $("#sub-app-container #sidebar-menu .menu-header .menu-title").text(app?.name) - this.$nextTick(() => { - this.menuSelect(hit.menu.id, hit.parentIds) - // 保证内容区对应 - commonUtil.pjaxPush(hit.menu.href) - }) - } else if (!this.activeMenuIndex) { - // 没命中且缓存也没有 → 再降级到第一个 - this.defaultSelect() - } - }, - // 设置应用信息 setAppInfo(app) { if (app) { @@ -389,7 +353,6 @@ layout("/layouts/v4/baseLayout.html"){ if (!this.activeMenuIndex && '/platform/v4/subApp' === window.location.pathname) { this.defaultSelect() } else { - this.hrefSelect() } @@ -419,14 +382,14 @@ layout("/layouts/v4/baseLayout.html"){ const result = findMenuPath(this.menus, window.location.pathname) - this.activeMenuIndex = result[result.length-1] - this.openedMenus = result.map(v=>v.id) + if(result){ + this.activeMenuIndex = result[result.length-1]['id'] + this.openedMenus = result.map(v=>v.id) - this.$nextTick(() => { - this.menuSelect(this.activeMenuIndex, this.openedMenus) - // 使用pjax跳转 - commonUtil.pjaxPush(self.href) - }) + this.$nextTick(() => { + this.menuSelect(this.activeMenuIndex, this.openedMenus) + }) + } }, diff --git a/src/main/resources/views/layouts/platform_h5.html b/src/main/resources/views/layouts/platform_h5.html index d0c34f01..425a5b6f 100644 --- a/src/main/resources/views/layouts/platform_h5.html +++ b/src/main/resources/views/layouts/platform_h5.html @@ -85,6 +85,7 @@ // 禁用vant的表单验证行内错误信息显示 vant.Form.props.showErrorMessage.default = false + vant.ActionSheet.props.lazyRender.default = false function toggleShowBar() { if (["/platform/h5/home", "/platform/home"].includes(window.location.pathname)) { diff --git a/src/main/resources/views/platform/zhgh/activity/family/apply/index.html b/src/main/resources/views/platform/zhgh/activity/family/apply/index.html index c05a7f24..eec4ffc9 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/family/apply/index.html @@ -175,6 +175,8 @@ layout("/layouts/platform.html"){ time: 0, infoRow: {}, infoVisible: false, + + id: GetQueryString("id"), } }, methods: { @@ -201,11 +203,15 @@ layout("/layouts/platform.html"){ if (res.code === 0) { this.tableData = res.data.list this.pageForm.totalCount = res.data.totalCount + if(this.id) { + const activity = this.tableData.find(o => o.id === this.id) + this.onOpen(activity) + } } }) }, }, - async created() { + async mounted() { this.pageData() } }) diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html b/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html index 390d43f5..85793949 100644 --- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html @@ -126,6 +126,8 @@ layout("/layouts/platform.html"){ time: 0, infoRow: {}, infoVisible: false, + + id: GetQueryString("id"), } }, methods: { @@ -143,8 +145,10 @@ layout("/layouts/platform.html"){ return } this.infoVisible = false - this.$refs.guava.view(() => { - this.$refs.courseListRef.onOpen(row) + this.$nextTick(() => { + this.$refs.guava.view(() => { + this.$refs.courseListRef.onOpen(row) + }) }) }, pageData() { @@ -152,11 +156,15 @@ layout("/layouts/platform.html"){ if (res.code === 0) { this.tableData = res.data.list this.pageForm.totalCount = res.data.totalCount + if(this.id) { + const activity = this.tableData.find(o => o.id === this.id) + this.onOpen(activity) + } } }) }, }, - async created() { + mounted() { this.pageData() } }) diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html index a1de14e8..9c6946b8 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html @@ -3,7 +3,7 @@ layout("/layouts/platform_h5.html"){ #-->
- +
@@ -21,7 +21,7 @@ layout("/layouts/platform_h5.html"){ - + - + - + - + @@ -72,6 +73,7 @@ layout("/layouts/platform_h5.html"){ placeholder="请填写出生年月" @click="showDatePicker = true" required + name="birthday" :rules="[{ required: true }]" > @@ -83,12 +85,13 @@ layout("/layouts/platform_h5.html"){ @cancel="showDatePicker=false" > - + @@ -97,6 +100,7 @@ layout("/layouts/platform_h5.html"){ label="所在单位" placeholder="请选择所在单位" readonly + name="unitName" :rules="[{ required: true }]" required > @@ -107,9 +111,10 @@ layout("/layouts/platform_h5.html"){ maxlength="50" clearable required + name="officialCapacity" :rules="[{ required: true }]" > - + - + - + @@ -157,12 +166,13 @@ layout("/layouts/platform_h5.html"){ @cancel="showSubsidyPicker=false" > - + 据学校要求，请您填写【华夏银行工资卡号】为收款账户
- + - + - + - +