Skip to content

T
techbook
Commit 0b7a0c4f authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents d5e2da17 c7b2034c
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 42 deletions
src/components/index/PageBottom.vue
View file @ 0b7a0c4f
......@@ -180,7 +180,7 @@
.bottomInfo{
padding: 30px 120px;
max-width: 1400px;
max-width: 1436px;
margin: 0 auto;
}
.bottomCopyright{
......
src/components/index/PageTopindex.vue
View file @ 0b7a0c4f
......@@ -10,7 +10,7 @@
</p>
</div>
<div class="topContent">
<el-input class="index_search" @keyup.enter.native="handleSearchDetail(keyword)" v-model="keyword" maxlength="36" :placeholder="$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'" style="width: 350px;"></el-input>
<el-input class="index_search" @keyup.enter.native="handleSearchDetail(keyword)" v-model="keyword" maxlength="36" :placeholder="$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'" :style="$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"></el-input>
<p class="topsearch" type="primary" @click="handleSearchDetail(keyword)">{{$t("searchResult.search")}}</p>
<!-- <p class="recommend">-->
<!-- <span @click="handleSearchDetail(item)" v-for="item in keywordlist" style="margin-right: 10px;cursor: pointer;">{{item}}</span>-->
......@@ -21,7 +21,7 @@
<!-- 登陆后-->
<div class="gendisplay" v-if="userInfo" style="height: 40px;line-height: 30px;">
<p @click="drawer = true"><img style="width: 30px;height: 30px;border-radius: 50%;cursor: pointer;" :src="userInfo.empLogo?userInfo.empLogo:require('../../assets/img/defaultlogo.png')" alt=""></p>
<p @click="drawer = true" class="ellipsisFont1" style="margin: 0 25px 0 15px;cursor: pointer;max-width: 70px;height: 40px;overflow: hidden;">{{userInfo.empName}}</p>
<p @click="drawer = true" class="ellipsisFont1" style="margin: 0 25px 0 15px;cursor: pointer;max-width: 70px;height: 30px;overflow: hidden;">{{userInfo.empName}}</p>
<p @click="$router.push('/seeprojectlist')" style="color: #FF9E29;cursor: pointer;">我的工作台</p>
</div>
<!-- 未登录-->
......@@ -66,9 +66,9 @@
</div>
<div style="position: absolute;right: 120px;top: 0px;" class="topright gendisplay">
<div style="line-height: 42px;position: relative;padding-right: 30px;margin-right: 10px;">
<el-input class="index_topsou" @focus="keyword_search = true" @blur="keyword_search = false" v-model="keyword" maxlength="36" :placeholder="$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'" style="width: 190px;height: 30px;"></el-input>
<p class="topsearch_fixed" type="primary" :style="!keyword_search?'':'background: #5D78FF'">
<i style="font-size: 12px;" :style="!keyword_search?'':'color:#ffffff'" class="iconfont icon-iconsearch"></i>
<el-input class="index_topsou" @keyup.enter.native="handleSearchDetail(keyword)" @focus="keyword_search = true" @blur="keyword_search = false" v-model="keyword" maxlength="36" :placeholder="$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'" style="width: 190px;height: 30px;"></el-input>
<p class="topsearch_fixed" type="primary" :style="!keyword_search&&keyword==''?'':'background: #5D78FF'" @click="handleSearchDetail(keyword)">
<i style="font-size: 12px;" :style="!keyword_search&&keyword==''?'':'color:#ffffff'" class="iconfont icon-iconsearch"></i>
</p>
</div>
......@@ -175,22 +175,22 @@
envisible:false,
indextab:this.indextab_zh,
indextab_zh:[
{id:1,name:this.$t("topNav.index"),path:'/'},
{id:2,name:this.$t("topNav.guess"),path:'/guesslist'},
{id:3,name:this.$t("topNav.activity"),path:'/activitylist'},
{id:4,name:this.$t("topNav.topic"),path:'/topicList'},
{id:5,name:this.$t("topNav.match"),path:'/seeprojectlist'},
{id:6,name:this.$t("topNav.article"),path:'/articleList'},
{id:7,name:this.$t("topNav.industry"),path:'/industryReport'},
{id:8,name:this.$t("topNav.cooperationcase"),path:'/successfulcase'},
{id:1,name:this.$t("topNav.index"),path:'/',pathchild:'/'},
{id:2,name:this.$t("topNav.guess"),path:'/guesslist',pathchild:'/guessDetail'},
{id:3,name:this.$t("topNav.activity"),path:'/activitylist',pathchild:'/eventdetail'},
{id:4,name:this.$t("topNav.topic"),path:'/topicList',pathchild:'/topicDetails'},
{id:5,name:this.$t("topNav.match"),path:'/seeprojectlist',pathchild:'/seeprojectlist'},
{id:6,name:this.$t("topNav.article"),path:'/articleList',pathchild:'/articleDetail'},
{id:7,name:this.$t("topNav.industry"),path:'/industryReport',pathchild:'/industryReport'},
{id:8,name:this.$t("topNav.cooperationcase"),path:'/successfulcase',pathchild:'/casedetails'},
],
indextab_en:[
{id:1,name:this.$t("topNav.index"),path:'/'},
{id:2,name:this.$t("topNav.findProject"),path:'/seeprojectlist'},
{id:3,name:this.$t("topNav.findCustomer"),path:'/bigBusiness/list'},
{id:4,name:this.$t("topNav.Findevent"),path:'/activitylist'},
{id:5,name:this.$t("topNav.industry"),path:'/industryReport'},
{id:6,name:this.$t("topNav.cooperationcase"),path:'/successfulcase'},
{id:1,name:this.$t("topNav.index"),path:'/',pathchild:'/'},
{id:2,name:this.$t("topNav.findProject"),path:'/seeprojectlist',pathchild:'/seeprojectlist'},
{id:3,name:this.$t("topNav.findCustomer"),path:'/bigBusiness/list',pathchild:'/bigBusiness/list'},
{id:4,name:this.$t("topNav.Findevent"),path:'/activitylist',pathchild:'/eventdetail'},
{id:5,name:this.$t("topNav.industry"),path:'/industryReport',pathchild:'/industryReport'},
{id:6,name:this.$t("topNav.cooperationcase"),path:'/successfulcase',pathchild:'/casedetails'},
],
index_hover:1,
lang: this.$i18n.locale,
......@@ -328,7 +328,7 @@
},
tabstate(path){
for(let i in this.indextab){
if(path == this.indextab[i].path){
if(path == this.indextab[i].path || path == this.indextab[i].pathchild){
this.index_hover = this.indextab[i].id
return
}else this.index_hover = 1
......@@ -342,12 +342,8 @@
window.addEventListener('scroll', this.menu);
this.indextab = this.$i18n.locale == 'zh-CN'?this.indextab_zh:this.indextab_en;
this.wxopenlogin();
for(let i in this.indextab){
if(this.$route.path == this.indextab[i].path){
this.index_hover = this.indextab[i].id
return
}else this.index_hover = 1
}
console.log(this.$route.path)
this.tabstate(this.$route.path);
},
watch:{
tabpath(val){
......@@ -365,7 +361,7 @@
padding: 15px 120px;
text-align: left;
position: relative;
width: 1400px;
width: 1436px;
margin: 0 auto;
.topleft{
>p{
......@@ -447,7 +443,7 @@
.content_tab{
background: #1E1E2D;
>div{
width: 1400px;
width: 1436px;
margin: 0 auto;
justify-content: space-around;
color: #FFFFFF;
......@@ -490,6 +486,7 @@
border-top-right-radius: 3px;
text-align: center;
line-height: 30px;
cursor: pointer;
}
.content_toptab_hover{
color: #FFFFFF;
......@@ -515,7 +512,7 @@
-o-animation: fadeInOut .5s;
>div{
padding: 0 120px;
width: 1400px;
width: 1436px;
margin: 0 auto;
position: relative;
}
......
src/views/index.vue
View file @ 0b7a0c4f
......@@ -158,6 +158,7 @@
// this.maiDianFunc(data);
// })
globalMsg.$on("newTop_tab",(data)=>{
console.log(12333333)
this.tabpath= data;
})
globalMsg.$on("topShow",(data)=>{
......
src/views/index/pages/index.vue
View file @ 0b7a0c4f
......@@ -66,7 +66,8 @@
<p class="ellipsisFont2"
style="cursor: pointer;"
@click="handleMore('detail',item.contentType == 'activity'?'/eventdetail':item.contentType == 'guess'?'/guessDetail':item.contentType== 'topic'?'/topicDetails':'/',item,true)">
<span style="color: #FF5D5D;font-weight: normal;">[{{item.contentType == 'activity'?'活动':item.contentType == 'guess'?'竞猜':item.contentType== 'topic'?'话题':''}}] </span>
<span class="hot_lable">热门</span>
<span style="color: #1A1A1E;">{{item.contentType == 'activity'?'活动':item.contentType == 'guess'?'竞猜':item.contentType== 'topic'?'话题':''}} <i style="margin: 0 3px;">|</i></span>
<span style="color: #1A1A1E;">{{item.contentType == 'activity'?item.contentDetail.channelTitle:item.contentType == 'guess'?item.contentDetail.guessTitle:item.contentType== 'topic'?'#'+item.contentDetail.topicTitle+'#':''}}</span>
</p>
<div class="gendisplay">
......@@ -96,7 +97,7 @@
<p v-else class="ellipsisFont2 activity_state" style="margin-top: 15px;line-height: 20px;">
{{item.contentType == 'guess'?item.contentDetail.guessIntroduction:item.contentType== 'topic'?item.contentDetail.topicDescription:''}}
</p>
<img v-if="index == 0" style="position: absolute;left: -15px;top: -15px;width: 48px;" src="../../../assets/img/hotlive.png" alt="">
<!-- <img v-if="index == 0" style="position: absolute;left: -15px;top: -15px;width: 48px;" src="../../../assets/img/hotlive.png" alt="">-->
</li>
</ul>
</div>
......@@ -150,7 +151,7 @@
<p @click="handleMore('detail','/eventdetail',item)" class="ellipsisFont2" style="width: 100%;height: 44px;overflow: hidden;cursor: pointer;">{{item.channelTitle}}</p>
<div style="font-size: 12px;">
<p class="ellipsisFont1" style="width: 100%;height: 17px;overflow: hidden;">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<p class="ellipsisFont1" style="width: 100%;height: 18px;overflow: hidden;">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<div class="gendisplay">
<p>{{item.activityStartTime}} - {{item.activityEndTime}}</p>
<p v-if="item.channelCityStr"><i class="iconfont icon-map-pin"></i>{{item.channelCityStr}}</p>
......@@ -162,7 +163,7 @@
</div>
<div style="text-align: center;margin-top: 20px;">
<span v-if="userInfo&&userInfo.empId!=item.createdBy||!userInfo">
<span style="color: #0ABB87;padding: 5px 20px;border: 1px solid #0ABB87;border-radius: 20px;" v-if="item.isJoin==1&&item.activityState != 3">{{$t('activityInfo.hasApply')}}</span>
<span style="color: #0ABB87;padding: 6px 20px;border: 1px solid #0ABB87;border-radius: 20px;" v-if="item.isJoin==1&&item.activityState != 3">{{$t('activityInfo.hasApply')}}</span>
<span v-if="item.activityState == 2&&item.isJoin==2"><el-button type="primary" @click="handleApply(item)" round plain size="mini" style="width: 90px;font-size: 14px;"><i style="font-weight: bold">{{$t('activityInfo.freeApply')}}</i></el-button></span>
<span v-if="item.activityState == 3">{{$t('activityInfo.applyEnd')}}</span>
<span style="color: #FF5D5D" v-if="item.activityState == 4&&item.isJoin==2">{{$t('activityInfo.hasFilled')}}</span>
......@@ -365,7 +366,7 @@
<div @click="handleMore('detail','/topicDetails',item)" v-for="(item,index) in hotTopicContentlist" :key="index" style="padding-top: 20px;cursor: pointer;">
<div class="gendisplay" >
<p style="position: relative;">
<img style="height: 40px;width: 40px;border-radius: 50%;" :src="item.empLogo?require('../../../assets/img/defaultlogo.png'):item.empLogo" alt="">
<img style="height: 40px;width: 40px;border-radius: 50%;border: 1px solid #E8EAF3;" :src="item.empLogo?item.empLogo:require('../../../assets/img/defaultlogo.png')" alt="">
<img v-if="item.isProfessor==1" src="../../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
</p>
<div style="margin-left: 15px;font-size: 12px;">
......@@ -373,7 +374,7 @@
<p class="ellipsisFont1" style="margin-top: 5px;color: #AAAAAA;width: 100%;height: 17px;overflow: hidden;line-height: 17px;">{{item.isProfessor==1?item.professorIntroduction:item.createdTimeStr}}</p>
</div>
</div>
<p class="ellipsisFont2" style="margin: 10px 0;line-height: 24px;width: 100%;max-height: 48px;overflow: hidden;color: #1A1A1E;" v-html="item.pcState==1?publicFun.getTextInRichtext(item.discussContent):publicFun.analyzeEmoji(item.discussContent)"></p>
<p class="ellipsisFont2" style="margin: 10px 0;line-height: 24px;width: 100%;max-height: 48px;overflow: hidden;color: #1A1A1E;" v-html="item.pcState==1?publicFun.getTextInRichtext(item.simpleContent):publicFun.analyzeEmoji(item.simpleContent)"></p>
<div class="gendisplay" style="padding: 10px;background: #F5F5F5;">
<p style="width: calc(100% - 82px);color:#1A1A1E;">#{{item.baseTopic.topicTitle}}#</p>
<p style="width: 82px;"><img class="imgInfo" style="height: 56px;width: 82px;border-radius: 3px;border: none;" :style="{backgroundImage:'url('+(item.baseTopic.topicCover?item.baseTopic.topicCover:require('../../../assets/img/topicbackground.jpg'))+')'}" alt=""></p>
......@@ -843,7 +844,7 @@
<p @click="wx_type_hover=1" :class="wx_type_hover==1?'wx_type_hover':''"><i style="font-weight: normal;" class="iconfont icon-weixin"></i>公众号</p>
<p @click="wx_type_hover=2" :class="wx_type_hover==2?'wx_type_hover':''"><i class="iconfont icon-xiaochengxu"></i>小程序</p>
</div>
<img v-if="wx_type_hover==1" src="../../../assets/img/index/Bitmap@2x(7).png" style="width: 120px;height: 120px;" alt="">
<img v-if="wx_type_hover==1" src="../../../assets/img/mobile/officalCode.jpg" style="width: 120px;height: 120px;" alt="">
<img v-if="wx_type_hover==2" src="../../../assets/img/Wechat585.jpeg" style="width: 120px;height: 120px;" alt="">
<p style="margin-top: 20px;font-size: 12px;">{{wx_type_hover==1?'微信扫一扫 关注公众号':'微信扫一扫 使用小程序'}} </p>
</div>
......@@ -1312,6 +1313,11 @@
},
//活动报名
handleApply(data){
if(!this.publicFun.getUserInfoCookieType()){
this.islogin = true;
this.$refs.login.isexpertVisible();
return
}
this.currentData = data;
let that = this;
let params= this.$route.query.id?this.$route.query.id:data.channelId,arrVal = [];
......@@ -1735,6 +1741,8 @@
>p:nth-child(1){
width: 140px;
line-height: 17px;
height: 17px;
overflow: hidden;
}
>p:nth-child(2){
width: calc(100% - 140px);
......@@ -1796,11 +1804,19 @@
right: 0;
top:-2px;
}
.hot_lable{
background: #FF5D5D;
color: #FFFFFF;
padding: 0 5px;
font-size: 12px;
margin-right: 5px;
border-radius: 3px;
}
.hot_content{
background: #F5F5F5;
border-radius: 3px;
>ul{
padding:15px 0 15px 15px;
padding:15px 0 ;
height: 165px;
>li{
color: #7A7A7A;
......
src/views/integralpage/guessdetail.vue
View file @ 0b7a0c4f
......@@ -22,7 +22,7 @@
{{contentdata.guessState == 1?'进行中':contentdata.guessState == 2?'等待公布结果':contentdata.guessState == 3?'已结束':''}}
</p>
<p v-if="contentdata.guessState == 1" style="margin:0 30px;color: #1A1A1E;">
<span>据开奖预计还有 <i style="color: #FFA801;">{{contentdata.drawTime}}</i> {{contentdata.timeType==1?'分钟':contentdata.timeType==2?'小时':contentdata.timeType==3?'天':''}}</span>
<span>距开奖预计还有 <i style="color: #FFA801;">{{contentdata.drawTime}}</i> {{contentdata.timeType==1?'分钟':contentdata.timeType==2?'小时':contentdata.timeType==3?'天':''}}</span>
<span v-if="contentdata.integralPool&&contentdata.integralPool!=0" style="margin-left: 30px;">积分池：<i style="color: #FFA801;">{{contentdata.integralPool}}</i></span>
</p>
<p style="margin: 0 20px;">{{contentdata.peopleNum}}人次参与</p>
......
src/views/integralpage/integralguesslist.vue
View file @ 0b7a0c4f
......@@ -38,7 +38,7 @@
</p>
<div class="gendisplay">
<p v-if="item.guessState == 1" style="margin-right: 30px;color: #1A1A1E;">
<span>据开奖预计还有 <i style="color: #FFA801;">{{item.drawTime}}</i> {{item.timeType==1?'分钟':item.timeType==2?'小时':item.timeType==3?'天':''}}</span>
<span>距开奖预计还有 <i style="color: #FFA801;">{{item.drawTime}}</i> {{item.timeType==1?'分钟':item.timeType==2?'小时':item.timeType==3?'天':''}}</span>
<span v-if="item.integralPool&&item.integralPool!=0" style="margin-left: 30px;">积分池：<i style="color: #FFA801;">{{item.integralPool}}</i></span>
</p>
<span style="margin-right: 35px;">{{item.peopleNum}}人次参与</span>
......@@ -322,7 +322,7 @@
},
menu(){
let scroll = document.documentElement.scrollTop || document.body.scrollTop;
if(scroll>20){
if(scroll>280){
this.positions = true;
}else{
this.positions = false;
......
src/views/integralpage/userintegral.vue
View file @ 0b7a0c4f
......@@ -188,7 +188,7 @@
everyDayIntegralList:[],
urltext:'',
searchIndex:0,
datelist:[{value:'全部',type:0},{value:'获得',type:1},{value:'使用',type:2}],
datelist:[{value:'全部',type:0},{value:'获取',type:1},{value:'使用',type:2}],
}
},
components:{
......@@ -198,6 +198,7 @@
//排行榜type切换
datetype(val){
this.searchIndex = val;
this.cur_page = 1;
this.getselectIntegralDetailList();
},
getselectByEmpId(){
......
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