Commit 40ca2bb2 authored by zhangyanni's avatar zhangyanni

关于我们

活动最近参与展开收起
parent 306b0b1f
...@@ -113,9 +113,13 @@ ...@@ -113,9 +113,13 @@
<p> <p>
<span>{{$t('activityInfo.recentParticipated')}}<i></i></span> <span>{{$t('activityInfo.recentParticipated')}}<i></i></span>
</p> </p>
<p @click="isRecentchecked = !isRecentchecked" v-if="participateList.length>7">
{{isRecentchecked?$t('shareInfo.close'):$t('shareInfo.open')}}
<i class="iconfont" :class="isRecentchecked?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i>
</p>
</div> </div>
<div class="participate_user gendisplay"> <div class="participate_user gendisplay">
<div v-for="(item,index) in participateList"> <div v-for="(item,index) in participateList" v-if="isRecentchecked||index<7">
<span @click="tohome(item.empId)" class="userImg"> <span @click="tohome(item.empId)" class="userImg">
<img class="userinfo_img" :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt=""> <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.isProfessor == 1" src="../../assets/img/proFeedBack/vip.png" alt="">
...@@ -276,6 +280,7 @@ ...@@ -276,6 +280,7 @@
eventdata:{}, eventdata:{},
guestList:[], guestList:[],
isguestchecked:false, isguestchecked:false,
isRecentchecked:false,
resourcesList:[], resourcesList:[],
recommendList:[], recommendList:[],
participateList:[], participateList:[],
...@@ -418,7 +423,7 @@ ...@@ -418,7 +423,7 @@
let params = { let params = {
activityId:this.$route.query.id, activityId:this.$route.query.id,
pageIndex:1, pageIndex:1,
pageSize:7, pageSize:null,
}; };
api.getActivityJoinList(params).then(response => { api.getActivityJoinList(params).then(response => {
if(response.code == 0) { if(response.code == 0) {
...@@ -785,10 +790,11 @@ ...@@ -785,10 +790,11 @@
/*box-shadow: 0px 3px 10px 1px rgba(93, 120, 255, 0.4);*/ /*box-shadow: 0px 3px 10px 1px rgba(93, 120, 255, 0.4);*/
} }
.participate_user{ .participate_user{
margin-top: 20px; flex-wrap: wrap;
>div{ >div{
text-align: center; text-align: center;
margin-right: 50px; margin-right: 50px;
margin-top: 20px;
>span{ >span{
display: inline-block; display: inline-block;
height: 65px; height: 65px;
......
<template> <template>
<div style="padding: 125px 0 70px 0;background: #ffffff;min-height: 600px;"> <div style="padding: 40px 0 70px 0;background: #ffffff;min-height: 600px;">
<div v-if="!showsd" style="margin:0 0 60px;"> <div v-if="!showsd" style="margin:0 0 60px;">
<span style="padding-bottom: 15px;border-bottom: 2px solid #5D78FF;font-size: 20px;font-weight: bold;color: #3F3F53">{{$t("aboutwe.aboutwetitle")}}</span> <span style="padding-bottom: 15px;border-bottom: 2px solid #5D78FF;font-size: 20px;font-weight: bold;color: #3F3F53">{{$t("aboutwe.aboutwetitle")}}</span>
</div> </div>
<div><img src="../../assets/img/index/techbook-01@2x.png" alt="图片" style="width: 120px;"></div> <!--<div><img src="../../assets/img/index/techbook-01@2x.png" alt="图片" style="width: 120px;"></div>-->
<div style="margin: 30px 155px 20px;text-align: left;"> <div style="margin: 30px 155px 20px;text-align: left;">
<p style="margin-bottom: 20px">{{$t("aboutwe.contentp")}}</p> <p style="margin-bottom: 20px" v-if="lang==2">{{$t("aboutwe.contentp")}}</p>
<p>{{$t("aboutwe.contentp1")}}</p> <p v-if="lang==2">{{$t("aboutwe.contentp1")}}</p>
<p style="line-height: 25px;margin-top: 20px">{{$t("aboutwe.contentp2")}}</p> <p v-if="lang==2" style="line-height: 25px;margin-top: 20px">{{$t("aboutwe.contentp2")}}</p>
<p style="line-height: 30px">{{$t("aboutwe.contentp3")}}</p> <p v-if="lang==2" style="line-height: 30px">{{$t("aboutwe.contentp3")}}</p>
<div style="text-align: center;margin: 50px 0 70px 0"> <div style="text-align: center;margin: 50px 0 70px 0" v-if="lang==2">
<img :src="images" alt="图片" style="width: 685px;"> <img :src="images" alt="图片" style="width: 685px;">
</div> </div>
<div class="techbookImg" v-if="lang==1">
<img src="../../assets/img/aboutUsNew.png" alt="">
</div>
<div style="text-align: center;"> <div style="text-align: center;">
<img src="../../assets/img/index/weimg1@2x.png" alt="图片" style="width: 150px;"> <img src="../../assets/img/index/weimg1@2x.png" alt="图片" style="width: 150px;">
</div> </div>
...@@ -42,6 +45,8 @@ ...@@ -42,6 +45,8 @@
showsd:false, showsd:false,
images:require('../../assets/img/index/aboutuszh.jpg'), images:require('../../assets/img/index/aboutuszh.jpg'),
visible:false, visible:false,
lang:this.$i18n.locale=="zh-CN"?1:2,
} }
}, },
mounted() { mounted() {
...@@ -53,6 +58,11 @@ ...@@ -53,6 +58,11 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.techbookImg{
img{
width: 100%;
object-fit: contain;
}
}
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment