Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_hhu

src/main/resources/views/mobile/meeting/myMeeting.html

@@ -239,7 +239,7 @@ layout("/mobile/platform.html"){
                                     :disabled="moment().valueOf() > moment(o.leaveDeadline).valueOf() ||　o.isCanLeave === false"
                                     @click="needLeave(o, true, true)"
                                     color="#1867b0" size="small" style="margin-right: 8px"
-                                    v-if="${@shiro.hasRole('H04')}"
+                                    v-if="${@shiro.hasRole('jdhdbt01')||@shiro.hasRole('H04')}"
                                     type="primary">替他人请假
                             </van-button>
                             <van-button

src/main/resources/views/mobile/wmhd/applyList.html

@@ -31,9 +31,15 @@ layout("/mobile/platform.html"){
                     <van-cell title="主题" :border="false">{{o.hdname}}</van-cell>
                     <van-cell :border="false" title="创建人">{{o.username}}</van-cell>
                     <van-cell :border="false" title="开启状态">{{o.hdflag?'已开启':'未开启'}}</van-cell>
-                    <van-cell :border="false" title="创建时间">{{o.hdcjsj}}</van-cell>
+                    <!--<van-cell :border="false" title="创建时间">{{o.hdcjsj}}</van-cell>-->
                     <van-cell :border="false" title="开始时间">{{o.hdkssj}}</van-cell>
                     <van-cell :border="false" title="结束时间">{{o.hdjssj}}</van-cell>
+                    <div style="text-align: right">
+                        <van-button type="info" color="#246fb4" size="small" round @click="openView(o)"
+                        style="width: 70px; height: 28px; margin-right: 10px; margin-bottom: 10px">
+                            进入
+                        </van-button>
+                    </div>
                 </van-cell-group>
             </div>
         </van-list>

src/main/resources/views/platform/hd/wmhd/hdMange.html

@@ -450,17 +450,9 @@ layout("/layouts/platform.html"){
 
 
                         <el-form-item label="活动介绍" prop="hdjs">
-                            <el-collapse>
+                            <div id="hdjsEditor"></div>
-                                <el-collapse-item>
-                                    <template slot="title">
-                                        点击展开 <i class="header-icon el-icon-thumb"
-                                                style="margin-left: 5px"></i>
-                                    </template>
-                                    <div id="hdjsEditor"></div>
-                                </el-collapse-item>
-                            </el-collapse>
                         </el-form-item>
-                        <el-form-item label="参加人员" prop="hdcjry">
+                        <!--<el-form-item label="参加人员" prop="hdcjry">
                             <el-collapse>
                                 <el-collapse-item>
                                     <template slot="title">
@@ -514,7 +506,7 @@ layout("/layouts/platform.html"){
                                     <div id="otherEditor"></div>
                                 </el-collapse-item>
                             </el-collapse>
-                        </el-form-item>
+                        </el-form-item>-->
                         <el-form-item label="活动封面">
                             <file-upload :files.sync="formData.files"></file-upload>
 

src/main/resources/views/platform/hd/wmhd/mobile/staffActivities.html

@@ -138,10 +138,10 @@
             <div class="p15">
                 <div v-html="boxData.hdjs"></div>
             </div>
-            <div class="title-v p15">
+            <!--<div class="title-v p15">
                 <br/>
                 <h3 :style="'color: '+boxData.hdcolor">参加人员</h3>
-                <div class="van-hairline--top"></div>
+                <div class="van-hairline&#45;&#45;top"></div>
                 <br/>
             </div>
             <div class="p15">
@@ -150,7 +150,7 @@
             <div class="title-v p15">
                 <br/>
                 <h3 :style="'color: '+boxData.hdcolor">奖励方式</h3>
-                <div class="van-hairline--top"></div>
+                <div class="van-hairline&#45;&#45;top"></div>
                 <br/>
             </div>
             <div class="p15">
@@ -159,7 +159,7 @@
             <div class="title-v p15">
                 <br/>
                 <h3 :style="'color: '+boxData.hdcolor">活动内容</h3>
-                <div class="van-hairline--top"></div>
+                <div class="van-hairline&#45;&#45;top"></div>
                 <br/>
             </div>
             <div class="p15">
@@ -168,7 +168,7 @@
             <div class="title-v p15">
                 <br/>
                 <h3 :style="'color: '+boxData.hdcolor">活动联系人</h3>
-                <div class="van-hairline--top"></div>
+                <div class="van-hairline&#45;&#45;top"></div>
                 <br/>
             </div>
             <div class="p15" style="line-height:24pt;">
@@ -177,9 +177,9 @@
             <div class="title-v p15" v-if="!isNull(boxData.hdother.replace(/<.*?>/g,''))">
                 <br/>
                 <h3 :style="'color: '+boxData.hdcolor">其他</h3>
-                <div class="van-hairline--top"></div>
+                <div class="van-hairline&#45;&#45;top"></div>
                 <br/>
-            </div>
+            </div>-->
             <div class="p15" style="line-height:24pt;"
                  v-if="!isNull(boxData.hdother.replace(/<.*?>/g,''))">
                 <div v-html="boxData.hdother"></div>
@@ -464,8 +464,8 @@
             style="max-width: 600px;position: fixed;left: 0;bottom: 0;right: 0;margin: auto"
             v-model="active"
     >
-        <van-tabbar-item icon="label-o">介绍</van-tabbar-item>
+        <!--<van-tabbar-item icon="label-o">介绍</van-tabbar-item>-->
-        <van-tabbar-item icon="edit">参加活动</van-tabbar-item>
+        <van-tabbar-item icon="edit" @click="active = 1">参加活动</van-tabbar-item>
     </van-tabbar>
     <van-number-keyboard safe-area-inset-bottom/>
 </div>