diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java index c1ab941a..f6c8cd73 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java @@ -72,7 +72,7 @@ public class MemberApplyBranchApprovalInterceptor implements FlowInterceptor { sysUser.setId(record.getUserId()); sysUser.setMember(true); // 这是HMC的 - sysUser.setPreparedBy("会员"); +// sysUser.setPreparedBy("会员"); dao.updateIgnoreNull(sysUser); // 还要设置会员角色 diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java index 68760ab6..5aae4459 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java @@ -328,7 +328,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement dao().insert(userRole); } // 杭医特有,其他学校请删除 - record.setPreparedBy("会员"); +// record.setPreparedBy("会员"); } else { // if (record.getIsExitActivityMemberScope() != null && record.getIsExitActivityMemberScope()) { // dao().clear(ActivityUserScope.class, Cnd.where("userId", "=", userId).and("groupId", "=", 1)); @@ -336,7 +336,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement // 非会员取消会员角色 dao().clear(Sys_user_role.class, Cnd.where("userId", "=", userId).and("roleId", "=", role.getId())); // 杭医特有,其他学校请删除 - record.setPreparedBy("教职工"); +// record.setPreparedBy("教职工"); } // // 加入福利会员 是否加入福利项目 diff --git a/src/main/resources/static/assets/platform/img/v4/home-bg.png b/src/main/resources/static/assets/platform/img/v4/home-bg.png index e5683530..84043966 100644 Binary files a/src/main/resources/static/assets/platform/img/v4/home-bg.png and b/src/main/resources/static/assets/platform/img/v4/home-bg.png differ diff --git a/src/main/resources/static/assets/platform/img/v4/person-center/img1.png b/src/main/resources/static/assets/platform/img/v4/person-center/img1.png index 6cc89e60..b5cb3f3d 100644 Binary files a/src/main/resources/static/assets/platform/img/v4/person-center/img1.png and b/src/main/resources/static/assets/platform/img/v4/person-center/img1.png differ diff --git a/src/main/resources/views/layouts/v4/personCenter.html b/src/main/resources/views/layouts/v4/personCenter.html index e6731ede..fbcff8ac 100644 --- a/src/main/resources/views/layouts/v4/personCenter.html +++ b/src/main/resources/views/layouts/v4/personCenter.html @@ -16,7 +16,7 @@ layout("/layouts/v4/baseLayout.html"){ } .v4-person-basic-info { - height: 150px; + height: 250px; background: url("/assets/platform/img/v4/person-center/img1.png"); background-size: cover; padding: 20px 50px 30px; @@ -28,6 +28,8 @@ layout("/layouts/v4/baseLayout.html"){ height: 100px; margin-right: 40px; flex-shrink: 0; + position: relative; + top: 25px; } .v4-person-basic-info .info_img img { @@ -134,4 +136,4 @@ layout("/layouts/v4/baseLayout.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js index 61c7158c..ea148dec 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js @@ -350,6 +350,7 @@ const MEMBER_CHANGE = { }, methods: { getUnionName(val){ + debugger const data = this.units.find(v => v.id === val) this.$set(this.formData, 'unionName', data ? data.unionName : '') },