commit

src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java

@@ -308,7 +308,7 @@ public class ActivityBasicScopeController {
                         COLUMN_COMMENT
                     FROM INFORMATION_SCHEMA.COLUMNS
                         WHERE TABLE_NAME = 'sys_user'
-                        AND TABLE_SCHEMA = 'zhgh_jiangnan'
+                        AND TABLE_SCHEMA = 'zhgh_hrbnu'
                     """);
             List<NutMap> sqlDataList = activityBasicScopeService.listMap(sql);
 //            sqlDataList.forEach(v -> v.put("DATA_TYPE", new String((byte[]) v.get("DATA_TYPE"))));

src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java

@@ -475,9 +475,9 @@ public class MemberChangeManageController {
         if (!ShiroUtil.hasAnyRoles("sysadmin,A06,flwyh01")) {
             cnd.and("u.unionid", "=", Vi.getUnionId());
         }
-        for (String s : sqlCnd) {
-            cnd.and(new Static(s));
-        }
+//        for (String s : sqlCnd) {
+//            cnd.and(new Static(s));
+//        }
         cnd.groupBy("u.loginname");
         cnd.asc("u.loginname");
         sql.setCondition(cnd);

src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpType.java

@@ -53,7 +53,7 @@ public class TrainSignUpType extends BaseModel implements Serializable {
     @Column
     @Comment("本人纳入总人数")
     @ColDefine(type = ColType.BOOLEAN)
-    @Default("1")
+    @Default(value = "1")
     private Boolean selfAddFamily;
 
     @Many(field = "typeId")

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

@@ -211,14 +211,12 @@
                     <a href="javascript:" slot="reference" @click="toggleMenuPopover">
                         <i class="fa fa-th-large" aria-hidden="true"></i>
                         {{selectEntranceModule ? selectEntranceModule.moduleName : '应用中心'}}
+
+                        <i class="el-icon-sort"></i>
+                        切换应用
                     </a>
                 </el-popover>
             </li>
-
-            <!--<li style="cursor: pointer" @click="menuPopover=true">
-                <i class="el-icon-sort"></i>
-                切换应用
-            </li>-->
         </ul>
 
         <!--        <el-breadcrumb separator-class="el-icon-arrow-right" style="line-height: 50px">-->
@@ -454,9 +452,9 @@
         },
         methods: {
             toggleMenuPopover() {
-                setTimeout(() => {
+                /*setTimeout(() => {
                     this.menuPopover = !this.menuPopover
-                }, 300)
+                }, 300)*/
             },
             goSetAppCenter() {
 

src/main/resources/views/mobile/healthCheckup/checkUp.html

@@ -111,6 +111,14 @@ layout("/mobile/platform.html"){
         /*margin-top: 30px;*/
     }
 
+    .right_content {
+        width: calc(100% - 150px);
+        padding-left: 20px;
+        padding-right: 10px;
+        position: relative;
+        height: 100px
+    }
+
 </style>
 
 <div id="app" v-cloak>
@@ -134,8 +142,15 @@ layout("/mobile/platform.html"){
                         <van-cell-group>
                             <van-cell title="" :key="item.id" v-for="item in project.healthCheckupProjectSubjects">
                                 <template #label>
-                                    <div style="display: flex; justify-content: space-between; margin-left: 8px">
+                                    <div style="display: flex; justify-content: space-between; width: 100%; padding: 10px 0">
+                                        <van-image
+                                                :src="FILE_STREAM_PREVIEW_ADDRESS+'?id='+item.imgUrl"
+                                                fit="contain"
+                                                style="width: 60px; height: 60px; border-radius: 10px; margin-left: 10px"
+                                        ></van-image>
                                         <div>{{ item.optionName }}</div>
+                                    </div>
+                                    <div style="display: flex; justify-content: flex-end; margin-top: -20px">
                                         <div @click="viewDesc(item)" style="color: #0e78c5">查看说明</div>
                                     </div>
                                 </template>

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

@@ -36,7 +36,7 @@ layout("/mobile/platform.html"){
     }
 
     .menu_item {
-        width: calc(100% / 4);
+        width: calc(100% / 3);
         display: flex;
         align-items: center;
         justify-content: center;

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

@@ -26,11 +26,11 @@ layout("/mobile/platform.html"){
     .content {
         min-height: 380px;
         width: 80%;
-        position: absolute;
         left: 0;
         right: 0;
-        bottom: 100px;
-        margin: auto;
+        margin: 50px auto auto auto;
+        position: relative;
+        z-index: 2;
     }
 
     .header_v {
@@ -74,12 +74,14 @@ layout("/mobile/platform.html"){
     }
 
     .logo {
-        height: 320px;
-        margin-bottom: 20px;
+        height: 300px;
+        position: relative; /* 如果之前使用了绝对定位，改为相对定位 */
+        z-index: 1; /* 确保logo在content下方 */
     }
 
     .logo img {
-        width: 300px;
+        width: 100%;
+        height: 100%;
     }
 
     .verify-img-panel {
@@ -105,7 +107,7 @@ layout("/mobile/platform.html"){
     <div class="content">
         <van-row><h1 style="margin: 0 0;color: #1d1b1b;font-family: 'SourceHanSansCN-Heav">Welcome</h1></van-row>
         <van-row>
-            <span style="color: rgb(160, 160, 160)">欢迎登录智慧工会手机平台</span>
+            <span style="color: rgb(160, 160, 160)">欢迎登录智慧工会移动服务平台</span>
         </van-row>
         <div class="parm_v">
             <van-row style="border-bottom: 1px rgb(230, 230, 230) solid !important">

src/main/resources/views/platform/trainSingUp/manage/trainSignUpType.html

@@ -208,6 +208,7 @@ layout("/layouts/platform.html"){
                     trainMobileSignColumnList: [{isRequired: false}],
                     isBringFamily: false,
                     isAddFamily: null,
+                    selfAddFamily: true,
                 },
                 rules: {
                     lxname: [{required: true, message: '请输入类型名称', trigger: ['change', 'blur']}],
@@ -298,6 +299,7 @@ layout("/layouts/platform.html"){
                 this.formData = {
                     trainMobileSignColumnList: [{isRequired: false}],
                     isBringFamily: false,
+                    selfAddFamily: true,
                 }
                 this.$refs.guava.edit()
                 if (this.$refs["addForm"])