Commit 917459c2 authored by anxixi's avatar anxixi

人脉圈

parent 955bc045
......@@ -922,4 +922,19 @@
bottom: 0px;
width: 15px;
}
}
//暂无数据
.noIntegral{
text-align: center;
padding: 100px 0;
>img{
width: 120px;
}
>span{
display: block;
color: #aaaaaa;
margin-top: 20px;
}
}
\ No newline at end of file
......@@ -32,8 +32,11 @@
</p>
</div>
<div class="gendisplay" slot="reference">
<p><img class="userInfologo" :src="userInfo.empLogo?userInfo.empLogo:require('../../assets/img/defaultlogo.png')" alt=""></p>
<p class="ellipsisFont1 userInfoname">{{userInfo.empName}}</p>
<p class="iconmail">
<img class="userInfologo" :src="userInfo.empLogo?userInfo.empLogo:require('../../assets/img/defaultlogo.png')" alt="">
<span v-if="messageCount!=0"></span>
</p>
<p class="ellipsisFont1 userInfoname">{{empOtherName}}</p>
</div>
</el-popover>
......@@ -101,8 +104,11 @@
</p>
</div>
<div class="gendisplay" slot="reference" v-if="userInfo" style="height: 44px;line-height: 44px;font-size: 12px;">
<p><img style="width: 24px;height: 24px;border-radius: 50%;cursor: pointer;" :src="userInfo.empLogo?userInfo.empLogo:require('../../assets/img/defaultlogo.png')" alt=""></p>
<p class="ellipsisFont1" style="margin: 0 25px 0 10px;cursor: pointer;max-width: 50px;height: 40px;overflow: hidden;">{{userInfo.empName}}</p>
<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="">
<span v-if="messageCount!=0"></span>
</p>
<p class="ellipsisFont1" style="margin: 0 25px 0 10px;cursor: pointer;max-width: 50px;height: 40px;overflow: hidden;">{{empOtherName}}</p>
</div>
</el-popover>
<!-- <div class="gendisplay">-->
......@@ -214,11 +220,12 @@
navuserInfo:[
{name:'我的主页',path:'/peoplehome',icon:'icon-wodezhuyeicon',id:1},
{name:'工作台',path:'/seeprojectlist',icon:'icon-gongzuotai',id:2},
{name:'我的评论',path:'',icon:'icon-wodepingjia',id:3},
// {name:'我的评论',path:'',icon:'icon-wodepingjia',id:3},
{name:'编辑资料',path:'/peoplefinfo',icon:'icon-xitongguanli',id:4},
{name:'退出登录',path:'',icon:'icon-exit',id:5},
],
envisible:false,
messageCount:0,
indextab:this.indextab_zh,
indextab_zh:[
{id:1,name:this.$t("topNav.index"),path:'/',pathchild:'/'},
......@@ -241,6 +248,7 @@
index_hover:1,
lang: this.$i18n.locale,
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
empOtherName:'',
drawer: false,
direction: 'rtl',
positions:false,
......@@ -399,12 +407,38 @@
}
}
},
//用户个人信息
getByEmpId(){
api.selectByEmpId({empId:this.userInfo.empId}).then((res)=>{
if(res.code==0){
this.empOtherName = res.result.empOtherName;
}else{
this.$message.error(res.msg);
}
}).catch((err)=>{
this.$message.error(err);
})
},
//新消息
getMessageCount(){
api.selectMessageCount(this.userInfo.empId).then((res)=>{
if(res.code==0){
this.messageCount = res.result;
}else{
this.$message.error(res.msg);
}
}).catch((err)=>{
this.$message.error(err);
})
},
},
beforeDestroy() { // 在组件生命周期结束的时候销毁。
window.removeEventListener('scroll', this.menu);
globalMsg.$off('isTopindex');
},
mounted() {
this.getByEmpId();
this.getMessageCount();
this.indextab = this.$i18n.locale == 'zh-CN'?this.indextab_zh:this.indextab_en;
this.wxopenlogin();
this.tabstate(this.$route.path);
......@@ -415,6 +449,7 @@
window.removeEventListener('scroll', this.menu);
}
globalMsg.$on("isTopindex", (data) => {
if(data == '/peoplehome/tabs/news')this.messageCount = 0;
if(data == '/'){
this.isTops = false;
window.addEventListener('scroll', this.menu);
......@@ -698,4 +733,16 @@
opacity: 1
}
}
.iconmail{
position: relative;
>span{
position: absolute;
right: 0;
top: 0;
width: 7px;
height: 7px;
border-radius: 50%;
background: #FF5D5D;
}
}
</style>
\ No newline at end of file
......@@ -165,7 +165,18 @@ export default {
//快速登录
wxquicklyLogin(params){
return api.fetchLoadingLogin('/base/login/wxWebBind',Qs.stringify(params));
}
},
//获取个人用户信息
selectByEmpId(params){
return api.fetchPost('/base/emp/selectByEmpId',Qs.stringify(params));
},
//获取新消息
selectMessageCount(params){
return api.fetchGet("/business/my/selectMessageCount?empId="+params)
},
}
\ No newline at end of file
......@@ -81,12 +81,12 @@
});
},
//去主页
tohome(row){
tohome(id){
if(!this.publicFun.getUserInfoCookieType()){
this.$refs.login.isexpertVisible();
return
}else{
this.$router.push({path:"/peoplehome",query:{id:row.empId}});
this.$router.push({path:"/peoplehome",query:{id:id}});
}
},
},
......
......@@ -3,7 +3,7 @@
<div class="home_top">
<p>在这里发现更多联系人</p>
<div>
<el-input class="network_inp" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-input class="network_inp" @keyup.enter.native="searchDetail" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-button @click="searchDetail" type="primary" style="margin-left: -2px;">搜索</el-button>
</div>
</div>
......@@ -38,11 +38,14 @@
</div>
</div>
</div>
<expertVisible ref="login" @dataEvent="successlogin" :registerType="106"></expertVisible>
</div>
</template>
<script>
import api from "./api/api";
import dynamicbar from "./dynamicbar";
import expertVisible from "../../components/login/quicklogin";
export default {
name: "networkSearch",
data(){
......@@ -55,7 +58,7 @@
total:0,
networkringlist:[],
loading:false,
empInfo:this.publicFun.getUserInfoCookieType()?JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())):undefined,
userInfo:this.publicFun.getUserInfoCookieType()?JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())):undefined,
}
},
computed: {
......@@ -66,7 +69,14 @@
return this.loading || this.noMore
}
},
components:{expertVisible},
methods:{
//登陆成功
successlogin(){
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
this.cur_page = 1;
this.getuserSearch();
},
load () {
if(this.cur_page <= this.pages){
this.cur_page++;
......
......@@ -3,7 +3,7 @@
<div class="home_top">
<p>在这里发现更多联系人</p>
<div>
<el-input class="network_inp" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-input class="network_inp" @keyup.enter.native="searchDetail" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-button @click="searchDetail" type="primary" style="margin-left: -2px;">搜索</el-button>
</div>
</div>
......@@ -29,7 +29,7 @@
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
</p>
<p v-if="item.relationValue== 2 || item.relationValue == 3" class="btn_relation">
<p v-if="item.relationType== 2 || item.relationType == 3" class="btn_relation">
<span @click="addEmpContact(item,index)">
<i v-if="item.isFriend == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{item.isFriend == 0?'联系人':item.isFriend == 1?'已添加联系人':'互为联系人'}}
......
......@@ -30,13 +30,13 @@
</div>
<p class="ellipsisFont1" style="color:#1A1A1E;height: 24px;">{{item.empIntroduction}}</p>
<p style="color:#AAAAAA;height: 22px;">
<span v-if="item.relationValue == 0"></span>
<span v-if="item.relationValue == 1" @click="getCommonContact(item)">{{item.relationValue}} 个共同联系人</span>
<span v-if="item.relationValue == 2">共同学校的人</span>
<span v-if="item.relationValue == 3">共同单位的人</span>
<span v-if="item.relationValue == 4">{{ item.relationValue }}关注者</span>
<span v-if="item.relationValue == 5">共同加入话题的人</span>
<span v-if="item.relationValue == 6">共同兴趣的人</span>
<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 == 4">{{ item.relationValue }}关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
</p>
</div>
</div>
......@@ -64,6 +64,7 @@
userContact:{},
}
},
props:['mustNotType'],
components:{userContactbar},
methods:{
getCommonContact(row){
......@@ -81,10 +82,10 @@
}
this.getuserRelation();
},
getuserRelation(){
getuserRelation(val){
// let empInfo = this.publicFun.getUserInfoCookieType()?JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())):undefined;
// let dataId = empInfo?'&empId='+empInfo.empId:'';
let params = 'pageIndex='+this.cur_page+'&pageSize='+this.numberData;
let mustNotType = val?'&mustNotType='+val:'';
let params = 'pageIndex='+this.cur_page+'&pageSize='+this.numberData+mustNotType;
api.userRelationUser(params).then((res)=>{
if(res.code==0){
this.userRelationlist = res.result.records;
......@@ -201,6 +202,11 @@
},
mounted() {
this.getuserRelation();
},
watch:{
mustNotType(val){
this.getuserRelation(val);
}
}
}
</script>
......
......@@ -19,7 +19,7 @@
<el-input v-model="formData.nickName" maxlength="36" placeholder="请输入昵称" style="width: 250px;"></el-input>
</el-form-item>
<el-form-item label="姓名:" prop="empName">
<el-input v-model="formData.empName" maxlength="36" placeholder="请输入姓名" style="width: 250px;"></el-input>
<el-input :disabled="!formData.canEditName" v-model="formData.empName" maxlength="36" placeholder="请输入姓名" style="width: 250px;"></el-input>
</el-form-item>
<el-form-item label="性别:" prop="topicInitiator">
<el-radio-group v-model="formData.sex">
......
......@@ -10,23 +10,23 @@
<div>
<el-row :gutter="30">
<el-col :span="12" v-for="(item,index) in dynamicList" :key="index">
<div @click="$router.push({path:'/articleDetail',query:{id:item.id,newnpen:true}})" v-if="item.commentsType == 1" class="dynamic_content">
<div @click="$router.push({path:'/articleDetail',query:{id:item.id,newnpen:true}})" v-if="item.commentsType == 2" class="dynamic_content">
<div>
<p class="ellipsisFont2" v-html="item.commentsContent">
</p>
<div>
{{item.createdTimeStr}} 发布了
{{item.createdTimeStr}} 发布了
</div>
</div>
</div>
<div @click="$router.push({path:'/discussdetail',query:{disId:item.id,id:item.pid}})" v-if="item.commentsType == 2" class="dynamic_content">
<div @click="$router.push({path:'/discussdetail',query:{disId:item.id,id:item.pid}})" v-if="item.commentsType == 1" class="dynamic_content">
<div>
<p class="ellipsisFont2" v-html="item.commentsContent">
</p>
<div>
{{item.createdTimeStr}} 发布了
{{item.createdTimeStr}} 发布了
</div>
</div>
</div>
......
......@@ -27,11 +27,7 @@
name: "peoplefinfo",
data() {
return {
dataytpe:[
{name:'基本资料',type:1,icon:'icon-jibenziliao'},
{name:'个人信息',type:2,icon:'icon-jibenziliao_huaban'},
{name:'账号和密码',type:3,icon:'icon-xiugaimima'},
],
dataytpe:[],
activeName:1,
......@@ -42,7 +38,18 @@
},
mounted() {
if(!this.publicFun.isgetUserRoleFunc(2)&&!this.publicFun.isgetUserRoleFunc(5)){
this.dataytpe = [
{name:'基本资料',type:1,icon:'icon-jibenziliao'},
{name:'个人信息',type:2,icon:'icon-jibenziliao_huaban'},
{name:'账号和密码',type:3,icon:'icon-xiugaimima'},
]
}else{
this.dataytpe = [
{name:'基本资料',type:1,icon:'icon-jibenziliao'},
{name:'账号和密码',type:3,icon:'icon-xiugaimima'},
]
}
}
}
</script>
......
......@@ -40,7 +40,7 @@
</p>
<p class="contact_btn">
<span @click="$router.push({path:'/userintegral'})">赚积分</span>
<span>邀请好友</span>
<span @click="userStateclk">邀请好友</span>
</p>
</div>
<div v-if="empContactData.queryState == 2">
......@@ -68,7 +68,7 @@
<i @click="empContact" v-if="$route.query.id&&$route.query.id != userInfo.empId" style="cursor: pointer;font-size: 16px;" slot="reference" class="iconfont icon-mingpian1"></i>
</el-popover>
</span>
<span class="iconmail" v-if="!$route.query.id|| $route.query.id == userInfo.empId">
<span @click="topageType('/peoplehome/tabs/news')" class="iconmail" v-if="!$route.query.id|| $route.query.id == userInfo.empId">
<i class="iconfont icon-mail"></i>
<span v-if="userInfoData.unreadMsg"></span>
</span>
......@@ -90,7 +90,7 @@
</span>
</div>
<div v-else class="btn_topic">
<span>邀请加入人脉圈</span>
<span @click="userStateclk">邀请加入人脉圈</span>
<span @click="$router.push('/peoplefinfo')">编辑资料</span>
</div>
</div>
......@@ -118,7 +118,7 @@
<p style="margin-left: 10px;">{{userInfoData.registerTime}} 加入TechBook社区</p>
</div>
</div>
<div class="gendisplay">
<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">
......@@ -137,7 +137,7 @@
<p>{{userInfoData.noticedCount}}</p>
<p>关注者</p>
</div>
<div v-if="!$route.query.id || $route.query.id==userInfo.empId">
<div @click="topageType('/peoplehome/tabs/integral')" v-if="!$route.query.id || $route.query.id==userInfo.empId">
<p>{{userInfoData.empIntegral}}</p>
<p>积分</p>
</div>
......@@ -166,7 +166,7 @@
<commonSchool v-if="basetype == 8" :id="$route.query.id"></commonSchool>
</div>
<div v-if="isTrans">
<contactbar @empConcernCount="empConcernCount"></contactbar>
<contactbar :mustNotType="mustNotType" @empConcernCount="empConcernCount"></contactbar>
</div>
</div>
</div>
......@@ -174,6 +174,19 @@
</div>
</div>
<el-dialog
:visible.sync="visible"
width="350px"
:show-close="false"
:close-on-click-moda="false"
center>
<div class="centerQrCode">
<VueQRCodeComponent :text="urltext" :size="186" :margin="0"></VueQRCodeComponent>
</div>
<p style="margin: 10px 0;text-align: center;">
请用微信扫一扫,进入我的-邀请好友 进行邀请赚大额积分
</p>
</el-dialog>
</div>
</template>
......@@ -188,6 +201,7 @@
import empConcern from "./empConcern";
import commonWork from "./commonWork";
import commonSchool from "./commonSchool";
import VueQRCodeComponent from "vue-qrcode-component";
export default {
name : "peoplehome",
data() {
......@@ -197,6 +211,7 @@
userInfoData:{},
empDataLabelList:[],//用户兴趣标签
basetype:1,
mustNotType:null,
empRelationstate:{},
activeName:'comment',
empContactstate:{
......@@ -206,14 +221,21 @@
baseEmpInformation:{}
},
detailInfo:{},//勋章
visible:false,
urltext:'',
isTrans:this.publicFun.getCookie("language")=="zh-CN"?true:false,
userInfo : this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : {},
}
},
components:{
contactbar,introductionbar,tabsbar,mineMedal,followers,contactPerson,empConcern,commonWork,commonSchool
contactbar,introductionbar,tabsbar,mineMedal,followers,contactPerson,empConcern,commonWork,commonSchool,VueQRCodeComponent
},
methods:{
//好友邀请
userStateclk(){
this.visible = true;
this.urltext = this.publicFun.getCurrentHrefEnv() + "/inviteRegister" + "?rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1";
},
getPersonalCenter(){
api.getPersonalCenter(this.$route.query.id?this.$route.query.id:this.userInfo.empId).then((res)=>{
if(res.code==0){
......@@ -331,15 +353,12 @@
}else{
this.$router.push({path:routers});
}
if(routers == '/peoplehome/commonWork')this.mustNotType = 3;
else if(routers == '/peoplehome/commonSchool')this.mustNotType = 2;
else this.mustNotType = null;
},
//查看联系方式
empContact(){
this.empContactData = {
baseEmpInformation:{}
};
this.empContactstate = {
isConstact:true,
};
api.selectBaseEmpContact({otherEmpId:this.$route.query.id}).then((res)=>{
if(res.code==0){
this.empContactstate = res.result;
......@@ -552,7 +571,6 @@
}
>div:last-child{
margin-right: 0;
cursor: none;
}
}
}
......
......@@ -7,7 +7,7 @@
<div class="event_content" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
<div class="gendisplay" v-for="(item,index) in myeventlist" :key="index">
<div class="event_content_l">
<div @click="$router.push({path:'/myeventdetail',query:{id:item.channelId,ismyevent:1}})">
<div @click="myeventdetail(item)">
<el-image
style="width: 150px;height: 90px;"
:src="item.channelPic"
......@@ -44,6 +44,12 @@
</div>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="loading">{{$t('industryjson.loading')}}</p>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="noMore">{{$t('industryjson.nomore')}}</p>
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
</div>
</div>
</div>
......@@ -61,6 +67,7 @@
totalListResult: 0,
pages:0,
numberData: 10, //设置个数
iscontent:false,
loading:false,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
}
......@@ -77,6 +84,10 @@
}
},
methods: {
myeventdetail(row){
// this.$router.push({path:'/myeventdetail',query:{id:row.channelId,ismyevent:1}});
window.open(this.publicFun.getCurrentHrefEnv()+"#/myeventdetail?id="+row.channelId+'&ismyevent=1');
},
//打开直播
openeventlive(row){
var liveUrl = this.Base64.encode(row.baseLive.liveUrl);
......@@ -139,6 +150,11 @@
this.myeventlist.push(response.result.records[i]);
}
}
if(this.myeventlist&&this.myeventlist.length == 0){
this.iscontent = true;
}else{
this.iscontent = false;
}
this.loading = false;
this.pages = response.result.pages;
this.totalListResult = response.result.total;
......
......@@ -26,6 +26,14 @@
</div>
</el-col>
</el-row>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="loading">{{$t('industryjson.loading')}}</p>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="noMore">{{$t('industryjson.nomore')}}</p>
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
</div>
<div v-if="visibleContact">
<userContactbar :rowData="userContact" @closecontact="closecontact"></userContactbar>
......
......@@ -63,18 +63,22 @@
</i>
</div>
<!--讨论中展示图片-->
<template v-if="item.commentsType == 1">
<el-image
v-if="item.discussUrl&&item.discussUrl.length>1"
:style="item.discussUrl.split(',').length == 1?'width: 380px;height: 240px;':'width: 120px;height: 120px;'"
style="border: 1px solid #E7E9F5;border-radius:0px;margin-right: 20px; "
v-for="(itemimg,index) in item.discussUrl.split(',')"
:key="index"
fit="cover"
:src="itemimg"
:preview-src-list="getSrcList(item.discussUrl.split(','),index)">
</el-image>
</template>
<div v-if="item.commentsType == 1" class="gendisplay">
<p class="imgInfo"
v-if="item.discussUrl.split(',').length == 1&&item.discussUrl.length > 1"
v-for="(itemimg,index) in item.discussUrl.split(',')"
style="width: 380px;height: 240px;border-radius: 3px;"
:style="{backgroundImage:'url('+(itemimg)+')'}">
&nbsp;
</p>
<p class="imgInfo"
v-if="item.discussUrl.split(',').length > 1"
v-for="(itemimg,index) in item.discussUrl.split(',')"
style="width: 120px;height: 120px;margin-right: 15px;border-radius: 3px;"
:style="{backgroundImage:'url('+(itemimg)+')'}">
&nbsp;
</p>
</div>
<!--讨论分享、评论、点赞操作-->
<div class="gendisplay operating">
......@@ -103,6 +107,12 @@
</div>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="loading">{{$t('industryjson.loading')}}</p>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="noMore">{{$t('industryjson.nomore')}}</p>
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
</div>
</div>
</template>
......@@ -124,6 +134,7 @@
numberData: 10, //设置个数
totalListResult:0,
loading:false,
iscontent:false,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
}
},
......@@ -140,8 +151,8 @@
},
methods: {
detailroute(row){
if(row.commentsType == 1)this.$router.push({path:'/discussdetail',query:{id:row.pid,disId:row.id}});
else this.$router.push({path:'/articleDetail',query:{id:row.pid,newnpen:'true'}});
if(row.commentsType == 1)window.open(this.publicFun.getCurrentHrefEnv()+"#/discussdetail?id="+row.pid+'&disId='+row.id);
else window.open(this.publicFun.getCurrentHrefEnv()+"#/articleDetail?id="+row.pid+'&newnpen=true');
},
activeclk(row){
this.activeName = row.key;
......@@ -191,6 +202,11 @@
this.commentsDynamiclist.push(response.result.records[i]);
}
}
if(this.commentsDynamiclist&&this.commentsDynamiclist.length == 0){
this.iscontent = true;
}else{
this.iscontent = false;
}
this.loading = false;
this.pages = response.result.pages;
this.totalListResult = response.result.totalStr;
......
......@@ -42,6 +42,12 @@
:total="totalListResult">
</el-pagination>
</div>
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
</div>
</div>
......@@ -96,6 +102,7 @@
searchIndex:0,
userInforealtime:{},
integralVisible:false,
iscontent:false,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : {},
}
},
......@@ -139,6 +146,11 @@
api.selectIntegralDetailList(params).then(response => {
if(response.code == 0) {
this.integralDetailList = response.result.records;
if(this.integralDetailList&&this.integralDetailList.length == 0){
this.iscontent = true;
}else{
this.iscontent = false;
}
this.totalListResult = response.result.total;
} else {
this.$message.error(response.msg);
......
......@@ -53,6 +53,12 @@
</div>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="loading">{{$t('industryjson.loading')}}</p>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="noMore">{{$t('industryjson.nomore')}}</p>
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
</div>
</template>
......@@ -80,6 +86,7 @@
numberData: 10, //设置个数
totalListResult:0,
loading:false,
iscontent:false,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
}
},
......@@ -132,6 +139,11 @@
this.newslist.push(response.result.records[i]);
}
}
if(this.newslist&&this.newslist.length == 0){
this.iscontent = true;
}else{
this.iscontent = false;
}
this.loading = false;
this.pages = response.result.pages;
this.totalListResult = response.result.totalStr;
......
......@@ -42,7 +42,7 @@
{{item.guessState == 1?'邀请好友赚积分':item.guessState == 2?'分享领积分':item.guessState == 3&&item.isSelect?'Show一下':item.guessState == 3&&item.isSelect==false?'赚取更多积分':''}}
</p>
</div>
<div class="quiz_state" @click="item.publishStatus == 1?$router.push({path:'/guessDetail',query:{id:item.guessId}}):''">
<div class="quiz_state" @click="guessDetail(item)">
<p class="imgInfo" :style="{backgroundImage:'url('+(item.coverUrl?item.coverUrl:'')}"></p>
<i
class="signing"
......@@ -50,7 +50,7 @@
{{item.publishStatus == 2?'已下架':item.guessState == 1?'进行中':item.guessState == 2?'等待公布结果':item.guessState == 3?'已结束':''}}
</i>
</div>
<div class="quiz_main" @click="item.publishStatus == 1?$router.push({path:'/guessDetail',query:{id:item.guessId}}):''">
<div class="quiz_main" @click="guessDetail(item)">
<p>{{item.guessTitle}}</p>
<div class="gendisplay">
<p v-if="item.guessState == 2" style="color:#69697A;">预计{{item.guessTime}}公布结果</p>
......@@ -90,6 +90,12 @@
</div>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="loading">{{$t('industryjson.loading')}}</p>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="noMore">{{$t('industryjson.nomore')}}</p>
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
</div>
<el-dialog
......@@ -126,6 +132,7 @@
numberData: 10, //设置个数
loading:false,
visible:false,
iscontent:false,
urltext:'',
guessState1:[{lable:null,value:'全部'},{lable:1,value:'进行中'},{lable:2,value:'待公布结果'},{lable:3,value:'已结束'}],
guessState2:[{lable:null,value:'全部'},{lable:4,value:'我赢的'},{lable:5,value:'我输的'}],
......@@ -146,6 +153,10 @@
}
},
methods: {
guessDetail(row){
// if(row.publishStatus == 1)this.$router.push({path:'/guessDetail',query:{id:item.guessId}});
if(row.publishStatus == 1)window.open(this.publicFun.getCurrentHrefEnv()+"#/guessDetail?id="+row.guessId);
},
//条件筛选
guessStatetype1(){
let num = '';
......@@ -187,7 +198,7 @@
},
guessStateclk(val){
if(val.guessState == 3&&val.isSelect==false){
this.$router.push({path:'/userintegral',query:{}})
this.$router.push({path:'/userintegral',query:{}});
}else{
this.visible = true;
this.urltext = this.publicFun.getCurrentHrefEnv() + '#/guessDetail?id='+val.guessId;
......@@ -221,6 +232,11 @@
this.myguesslist.push(response.result.records[i]);
}
}
if(this.myguesslist&&this.myguesslist.length == 0){
this.iscontent = true;
}else{
this.iscontent = false;
}
this.loading = false;
this.pages = response.result.pages;
} else {
......@@ -335,4 +351,12 @@
color: #FFFFFF;
font-size: 12px;
}
.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;
}
</style>
\ No newline at end of file
......@@ -37,6 +37,12 @@
</div>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="loading">{{$t('industryjson.loading')}}</p>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="noMore">{{$t('industryjson.nomore')}}</p>
<div v-if="iscontent">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
</div>
</div>
</template>
......@@ -54,6 +60,7 @@
tabsType:0,
numberData: 10, //设置个数
totalListResult:0,
iscontent:false,
loading:false,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
}
......@@ -71,7 +78,8 @@
},
methods: {
todetail(row){
this.$router.push({path:"/topicDetails",query:{id:row.topicId,newnpen:true}});
// this.$router.push({path:"/topicDetails",query:{id:row.topicId,newnpen:true}});
window.open(this.publicFun.getCurrentHrefEnv()+"#/topicDetails?id="+row.topicId+'&newnpen=true');
},
tabsTypes(state){
this.tabsType = state;
......@@ -114,6 +122,11 @@
this.baseTopicList.push(response.result.records[i]);
}
}
if(this.baseTopicList&&this.baseTopicList.length == 0){
this.iscontent = true;
}else{
this.iscontent = false;
}
this.loading = false;
this.pages = response.result.pages;
this.totalListResult = response.result.totalStr;
......
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