Skip to content

T
techbook
Commit 163af231 authored by anxixi's avatar anxixi
Browse files
Options

人脉圈

parent 569f2a7f
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 77 deletions
public/css/pc.scss
View file @ 163af231
......@@ -924,14 +924,7 @@
}
}
.centerQrCode{
display: -webkit-flex;/*新版本语法：chrome 21+*/
display: -webkit-box;/*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
display: -moz-box;/*老版本语法：Firefox(buggy)*/
display: -ms-flexbox;/*混合版本语法：IE 10*/
display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
justify-content: center;
}
.hover_cursor:hover{
......
src/common/lang/en.js
View file @ 163af231
......@@ -2199,9 +2199,11 @@ module.exports = {
woman:"Female",
selectIndustry:"Please select your industry",
home:'Home page',
nointroduction:'No Introduction',
Participated:'参与了',
Events:'个活动',
nodata:'No Data',
Password:'Password',
......
src/common/lang/zh.js
View file @ 163af231
......@@ -2295,8 +2295,11 @@ module.exports = {
woman:"女",
selectIndustry:"请选择您从事所属行业",
home:'我的主页',
nointroduction:'暂无简介',
Participated:'参与了',
Events:'个活动',
nodata:'暂无数据',
Password:'密码',
}
......
src/components/index/PageTopindex.vue
View file @ 163af231
......@@ -33,7 +33,7 @@
</div>
<div class="gendisplay" slot="reference">
<p class="iconmail">
<img class="userInfologo" :src="userInfo.empLogo?userInfo.empLogo:require('../../assets/img/defaultlogo.png')" alt="">
<img class="userInfologo" :src="empLogo?empLogo:require('../../assets/img/defaultlogo.png')" alt="">
<span v-if="messageCount!=0"></span>
</p>
<p class="ellipsisFont1 userInfoname">{{empOtherName}}</p>
......@@ -71,10 +71,10 @@
</div>
<div class="top_fixed_title istop_fixed_title" v-if="positions">
<minPageTopindex @topFixedvisible="topFixedvisible" :tabpath="tabpath" :indextab="indextab" :messageCount="messageCount" :empOtherName="empOtherName" :navuserInfo="navuserInfo"></minPageTopindex>
<minPageTopindex @topFixedvisible="topFixedvisible" :tabpath="tabpath" :indextab="indextab" :messageCount="messageCount" :empOtherName="empOtherName" :empLogo="empLogo" :navuserInfo="navuserInfo"></minPageTopindex>
</div>
<div class="top_fixed_title" v-if="isTops">
<minPageTopindex @topFixedvisible="topFixedvisible" :tabpath="tabpath" :indextab="indextab" :messageCount="messageCount" :empOtherName="empOtherName" :navuserInfo="navuserInfo"></minPageTopindex>
<minPageTopindex @topFixedvisible="topFixedvisible" :tabpath="tabpath" :indextab="indextab" :messageCount="messageCount" :empOtherName="empOtherName" :empLogo="empLogo" :navuserInfo="navuserInfo"></minPageTopindex>
</div>
<!--抽屉-->
......@@ -183,6 +183,7 @@
lang: this.$i18n.locale,
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
empOtherName:'',
empLogo:null,
drawer: false,
direction: 'rtl',
positions:false,
......@@ -350,6 +351,7 @@
api.selectByEmpId({empId:this.userInfo.empId}).then((res)=>{
if(res.code==0){
this.empOtherName = res.result.empOtherName;
this.empLogo = res.result.empLogo;
}else{
this.$message.error(res.msg);
}
......
src/components/index/minPageTopindex.vue
View file @ 163af231
......@@ -32,7 +32,7 @@
</div>
<div class="gendisplay" slot="reference" v-if="userInfo" style="height: 44px;line-height: 44px;font-size: 12px;">
<p class="iconmail">
<img style="width: 24px;height: 24px;border-radius: 50%;cursor: pointer;" :src="userInfo.empLogo?userInfo.empLogo:require('../../assets/img/defaultlogo.png')" alt="">
<img style="width: 24px;height: 24px;border-radius: 50%;cursor: pointer;" :src="empLogo?empLogo:require('../../assets/img/defaultlogo.png')" alt="">
<span style="top: 10px;" v-if="messageCounts!=0" @click="handleTo(navuserInfo[0])"></span>
</p>
<p class="ellipsisFont1" style="margin: 0 25px 0 10px;cursor: pointer;max-width: 50px;height: 40px;overflow: hidden;">{{empOtherName}}</p>
......@@ -85,7 +85,7 @@
hrefweb:"https://open.weixin.qq.com/connect/qrconnect?appid=wxf7c7984d24495e1d&redirect_uri="+encodeURIComponent(this.publicFun.getCurrentHrefEnv()+'#/pcauth')+"&response_type=code&scope=snsapi_login&state=#wechat_redirect",
}
},
props:['indextab','messageCount','empOtherName','navuserInfo'],
props:['indextab','messageCount','empOtherName','navuserInfo','empLogo'],
methods:{
handleClick(data,index) {
this.index_hover = data.id;
......
src/views/findeventpage/eventdetail.vue
View file @ 163af231
......@@ -295,7 +295,7 @@
if(data.baseLive&&data.baseLive.liveState == 1){
var liveUrl = this.Base64.encode(data.baseLive.liveUrl);
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
console.log(data)
this.getActivityDetails();
}else{
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.eventdata.channelId,type:this.eventdata.channelType,ismyevent:0}})
}
......
src/views/netWorkpage/networkring.vue
View file @ 163af231
......@@ -239,7 +239,20 @@
this.updateFriendStatus(row,1)
this.$set(this.networkringlist, index, res.result.baseEmpRelationDTO);
}else{
this.$message.error(res.result.addValue);
if(res.result.addState == 4){
this.$confirm(res.result.addValue, {
cancelButtonText: '取消',
confirmButtonText: '编辑资料',
type: '',
customClass: 'deleteConfirm'
}).then(() => {
this.$router.push({path:'/peoplefinfo'});
}).catch(() => {
});
}else{
this.$message.error(res.result.addValue);
}
}
}else{
this.$message.error(res.msg);
......
src/views/peoplehomepage/btnbar.vue
View file @ 163af231
......@@ -106,7 +106,20 @@
this.updateFriendStatus(this.row,1)
this.$emit('successState',res.result,this.index);
}else{
this.$message.error(res.result.addValue);
if(res.result.addState == 4){
this.$confirm(res.result.addValue, {
cancelButtonText: '取消',
confirmButtonText: '编辑资料',
type: '',
customClass: 'deleteConfirm'
}).then(() => {
this.$router.push({path:'/peoplefinfo'});
}).catch(() => {
});
}else{
this.$message.error(res.result.addValue);
}
}
}else{
this.$message.error(res.msg);
......
src/views/peoplehomepage/commonSchool.vue
View file @ 163af231
......@@ -15,8 +15,8 @@
<p>
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 您的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 您的同事</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 的同事</span>
<span v-if="item.relationType == 4">有{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
......
src/views/peoplehomepage/commonWork.vue
View file @ 163af231
......@@ -15,8 +15,8 @@
<p>
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 您的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 您的同事</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 的同事</span>
<span v-if="item.relationType == 4">有{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
......
src/views/peoplehomepage/contactPerson.vue
View file @ 163af231
......@@ -15,8 +15,8 @@
<p>
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 您的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 您的同事</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 的同事</span>
<span v-if="item.relationType == 4">有{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
......
src/views/peoplehomepage/contactbar.vue
View file @ 163af231
......@@ -32,8 +32,8 @@
<p style="color:#AAAAAA;height: 22px;">
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 您的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 您的同事</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 的同事</span>
<span v-if="item.relationType == 4">有{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
......@@ -190,7 +190,20 @@
this.updateFriendStatus(row,1)
this.$set(this.userRelationlist, index, res.result.baseEmpRelationDTO);
}else{
this.$message.error(res.result.addValue);
if(res.result.addState == 4){
this.$confirm(res.result.addValue, {
cancelButtonText: '取消',
confirmButtonText: '编辑资料',
type: '',
customClass: 'deleteConfirm'
}).then(() => {
this.$router.push({path:'/peoplefinfo'});
}).catch(() => {
});
}else{
this.$message.error(res.result.addValue);
}
}
}else{
this.$message.error(res.msg);
......
src/views/peoplehomepage/editAccount.vue
View file @ 163af231
<template>
<div style="min-height: 400px;">
<p style="border-bottom: 1px solid #F2F2F2;margin-bottom: 30px;">
<span style="font-size: 18px;color: #1A1A1E;border-bottom: 2px solid #5D78FF;display: inline-block;padding-bottom: 15px;font-weight: bold;">账号和密码</span>
<span style="font-size: 18px;color: #1A1A1E;border-bottom: 2px solid #5D78FF;display: inline-block;padding-bottom: 15px;font-weight: bold;">{{$t('Otherjson.editpad')}}</span>
</p>
<el-form label-position="right" label-width="120px" class="contnetform180" >
<el-form-item label="账号：">
<el-form-item :label="$t('pubactivities.accountnumber')+'：'">
{{userInfo.empAccount}}
</el-form-item>
<el-form-item label="密码：">
<el-button type="text" @click="visiblepassword = true">修改密码</el-button>
<el-form-item :label="$t('mineInfo.Password')+'：'">
<el-button type="text" @click="visiblepassword = true">{{$t('findPassword.modifyTitle')}}</el-button>
</el-form-item>
<el-form-item label="微信：">
<el-form-item :label="$t('shareInfo.weChatFriend')+'：'">
{{wxNickName}}
</el-form-item>
</el-form>
<div v-if="visiblepassword">
<el-dialog title="修改密码" :visible.sync="visiblepassword" :append-to-body="true" :close-on-click-modal="false" class="dialogWrap500 dialogWrap640">
<el-dialog :title="$t('findPassword.modifyTitle')" :visible.sync="visiblepassword" :append-to-body="true" :close-on-click-modal="false" class="dialogWrap500 dialogWrap640">
<div class="gendisplay" style="margin: 0 auto 20px;display: flex;width: 80%;flex-wrap:wrap;">
<modifyPasswordCmpt></modifyPasswordCmpt>
</div>
......
src/views/peoplehomepage/editAuth.vue
View file @ 163af231
<template>
<div>
<p style="border-bottom: 1px solid #F2F2F2;margin-bottom: 30px;">
<span style="font-size: 18px;color: #1A1A1E;border-bottom: 2px solid #5D78FF;display: inline-block;padding-bottom: 15px;font-weight: bold;">个人信息</span>
<span style="font-size: 18px;color: #1A1A1E;border-bottom: 2px solid #5D78FF;display: inline-block;padding-bottom: 15px;font-weight: bold;">{{$t('drawerInfo.personalAuth')}}</span>
</p>
<!--AS01待提交 AS02待审核 AS03已审核 AS04已拒绝-->
<div class="authFormWrapper">
......
src/views/peoplehomepage/editInfo.vue
View file @ 163af231
......@@ -4,7 +4,7 @@
<span style="font-size: 18px;color: #1A1A1E;border-bottom: 2px solid #5D78FF;display: inline-block;padding-bottom: 15px;font-weight: bold;">{{$t('mineInfo.personalInfo')}}</span>
</p>
<el-form label-position="left" :model="formData" :rules="rules" ref="formData" label-width="120px" class="contnetform180" >
<el-form-item :label="$t('mineInfo.avatar')+':'" ref="guestimg">
<el-form-item :label="$t('mineInfo.avatar')+':'" ref="guestimg" style="padding-left: 10px;">
<div class="uploadImg">
<el-input v-if="false" v-model="formData.empLogo"></el-input>
<uploadcoverbar
......@@ -15,13 +15,13 @@
</uploadcoverbar>
</div>
</el-form-item>
<el-form-item :label="$t('mineInfo.nickname')+':'" prop="nickName">
<el-input v-model="formData.nickName" maxlength="36" :placeholder="$t('mineInfo.placeholderNickName')" style="width: 250px;"></el-input>
<el-form-item :label="$t('mineInfo.nickname')+':'" prop="nickName" style="padding-left: 10px;">
<el-input v-model="formData.nickName" maxlength="36" :placeholder="$t('mineInfo.placeholderNickName')" style="width: 250px;margin-left: -10px;"></el-input>
</el-form-item>
<el-form-item :label="$t('listproject.empName')+':'" prop="empName">
<el-input :disabled="!formData.canEditName" v-model="formData.empName" maxlength="36" :placeholder="$t('Otherjson.plname')" style="width: 250px;"></el-input>
</el-form-item>
<el-form-item v-if="isTrans" label="性别:" prop="topicInitiator">
<el-form-item v-if="isTrans" label="性别:" prop="topicInitiator" style="padding-left: 10px;">
<el-radio-group v-model="formData.sex">
<el-radio :label="0">男</el-radio>
<el-radio :label="1">女</el-radio>
......@@ -30,7 +30,7 @@
<el-form-item :label="$t('mineInfo.intro')+':'" prop="empIntroduction">
<el-input v-model="formData.empIntroduction" :maxlength="isTrans?150:300" :placeholder="$t('mineInfo.placeholderIntro')" style="width: 570px;" type="textarea" :rows="5"></el-input>
</el-form-item>
<el-form-item :label="$t('mineInfo.interest')+':'">
<el-form-item :label="$t('mineInfo.interest')+':'" style="padding-left: 10px;">
<div class="tag_dataLabel">
<span :key="tag.dataId" v-for="tag in empDataLabelList">{{tag.dataName}}</span>
<p @click="visiblefield = true"> <i style="color:#5D78FF;" class="iconfont icon-jiahao"></i>{{$t('releasejson.newcompany')}}</p>
......@@ -134,7 +134,7 @@
</el-form>
<!-- 添加工作经历-->
<el-dialog title="添加工作经历" :visible.sync="visiblejobs" :append-to-body="true" :close-on-click-modal="false" @close="closejobs" class="dialogWrap dialogWrap600 dialogWraptopic">
<el-dialog title="添加工作经历 (从当前工作往前填写)" :visible.sync="visiblejobs" :append-to-body="true" :close-on-click-modal="false" @close="closejobs" class="dialogWrap dialogWrap600 dialogWraptopic">
<div class="centerQrCode" style="margin: 0 50px;">
<el-form label-position="right" :model="workdata" :rules="workrules" ref="workdata" label-width="120px" class="contnetform180" >
<el-form-item label="职位：" prop="workName">
......@@ -171,7 +171,7 @@
<!-- 添加教育经历-->
<el-dialog title="添加教育经历" :visible.sync="visibleeducation" :append-to-body="true" :close-on-click-modal="false" @close="closeeducation" class="dialogWrap dialogWrap600 dialogWraptopic">
<el-dialog title="添加教育经历 (从最高学历开始填写)" :visible.sync="visibleeducation" :append-to-body="true" :close-on-click-modal="false" @close="closeeducation" class="dialogWrap dialogWrap600 dialogWraptopic">
<div class="centerQrCode" style="margin: 0 50px;">
<el-form label-position="right" :model="educationdata" :rules="educationrules" ref="educationdata" label-width="120px" class="contnetform180" >
<el-form-item label="学校：" prop="schoolName">
......
src/views/peoplehomepage/empConcern.vue
View file @ 163af231
......@@ -15,8 +15,8 @@
<p>
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1">有 {{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 您的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 您的同事</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 的同事</span>
<span v-if="item.relationType == 4">有{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
......
src/views/peoplehomepage/followers.vue
View file @ 163af231
......@@ -15,8 +15,8 @@
<p>
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 您的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 您的同事</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 的同事</span>
<span v-if="item.relationType == 4">有{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
......
src/views/peoplehomepage/introductionbar.vue
View file @ 163af231
......@@ -23,9 +23,11 @@
</div>
</div>
<div v-else class="dynamic_content">
<p class="ellipsisFont2" v-html="item.commentsContent"></p>
<div>
{{item.createdTimeStr}} 发布了评论
<p class="ellipsisFont2" v-html="item.commentsContent"></p>
<div>
{{item.createdTimeStr}} 发布了评论
</div>
</div>
</div>
</div>
......
src/views/peoplehomepage/peoplehome.vue
View file @ 163af231
......@@ -62,7 +62,7 @@
</p>
<p>此联系方式为用户个人添加，平台不保证其真实性，请酌情使用。</p>
</div>
<div v-if="empContactData.queryState == 1||empContactData.queryState == 3||empContactData.queryState == 4">
<div style="text-align: center;" v-if="empContactData.queryState == 1||empContactData.queryState == 3||empContactData.queryState == 4">
<span>{{empContactData.queryValue}}</span>
</div>
</div>
......@@ -100,7 +100,7 @@
<span @click="$router.push('/peoplefinfo')">{{$t("commonTitle.editInfo")}}</span>
</div>
</div>
<div v-else>
<div v-if="(!$route.query.id||$route.query.id==userInfo.empId)&&!isTrans">
<div class="btn_topic">
<span @click="$router.push('/peoplefinfo')">{{$t("commonTitle.editInfo")}}</span>
</div>
......@@ -111,24 +111,24 @@
<div class="privacy_left">
<div class="gendisplay">
<p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-jianjie"></i></p>
<p>{{userInfoData.empIntroduction?userInfoData.empIntroduction:'暂无简介'}}</p>
<p :class="privacyshow?'':'ellipsisFont2 introduction'">{{userInfoData.empIntroduction?userInfoData.empIntroduction:$t("mineInfo.nointroduction")}}</p>
<p><i @click="privacyshow = !privacyshow" :class="privacyshow?'el-icon-caret-top':'el-icon-caret-bottom'"></i></p>
</div>
<div class="privacyshow" :class="privacyshow?'privacynone':''">
<div class="gendisplay" v-if="userInfoData.industryName">
<p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-hangye"></i></p>
<p style="margin-left: 10px;">所属行业：{{userInfoData.industryName}}</p>
<p style="margin-left: 10px;">{{$t("mineInfo.industry")}}：{{userInfoData.industryName}}</p>
</div>
<div class="gendisplay">
<p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-riqi1"></i></p>
<p style="margin-left: 10px;">{{userInfoData.registerTime}} 加入TechBook社区</p>
<p style="margin-left: 10px;">{{userInfoData.registerTime}} {{$t("vipInfo.joinIn")}}{{$t("topNav.community")}}</p>
</div>
</div>
<div class="gendisplay" v-if="empDataLabelList&&empDataLabelList.length>=1">
<p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-biaoqian1"></i></p>
<p style="margin-left: 10px;">
<span v-for="(item,index) in empDataLabelList" :key="item.dataId">
{{item.dataName}}
{{isTrans?item.dataName:item.dataNameEn}}
<i style="color: #e8e8e8;">&nbsp;{{empDataLabelList.length-1 == index?'':'|'}}&nbsp;</i>
</span>
</p>
......@@ -206,7 +206,7 @@
<VueQRCodeComponent :text="urltext" :size="186" :margin="0"></VueQRCodeComponent>
</div>
<p style="margin: 10px 0;text-align: center;">
请用微信扫一扫，进入我的-邀请好友 进行邀请赚大额积分
请微信扫一扫，进入我的-点击邀请即得积分或者邀请好友
</p>
</el-dialog>
</div>
......@@ -357,7 +357,20 @@
this.userInfoData.noticedCount = res.result.empConcernCount;
this.updateFriendStatus(1)
}else{
this.$message.error(res.result.addValue);
if(res.result.addState == 4){
this.$confirm(res.result.addValue, {
cancelButtonText: '取消',
confirmButtonText: '编辑资料',
type: '',
customClass: 'deleteConfirm'
}).then(() => {
this.$router.push({path:'/peoplefinfo'});
}).catch(() => {
});
}else{
this.$message.error(res.result.addValue);
}
}
}else{
this.$message.error(res.msg);
......@@ -624,6 +637,11 @@
line-height: 24px;
}
}
.introduction{
width: 100%;
max-height: 48px;
overflow: hidden;
}
}
.number_privacy{
justify-content: center;
......
src/views/peoplehomepage/popoverBardbar.vue
View file @ 163af231
......@@ -42,7 +42,7 @@
</p>
<p>此联系方式为用户个人添加，平台不保证其真实性，请酌情使用。</p>
</div>
<div v-if="empContactData.queryState == 1||empContactData.queryState == 3||empContactData.queryState == 4">
<div style="text-align: center;" v-if="empContactData.queryState == 1||empContactData.queryState == 3||empContactData.queryState == 4">
<span>{{empContactData.queryValue}}</span>
</div>
</div>
......@@ -61,7 +61,7 @@
<VueQRCodeComponent :text="urltext" :size="186" :margin="0"></VueQRCodeComponent>
</div>
<p style="margin: 10px 0;text-align: center;">
请用微信扫一扫，进入我的-邀请好友 进行邀请赚大额积分
请微信扫一扫，进入我的-点击邀请即得积分或者邀请好友
</p>
</el-dialog>
</div>
......
src/views/peoplehomepage/tabActivitybar.vue
View file @ 163af231
<template>
<div class="comment_top">
<div class="comment_top_condition gendisplay">
<p>参与了 <i style="color:#5D78FF;">{{totalListResult}}</i> 个活动</p>
<p>{{$t('mineInfo.Participated')}} <i style="color:#5D78FF;">{{totalListResult}}</i> {{$t('mineInfo.Events')}}</p>
</div>
<div>
<div class="event_content" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
......@@ -47,7 +47,7 @@
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
<span>{{$t('mineInfo.nodata')}}</span>
</p>
</div>
</div>
......
src/views/peoplehomepage/tabAttentionbar.vue
View file @ 163af231
......@@ -11,12 +11,12 @@
<img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
</span>
<div>
<p @click="tohome(item)">{{item.empName}}</p>
<p class="hover_cursor" @click="tohome(item)">{{item.empName}}</p>
<p>
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 您的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 您的同事</span>
<span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
<span v-if="item.relationType == 3">TA 是来自 {{ item.relationValue }} 的同事</span>
<span v-if="item.relationType == 4">有{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
......
src/views/peoplehomepage/tabCommentbar.vue
View file @ 163af231
......@@ -24,7 +24,7 @@
<div>
<div class="event_content" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
<div class="gendisplay" v-for="(item,index) in commentsDynamiclist" :key="index">
<div style="padding: 15px 0;width: 100%;" @click="detailroute(item)">
<div style="padding: 15px 0;width: 100%;cursor: pointer;" @click="detailroute(item)">
<div class="gendisplay">
<div style="position: relative;">
<img v-if="item.userInfo.empLogo" :src="item.userInfo.empLogo" style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
......
src/views/peoplehomepage/tabsbar.vue
View file @ 163af231
<template>
<div>
<div style="background: #ffffff;border-radius: 3px;">
<div style="background: #ffffff;border-radius: 10px;">
<el-tabs :class="positions?'tabFixed':''" class="home_tabs" v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="评论" name="comment" v-if="isTrans"></el-tab-pane>
<el-tab-pane label="关注" name="attention" v-if="isTrans"></el-tab-pane>
......
src/views/peoplehomepage/uploadcoverbar.vue
View file @ 163af231
......@@ -52,14 +52,12 @@
methods:{
srcFileSet(fileName, fileType, fileSize){
var nameArr = fileName.split('.');
const isPng = nameArr[nameArr.length - 1] === 'png';
const isJpg = nameArr[nameArr.length - 1] === 'jpg';
const isJpeg = nameArr[nameArr.length - 1] === 'jpeg';
const isPNG = nameArr[nameArr.length - 1] === 'PNG';
const isJPG = nameArr[nameArr.length - 1] === 'JPG';
const isJPEG = nameArr[nameArr.length - 1] === 'JPEG';
const isLt2M = fileSize / 1024 / 1024 <= 2;
if (!isPNG && !isJPG && !isPng && !isJpg && !isJpeg && !isJPEG ) {
const num = ['jpg','JPG','png','PNG','JPEG','jpeg','gif','GIF','HEIC','heic','HEVC','hevc','HEIF','heif']
const isfile = num.indexOf(nameArr[nameArr.length - 1]);
const isLt5M = fileSize / 1024 / 1024 <= 5;
let db = true;
if (isfile == -1 ) {
db = false;
this.isShowErrorText1 = false;
this.isShowErrorText2 = true;
this.isShowErrorText3 = false;
......@@ -67,7 +65,7 @@
this.isShowErrorText5 = false;
this.$emit("postErrorText2",1)
this.$refs.uploadCmpt.off(true);
} else {
}else if(!isLt5M){
this.isShowErrorText1 = false;
this.isShowErrorText2 = false;
this.isShowErrorText3 = false;
......
src/views/topicpage/discussall.vue
View file @ 163af231
......@@ -7,7 +7,7 @@
</div>
<div class="gendisplay">
<div style="background: #FFFFFF;border-radius: 3px;">
<div v-if="positions" style="padding: 20px;border-bottom: 1px solid #F2F2F2;position: fixed;top: 0;width: 766px;background: #FFFFFF;z-index: 999;">
<div v-if="positions" style="padding: 20px;border-bottom: 1px solid #F2F2F2;position: fixed;top: 44px;width: 766px;background: #FFFFFF;z-index: 999;">
<p :style="activeid == index?'color: #5D78FF;font-weight: bold;':''" @click="climenu(index)" style="color: #1A1A1E;padding-right: 40px;line-height: 34px;display: inline-block;cursor: pointer;" v-for="(item,index) in classlist" :key="index">{{item.dataName}}</p>
</div>
<div style="padding: 20px;border-bottom: 1px solid #F2F2F2;">
......
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