活动详情改版及其他功能优化

public/css/pc.scss

@@ -60,6 +60,10 @@
     color: #232323;
   }
 
+  .mouseHover:hover{
+    color: #5D78FF!important;
+  }
+
   table {
     border-collapse: collapse;
     table-layout: fixed;

src/views/findeventpage/api/api.js

@@ -39,8 +39,8 @@ export default {
         return api.fetchLoadingGet('/base/activity/getActivityGuestList?' +Qs.stringify(params));
     },
     //活动详情最近参与
-    getActivityNewestJoin (params){
-        return api.fetchLoadingGet('/base/activity/getActivityNewestJoin?' +Qs.stringify(params));
+    getActivityJoinList (params){
+        return api.fetchLoadingGet('/base/activity/getActivityJoinList?' +Qs.stringify(params));
     },
     //活动详情活动推荐
     getRecommendActivity (params){

src/views/findeventpage/eventpage.vue

@@ -16,7 +16,7 @@
                                 <i class="iconfont icon-zhibo" style="font-size: 16px;position: absolute;left: 8px;top: 0px;"></i>
                                 {{item.baseLive.liveState == 0?$t('activityInfo.liveTitle'):item.baseLive.liveState == 1?$t('activityInfo.living'):item.baseLive.liveState==2&&item.baseLive.liveBack == 0?$t('activityInfo.liveBack'):$t('activityInfo.liveTitle')}}
                             </span>
-                            <span @click="toeventdetail(item)">
+                            <span class="mouseHover" @click="toeventdetail(item)">
                                 {{item.channelTitle}}
                             </span>
                         </p>

src/views/findeventpage/userlist.vue

@@ -3,7 +3,7 @@
         <el-scrollbar style="height: 100%">
             <div class="p_tabs_content" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
                 <div class="gendisplay " v-for="(item,index) in userRelationlist">
-                    <span class="userImg" @click="tohome(item)">
+                    <span class="userImg" @click="item.empId?tohome(item):''">
                         <img class="userinfo_img" :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="">
                         <img class="userImg_vip" v-if="item.isProfessor == 1"  src="../../assets/img/proFeedBack/vip.png"  alt="">
                         <img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
@@ -11,16 +11,16 @@
                     <div>
                         <div class="gendisplay">
                             <p>
-                                <i @click="tohome(item)" class="hover_cursor">{{item.empName}}</i>
+                                <i @click="item.empId?tohome(item):''" class="hover_cursor">{{item.empName}}</i>
                                 <i v-if="item.isOnline!=2" :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i>
                             </p>
                             <div style="margin-right: 10px;" v-if="item.empId != userInfo.empId">
-                                <popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
-                                <btnbar v-if="item.isFriend != 2" :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
+                                <popoverBardbar :iseventlive="true" v-if="item.isFriend == 2&&item.empId" :row="item" :placement="true"></popoverBardbar>
+                                <btnbar v-if="item.isFriend != 2&&item.empId" :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
                             </div>
                         </div>
-                        <p @click="tohome(item)" style="color:#AAAAAA;">
-                            {{item.isProfessor||item.isModerator?item.empTitle:item.workName}}
+                        <p @click="item.empId?tohome(item):''" class="ellipsisFont1" style="color:#AAAAAA;overflow: hidden;">
+                            {{item.isProfessor||item.isModerator||item.isGuest?item.empTitle:item.workName}}
                         </p>
                         <p style="color:#AAAAAA;">
                             {{item.orgName}}

src/views/index.vue

@@ -9,7 +9,7 @@
                 <router-view   @itemBtn="sendbtns" />
             </div>
         </div>
-        <PageBottom @itemBtn="sendbtn" @aboutwebtn="aboutwebtn" style="z-index: 1;position: relative;"></PageBottom>
+        <PageBottom @itemBtn="sendbtn" @aboutwebtn="aboutwebtn" style="z-index: 10;position: relative;"></PageBottom>
     </div>
 </template>
 <script>

src/views/industryreportspage/industrybar.vue

@@ -8,7 +8,7 @@
                         <img style="width: 35px;" src="../../assets/img/industryreport/pdf@2x.png" alt="">
                     </p>
                     <div>
-                        <p class="ellipsisFont2" @click="gocontentdetail(item)" style="color:#1A1A1E;line-height: 20px;margin-bottom: 10px;">{{item.reportTitle}}</p>
+                        <p class="ellipsisFont2 mouseHover" @click="gocontentdetail(item)" style="color:#1A1A1E;line-height: 20px;margin-bottom: 10px;">{{item.reportTitle}}</p>
                         <div style="color: #AAAAAA;font-size: 12px;">
                             <p class="gendisplay">
                                 <span class="ellipsisFont1" @click="gocontentdetail(item)" v-if="item.baseDataVO" style="max-width: 100px;margin-right: 10px;height: 15px;">{{item.baseDataVO.dataName}}</span>

src/views/integralpage/popularguessbar.vue

@@ -8,7 +8,7 @@
                         <div class="gendisplay">
                             <p class="imgInfo" style="width: 80px;height: 56px;" :style="{backgroundImage:'url('+(item.coverUrl)+')'}">
                             </p>
-                            <p style="width: 225px;">{{item.guessTitle}}</p>
+                            <p class="mouseHover" style="width: 225px;">{{item.guessTitle}}</p>
                         </div>
                         <div class="gendisplay" style="font-size: 12px;margin-top: 10px;color:#AAAAAA;">
                             <div style="width: calc(100% - 150px);">

src/views/peoplehomepage/btnbar.vue

@@ -158,7 +158,7 @@
                         otherEmpId:this.row.empId,
                         queryType:0,
                         dataId:this.channelId?this.channelId:this.eventId,
-                        guestId:row.id?row.id:null,
+                        guestId:row.guestId?row.guestId:null,
                         dataType:this.channelId?1:this.eventId?1:null,
                     };
                     api.addEmpContact(params).then((res)=>{

src/views/peoplehomepage/introductionbar.vue

@@ -116,19 +116,21 @@
                 </el-row>
             </div>
         </div>
-        <div class="p_jobs p_tabs">
-            <div class="gendisplay p_tabs_title">
-                <p>
-                    <span>工作经历<i></i></span>
-                </p>
-            </div>
-            <div v-if="workList == null || workList.length == 0">
+        <div class="p_jobs p_tabs" v-if="(workList == null || (workList&&workList.length == 0))&&(educationList == null || (educationList&&educationList.length == 0))">
+            <div>
                 <p class="noIntegral">
                     <img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
                     <span>暂无数据</span>
                 </p>
             </div>
-            <div v-else class="jobs_content">
+        </div>
+        <div class="p_jobs p_tabs"  v-if="workList != null || (workList&&workList.length != 0)">
+            <div class="gendisplay p_tabs_title">
+                <p>
+                    <span>工作经历<i></i></span>
+                </p>
+            </div>
+            <div class="jobs_content">
                 <div v-for="(item,index) in workList" class="gendisplay">
                     <p><i class="iconfont icon-gongzuojingli"></i></p>
                     <p>
@@ -140,19 +142,13 @@
                 </div>
             </div>
         </div>
-        <div class="p_education p_tabs">
+        <div class="p_education p_tabs" v-if="educationList != null || (educationList&&educationList.length != 0)">
             <div class="gendisplay p_tabs_title">
                 <p>
                     <span>教育经历<i></i></span>
                 </p>
             </div>
-            <div v-if="educationList == null || educationList.length == 0">
-                <p class="noIntegral">
-                    <img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
-                    <span>暂无数据</span>
-                </p>
-            </div>
-            <div v-else class="jobs_content">
+            <div class="jobs_content">
                 <div v-for="(item,index) in educationList" class="gendisplay">
                     <p><i class="iconfont icon-jiaoyujingli" style="color:#B7E5CC;"></i></p>
                     <p>

src/views/publishactivity/proactivity.vue

@@ -832,7 +832,8 @@
                         numberOfPages: 1,
                     },
                     search: {
-                        resourceType:val
+                        resourceType:val,
+                        channelId:this.$route.query.channelId,
                     }
                 };
                 api.searchResources(params).then(response => {
@@ -869,6 +870,10 @@
                             return
                         }
                     }
+                    if(this.formData.resourceList.length>=6){
+                        this.$message.error('已添加上限');
+                        return
+                    }
                     this.formData.resourceList.push({
                         resourceTitle:this.resourcesform.title,
                         resourceType:this.resourcesform.resourceType,

src/views/publishactivity/pubactivities.vue

@@ -59,7 +59,10 @@
                             <el-button type="text" @click="urlclk(scope.row)">
                                 {{$t('commonTitle.vipLookTitle')}}
                             </el-button>
-                            <el-button v-if="scope.row.channelState == 1||scope.row.channelState == 2||scope.row.channelState == 3" type="text" @click="$router.push({path:'/addproactivity',query:{channelId:scope.row.channelId,type:scope.row.channelType,edit:true}})">
+                            <el-button type="text" @click="newopen(scope.row)">
+                                pc{{$t('commonTitle.vipLookTitle')}}
+                            </el-button>
+                            <el-button v-if="scope.row.channelState != 0" type="text" @click="$router.push({path:'/addproactivity',query:{channelId:scope.row.channelId,type:scope.row.channelType,edit:true}})">
                                 {{$t('Otherjson.edittext')}}
                             </el-button>
                             <el-button v-if="scope.row.channelState == 3||scope.row.channelState == 4" type="text" @click="$router.push({path:'/applyactivity',query:{channelTitle:scope.row.channelTitle,type:scope.row.channelType,channelId:scope.row.channelId}})">
@@ -159,6 +162,9 @@
                         return false;
                     });
             },
+            newopen(val){
+                window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id="+val.channelId+'&ismyevent=0&type='+val.channelType);
+            },
             // 分页导航
             handleCurrentChange(val) {
                 this.cur_page = val;

src/views/topicpage/commentdetail.vue

@@ -661,7 +661,7 @@
                     return
                 }
                 if(this.publicFun.unique(row.wordarea).length<10){
-                    // this.$message.error('内容不能为空');
+                    this.$message.error('您输入的内容未达到10个字，请修改后重试！');
                     return;
                 }
                 let params = {

src/views/topicpage/discussall.vue

@@ -31,7 +31,7 @@
                                             </p>
                                             <div style="text-align: left;width: calc(100% - 150px);">
                                                 <p class="gendisplay" style="color:#1A1A1E;font-size: 16px;">
-                                                    <span class="ellipsisFont1" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
+                                                    <span class="ellipsisFont1 mouseHover" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
                                                     <i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
                                                 </p>
                                                 <p class="ellipsisFont2" style="color:#69697A;margin: 10px 0 10px;font-size: 14px;line-height: 22px;height: 44px;">{{itemchild.topicDescription}}</p>
@@ -56,7 +56,7 @@
                                         </p>
                                         <div style="padding-left: 15px;font-size: 12px;width: calc(100% - 100px);">
                                             <p class="gendisplay">
-                                                <span class="ellipsisFont1" style="color:#1A1A1E;font-size: 14px;font-weight: bold;max-width: calc(100% - 10px);height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
+                                                <span class="ellipsisFont1 mouseHover" style="color:#1A1A1E;font-size: 14px;font-weight: bold;max-width: calc(100% - 10px);height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
                                                 <i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 17px;"></i>
                                             </p>
                                             <div style="line-height: 24px;margin-top: 5px;">
@@ -104,7 +104,7 @@
                             <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                 <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
                                     <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                        <div style="position: relative;" @click="tohome(item)">
+                                        <div style="position: relative;cursor: pointer;" @click="tohome(item)">
                                             <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                             <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
                                         </div>
@@ -146,7 +146,7 @@
                                 <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                     <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
                                         <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                            <p style="position: relative;" @click="tohome(item)">
+                                            <p style="position: relative;cursor: pointer;" @click="tohome(item)">
                                                 <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
                                                 <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
 

src/views/topicpage/discussdialog.vue

@@ -4,6 +4,7 @@
         <el-dialog title="发表讨论" :visible.sync="visible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensor" class="dialogWrap dialogWraptopic">
             <div class="centerQrCode" style="margin: 0 50px;">
                 <rich-text @dataEvent="statedata" :istopic="richstate" :discussTips="discussTips?discussTips:changediscussTips" :channelIntroduction="discussContent" :istopicTips="true"></rich-text>
+                <p v-if="btnpush" style="margin: 15px 0;color: red;">您输入的内容未达到10个字，请修改后重试！</p>
                 <p v-if="sensitiveTextstate" style="margin: 15px 0;color: red;">{{sensitiveText}}</p>
                 <div class="gendisplay topic_select" v-if="!topicid">
                     <div style="margin-right: 20px;">
@@ -79,7 +80,7 @@
             </div>
             <el-row style="padding-top: 20px;text-align: center">
                 <el-button @click="closeSensor">取 消</el-button>
-                <el-button type="primary" @click="pushdiscuss" :disabled="btnpush">确定</el-button>
+                <el-button type="primary" @click="pushdiscuss">确定</el-button>
             </el-row>
         </el-dialog>
     </div>
@@ -119,7 +120,7 @@
                 topic_count:1,
                 topic_count2:1,
                 topicId:'',
-                btnpush:true,
+                btnpush:false,
                 changediscussTips:'',
                 sensitiveText:'',
                 sensitiveTextstate:false,
@@ -132,12 +133,6 @@
         methods: {
             statedata(val){
                 this.discussContent = val;
-                let textlength = this.publicFun.unique(this.publicFun.getTextInRichtext(this.discussContent));
-                if(textlength&&textlength.length>10){
-                    this.btnpush = false;
-                }else{
-                    this.btnpush = true;
-                }
             },
             //添加弹框关闭
             closeSensor(){
@@ -240,6 +235,13 @@
                     this.$message.error('请选择话题圈子');
                     return;
                 }
+                let textlength = this.publicFun.unique(this.publicFun.getTextInRichtext(this.discussContent));
+                if(textlength&&textlength.length<10){
+                    this.btnpush = true;
+                    return;
+                }else{
+                    this.btnpush = false;
+                }
                 let params = {
                     discussContent:this.discussContent,
                     simpleContent:this.publicFun.getTextInRichtext(this.discussContent),

src/views/topicpage/topicbar.vue

@@ -6,7 +6,7 @@
                     <div class="content">
                         <div v-for="(item,index) in hottopiclist" @click="todetail(item)" :key="index">
                             <p style="color:#1A1A1E;font-size: 14px;margin-bottom: 15px;">
-                                <span>#{{item.topicTitle}}#</span>
+                                <span class="mouseHover">#{{item.topicTitle}}#</span>
                                 <i v-if="item.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 17px;"></i>
                             </p>
                             <div class="gendisplay" style="font-size: 12px;">

src/views/topicpage/topicdetail.vue

@@ -1230,7 +1230,7 @@
                     return
                 }
                 if(this.publicFun.unique(row.wordarea).length<10){
-                    // this.$message.error('内容不能为空');
+                    this.$message.error('您输入的内容未达到10个字，请修改后重试！');
                     return;
                 }
                 let params = {

src/views/topicpage/topictype.vue

@@ -15,7 +15,7 @@
                                 </p>
                                 <div style="text-align: left;width: calc(100% - 150px);">
                                     <p class="gendisplay" style="color:#1A1A1E;font-size: 16px;">
-                                        <span class="ellipsisFont1" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{item.topicTitle}}# </span>
+                                        <span class="ellipsisFont1 mouseHover" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{item.topicTitle}}# </span>
                                         <i v-if="item.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
                                     </p>
                                     <p v-if="(item.secondList&&item.secondList.length==1)||(item.secondList&&item.secondList.length==0)" class="ellipsisFont2" style="color:#69697A;margin: 10px 0 5px;font-size: 12px;line-height: 22px;height: 44px;overflow: hidden;">{{item.topicDescription}}</p>
@@ -45,7 +45,7 @@
                                             </p>
                                             <div style="padding-left: 15px;font-size: 12px;width: calc(100% - 100px);">
                                                 <p class="gendisplay">
-                                                    <span class="ellipsisFont1" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
+                                                    <span class="ellipsisFont1 mouseHover" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
                                                     <i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 17px;"></i>
                                                 </p>
                                                 <div style="line-height: 24px;margin-top: 5px;">
@@ -70,7 +70,7 @@
                                     </p>
                                     <div style="text-align: left;width: calc(100% - 100px);">
                                         <p class="gendisplay" style="color:#1A1A1E;font-size: 14px;">
-                                            <span class="ellipsisFont1" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
+                                            <span class="ellipsisFont1 mouseHover" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
                                             <i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
                                         </p>
                                         <p class="ellipsisFont1" style="color:#69697A;margin: 6px 0 1px;font-size: 12px;line-height: 22px;height: 22px;overflow: hidden;">{{itemchild.topicDescription}}</p>
@@ -106,7 +106,7 @@
                                     <div v-for="(item,index) in professorlist" :key="index">
                                         <el-tooltip placement="top" popper-class="boxShadowTip" effect="light">
                                             <div class="gendisplay" style="padding: 20px 20px 0 20px;">
-                                                <div style="position: relative;"  @click="tohome(item)">
+                                                <div style="position: relative;cursor: pointer;"  @click="tohome(item)">
                                                     <img v-if="item.empLogo" :src="item.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                     <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                     <img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
@@ -144,7 +144,7 @@
                             <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                 <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
                                     <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                        <div style="position: relative;" @click="tohome(item)">
+                                        <div style="position: relative;cursor: pointer;" @click="tohome(item)">
                                             <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                             <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
                                         </div>