Merge remote-tracking branch 'origin/master'

src/components/index/Pagescreen.vue

 <template>
     <div style="padding: 6px 0">
-        <div style="display: flex;padding-left: 10px">
+        <div style="padding-left: 10px" class="gendisplay">
             <div :style="titleType?'width: 0;overflow: hidden;':''">
                 <p class="titleNameP" :class="labelWidth?'labelWidth':''">{{titleName}}:</p>
             </div>
-            <div style="display: flex;font-weight: normal">
+            <div style="font-weight: normal" class="gendisplay">
                 <div>
                     <el-checkbox-group v-model="wholecheck" size="small">
                         <el-checkbox-button class="applyCheckbox" v-for="item in wholeList"
@@ -29,7 +29,7 @@
                 </div>
             </div>
         </div>
-        <div v-if="checkboxIf&&screenchildList.length>0" style="margin:0 25px 10px 140px;background: #F5F5F5;display: flex;font-weight: normal;" :style="{marginBottom:thirdChildren?'0':'10px'}">
+        <div v-if="checkboxIf&&screenchildList.length>0" class="gendisplay" style="margin:0 25px 10px 140px;background: #F5F5F5;font-weight: normal;" :style="{marginBottom:thirdChildren?'0':'10px'}">
             <div v-if="states">
                 <p style="line-height: 48px;margin-left: 15px">{{$t('Otherjson.matchstate')}}：</p>
             </div>

src/views/findeventpage/newEventpage.vue

@@ -38,11 +38,11 @@
                     </div>
                     <p v-if="activityContact.contactImg" @click="vueQrVisible = true" class="condition_state_btn" slot="reference"><span>免费发布活动</span></p>
                 </div>
-                <div class="gendisplay">
+                <div>
                     <page-screen :style="Citychecked?'':'height: 50px;overflow: hidden;'" :screenlist="getHotCitylist" :labelWidth="true" :screenchildListIf="true" ref="projectCitychild" titleName="活动区域"  @changecheck="projectCityData"></page-screen>
                     <i class="iconfont" @click="Citychecked = !Citychecked" :class="Citychecked?'icon-xiala-copy':'icon-xiala'"></i>
                 </div>
-                <div class="gendisplay">
+                <div>
                     <page-screen :style="groupchecked?'':'height: 50px;overflow: hidden;'" :screenlist="groupalllist" :labelWidth="true" :screenchildListIf="false" ref="projectstatechild" titleName="行业标签"  @changecheck="projectstateData"></page-screen>
                     <i class="iconfont" @click="groupchecked = !groupchecked" :class="groupchecked?'icon-xiala-copy':'icon-xiala'"></i>
                 </div>
@@ -157,6 +157,10 @@
             </div>
         </div>
 
+        <div style="bottom:100px;" class="hendtop" @click="handleScrollTop" v-if="positions">
+            <i style="font-size: 24px;color: #9197B4;" class="iconfont icon-dingbu"></i>
+        </div>
+
         <el-dialog :visible.sync="vueQrVisible" width="360px"  :close-on-click-moda="false" center>
             <div style="text-align: center;margin: 0 20px;">
                 <img :src="activityContact.contactImg" alt="" style="width: 140px;height: 140px;margin: 15px;padding: 5px;border: 1px solid #E8E8E8;">
@@ -211,6 +215,7 @@
                 indexActivitylist:[],
                 getHotCitylist:[],
                 eventdataIds:[],
+                positions:false,
                 eventdata:{channelPic:'../../assets/img/activity01.png'},
                 userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
             }
@@ -219,6 +224,18 @@
             pageScreen,signupbar,expertVisible,VueQRCodeComponent
         },
         methods:{
+            menu(){
+                let scroll = document.documentElement.scrollTop || document.body.scrollTop;
+                if(scroll>380){
+                    this.positions = true;
+                }else{
+                    this.positions = false;
+                }
+            },
+            //点击返回顶部
+            handleScrollTop(){
+                window.scrollTo(0, 0);
+            },
             //二维码
             isVueQrVisible(data){
                 this.vueQrVisible = data;
@@ -564,12 +581,14 @@
         },
         beforeDestroy() { // 在组件生命周期结束的时候销毁。、
             globalMsg.$off('loginsuccess');
+            window.removeEventListener('scroll', this.menu);
         },
         mounted() {
             globalMsg.$on("loginsuccess",(data)=>{
                 this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
                 this.resourcesdata();
             });
+            window.addEventListener('scroll', this.menu);
             this.getdataGroupAllLists();
             this.getHotCity();
             this.resourcesdata();
@@ -672,11 +691,15 @@
         margin: 20px 0;
         border-radius: 4px;
         >div{
+            position: relative;
             >i{
                 font-size: 12px;
                 display: inline-block;
                 cursor: pointer;
                 padding-top: 24px;
+                position: absolute;
+                top: 0px;
+                right: 0px;
             }
         }
         .condition_state{
@@ -703,6 +726,8 @@
     .content_list{
         .content_eventli{
             width: 285px;
+            height: 357px;
+            overflow: hidden;
             margin-bottom: 20px;
             border: 1px solid #F2F2F2;
             border-radius: 4px;
@@ -921,4 +946,18 @@
             }
         }
     }
+    .hendtop{
+        position: fixed;
+        right: 40px;
+        z-index: 99;
+        border: 1px solid #F2F2F2;
+        background:#FFFFFF;
+        box-shadow:0px 2px 8px 0px rgba(0,0,0,0.1);
+        border-radius: 50%;
+        width: 50px;
+        height: 50px;
+        text-align: center;
+        line-height: 50px;
+        cursor: pointer;
+    }
 </style>
\ No newline at end of file

src/views/index/pages/index.vue

@@ -179,7 +179,7 @@
                                                     <span v-if="item.professorCount==0" class="ellipsisFont1" style="max-width: 100px;">发起方：<i style="color:#5D78FF;">{{item.topicInitiator}}</i></span>
                                                     <p class="hotimg" v-else>
                                                         <span style="color:#5D78FF;margin-right: 30px;">专家入驻{{item.professorCount}} 位</span>
-                                                        <img v-if="item.baseTopicProfessorList&&index<6"  v-for="(items,index) in item.baseTopicProfessorList" :key="index" :src="items.empLogo" alt="">
+                                                        <img v-if="item.baseTopicProfessorList&&index<6"  v-for="(items,index) in item.baseTopicProfessorList" :key="index" :src="items.empLogo?items.empLogo:require('../../../assets/img/defaultlogo.png')" alt="">
                                                     </p>
                                                 </div>
                                             </div>