Merge remote-tracking branch 'origin/master'

src/common/lang/en.js

@@ -1912,6 +1912,7 @@ module.exports = {
         myJoin:"Participated Events",
         timeZone:"TimeZone",
         recommendFor:"Recommended for you",
+        relatedInformation:'related Information',
         date:"Date",
         signUpDialogTitle: "Sign up",
         liveTitle:" Live",
@@ -1970,6 +1971,8 @@ module.exports = {
         shareFriend:"Share to friends",
         shareComment:"Share to moments",
         industryReportZy:"Insight into industry development, speak with data, and interpret technical directions, the industry research reports you want are here.",
+        close:'Close',
+        open:'Open',
 
     },
 
@@ -2049,6 +2052,11 @@ module.exports = {
         addone:'Add one',
         create:'Create',
         deletefield:'Delete field',
+        ContactDetails:'Contact Details',
+        guesttitle: 'title',
+        guestDesc:'Guest Profile',
+        guestUp:'Up',
+        guestDown:'Down',
         guestname:'Guest name',
         plguestname:'Please enter guest name',
         guestTitle:'Guest Title',

src/common/lang/zh.js

@@ -2007,6 +2007,7 @@ module.exports = {
         myJoin: "我参与的活动",
         timeZone: "时区",
         recommendFor: "为您推荐",
+        relatedInformation:'相关内容',
         date: "时间",
         signUpDialogTitle: "我要报名",
         liveTitle: " 直播",
@@ -2062,6 +2063,9 @@ module.exports = {
         shareFriend: "分享给朋友",
         shareComment: "分享到朋友圈",
         industryReportZy: "洞悉行业发展，用数据说话，解读技术方向，你想要的行业研究报告都在这里。",
+        close:'收起',
+        open:'展开',
+
     },
 
     //活动
@@ -2140,6 +2144,11 @@ module.exports = {
         addone: '新增一条',
         create: '创建',
         deletefield: '删除字段',
+        ContactDetails:'嘉宾联系方式',
+        guestDesc:'嘉宾简介',
+        guestUp:'上移',
+        guestDown:'下移',
+        guesttitle: '嘉宾title',
         guestname: '嘉宾名称',
         plguestname: '请输入嘉宾名称',
         guestTitle: '嘉宾Title',

src/views/categorypage/category.vue

@@ -182,11 +182,11 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label=" " prop="otherContent" v-if="isotherContent">
-                    <el-input style="width: 300px;" maxlangth="36" v-model="formData.otherContent" placeholder="请输入内容"></el-input>
+                <el-form-item label=" " v-if="isotherContent">
+                    <el-input @input="$forceUpdate()" style="width: 300px;" maxlength="50" v-model="formData.otherContent" placeholder="请输入内容"></el-input>
                 </el-form-item>
                 <el-form-item label="重要信息补充：" prop="supplementInfo">
-                    <el-input type="textarea" :rows="4" maxlangth="500" style="width: 300px;" placeholder="例如：联系方式/联系人/大赛名称/履约名称等信息补充" v-model="formData.supplementInfo"></el-input>
+                    <el-input @input="$forceUpdate()" type="textarea" :rows="4" maxlength="500" style="width: 300px;" placeholder="例如：联系方式/联系人/大赛名称/履约名称等信息补充" v-model="formData.supplementInfo"></el-input>
                 </el-form-item>
             </el-form>
             <el-row style="padding-top: 20px;text-align: center">
@@ -213,7 +213,7 @@
                 //校验
                 rules: {
                     supplementInfo: [{required: true,message:'请输入重要信息补充',trigger: 'blur'}],
-                    otherContent: [{required: true,message:'请输入内容',trigger: 'blur'}],
+                    // otherContent: [{required: true,message:'请输入内容',trigger: 'blur'}],
                     categoryCode: [{required: true,message:'请选择分类',trigger: 'change'}],
                     linprojectLabelDTOList: [{required: true,message:'请选择标签',trigger: 'change'}],
                 },
@@ -264,6 +264,10 @@
             closeSensor(){
                 this.$refs['formData'].resetFields();
                 this.isotherContent = false;
+                this.formData = {
+                    linprojectLabelDTOList:[],
+                    otherContent:'',
+                };
             },
             tagging(row){
                 if(row.categoryCode){
@@ -271,11 +275,12 @@
                         if(response.code == 0) {
                             let linprojectLabelDTOList = [];
                             this.formData = response.result;
+                            this.formData.otherContent = '';
                             for(let i in this.formData.projectLabelDTOList){
                                 linprojectLabelDTOList.push(this.formData.projectLabelDTOList[i].labelCode)
                                 if(this.formData.projectLabelDTOList[i].labelCode == 'LT08'){
                                     this.isotherContent = true;
-                                    this.formData.otherContent = this.formData.projectLabelDTOList[i].otherContent;
+                                    if(this.formData.projectLabelDTOList[i].otherContent)this.formData.otherContent = this.formData.projectLabelDTOList[i].otherContent;
                                 }
                             }
                             this.formData.linprojectLabelDTOList = linprojectLabelDTOList;
@@ -297,6 +302,7 @@
                 window.open(this.publicFun.getCurrentHrefEnv()+"/viewproject?projectId="+row.projectId+'&state=0');
             },
             supplementContent(){
+                this.$forceUpdate();
                 for(let i in this.formData.linprojectLabelDTOList){
                     if(this.formData.linprojectLabelDTOList[i] == 'LT08'){
                         this.isotherContent = true;
@@ -310,9 +316,17 @@
             setamount(){
                 this.$refs.formData.validate((valid) => {
                     if(valid) {
+                        if(this.formData.linprojectLabelDTOList.length == 0){
+                            this.$message.error('请选择标签');
+                            return
+                        }
                         let projectLabelDTOList = [];
                         for(let i in this.formData.linprojectLabelDTOList){
                             if( this.formData.linprojectLabelDTOList[i] == 'LT08'){
+                                if(this.formData.otherContent == ''){
+                                    this.$message.error('请输入内容');
+                                    return
+                                }
                                 projectLabelDTOList.push({labelCode:this.formData.linprojectLabelDTOList[i],otherContent:this.formData.otherContent});
                             }else{
                                 projectLabelDTOList.push({labelCode:this.formData.linprojectLabelDTOList[i]});
@@ -327,6 +341,7 @@
                                     linprojectLabelDTOList:[],
                                 };
                                 this.getselectCoreProjectList();
+                                this.authcountdata();
                             } else {
                                 this.$message.error(response.msgCode);
                             }
@@ -499,7 +514,7 @@
                             item.industryId = item.dictKey;
                             item.screenchildList = null;
                         } );
-                        this.subjfectlist = response.result;
+                        if(response.result)this.subjfectlist = response.result;
                     } else {
                         this.$message.error(response.msgCode);
                     }

src/views/findeventpage/userlist.vue

@@ -15,8 +15,8 @@
                                 <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&&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>
+                                <popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
+                                <btnbar v-else :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
                             </div>
                         </div>
                         <p @click="item.empId?tohome(item):''" class="ellipsisFont1" style="color:#AAAAAA;overflow: hidden;">

src/views/industryreportspage/pushindustry.vue

@@ -113,7 +113,7 @@
                 if(this.isflag == 0){
                     this.$refs.formreport.clearValidate();
                 }
-                if((this.formData.reportContent&&this.formData.reportContent.length == 11)||!this.formData.reportContent){
+                if(this.formData.reportContent&&this.publicFun.unique(this.formData.reportContent).length == 0&&this.formData.reportContent&&this.formData.reportContent.length < 30){
                     this.$message.error('请输入报告介绍')
                     return
                 }

src/views/peoplehomepage/introductionbar.vue

 <template>
     <div>
-        <div class="p_jobs p_tabs" v-if="(workList&&workList.length == 0)&&(educationList&&educationList.length == 0)&&(dynamicList&&dynamicList.length == 0)">
+        <div class="p_jobs p_tabs" v-if="(workList == null||workList&&workList.length == 0)&&(educationList == null||educationList&&educationList.length == 0)&&(dynamicList&&dynamicList.length == 0)">
             <div>
                 <p class="noIntegral">
                     <img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
@@ -189,7 +189,7 @@
             getMyDynamicList(){
                 api.selectMyDynamicList({empId:this.id?this.id:this.userInfo.empId}).then((res)=>{
                     if(res.code==0){
-                        this.dynamicList = res.result;
+                        if(res.result)this.dynamicList = res.result;
                     }else{
                         this.$message.error(res.msg);
                     }

src/views/peoplehomepage/tabActivitybar.vue

@@ -26,12 +26,12 @@
                                 <i class="iconfont icon-zhibo"></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 style="font-size: 14px;" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId,ismyevent:1}})">
+                            <span style="font-size: 14px;"  @click="myeventdetail(item)">
                                 {{item.channelTitle}}
                             </span>
                         </p>
-                        <p class="ellipsisFont1" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
-                        <p @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p>
+                        <p class="ellipsisFont1" @click="myeventdetail(item)">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
+                        <p @click="myeventdetail(item)">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p>
                         <p>
                             <span style="color:#0ABB87;margin-right: 20px;">{{item.channelType==5?$t('pubactivities.participated'):$t('activityInfo.hasApply')}}</span>
                             <span style="margin-right: 20px;">&nbsp;<i v-if="item.channelCityStr" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</span>
@@ -86,7 +86,8 @@
         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');
+                window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id=" + row.channelId + "&ismyevent=0&type=" + row.channelType);
+                // window.open(this.publicFun.getCurrentHrefEnv()+"/myeventdetail?id="+row.channelId+'&ismyevent=1');
             },
             //打开直播
             openeventlive(row){

src/views/peoplehomepage/userContactbar.vue

@@ -69,7 +69,7 @@
                         totalItemCount: 0
                     },
                     search: {
-                        empId:this.$route.query.id?this.$route.query.id:this.userInfo.empId,
+                        empId:this.$route.query.id?Number(this.$route.query.id):this.userInfo.empId,
                         otherEmpId:row.empId,
                     },
                     sort: {}

src/views/topicpage/commentdetail.vue

@@ -44,7 +44,7 @@
                                     :src="commentdataimg"
                                     :preview-src-list="getSrcList(commentdata.discussUrl.split(','),index)">
                             </el-image>
-                            来自：<i @click="totopic" style="color: red;cursor: pointer;">{{contentdata.topicTitle}}</i>
+                            来自：<i @click="totopic" style="color: #5D78FF;cursor: pointer;">#{{contentdata.topicTitle}}#</i>
                             <!--                                    讨论分享、评论、点赞操作-->
                             <div class="gendisplay operating">
                                 <p>

src/views/topicpage/discussall.vue

 <template>
     <div class="foutdivdiscuss">
         <div class="divclasschild">
-            <div class="descContentcal gendisplay" v-if="moderatorSetting.descContent&&moderatorSetting.showDesc==1">
+            <div class="descContentcal gendisplay" v-if="moderatorSetting.showDesc==0">
                 <img src="../../assets/img/mobile/laba@2x.png" alt="" style="width: 23px;position: absolute;left: 15px;bottom: 9px;">
-                <p @click="moderatorSetting.descUrl?descUrletail():''" :style="moderatorSetting.descUrl?'cursor: pointer;':''" style="width: 100%;height: 40px;overflow: hidden;line-height: 40px;" class="ellipsisFont1">{{moderatorSetting.descContent}}</p>
+                <p @click="descUrletail()" style="width: 100%;height: 40px;overflow: hidden;line-height: 40px;cursor: pointer;" class="ellipsisFont1">{{moderatorSetting.descContent}}</p>
             </div>
             <div class="gendisplay">
                 <div style="background: #FFFFFF;border-radius: 3px;">

src/views/topicpage/topicall.vue

@@ -161,9 +161,9 @@
                 </el-form-item>
                 <el-form-item label="配置公告的话题：">
                     <div class="gendisplay">
-                        <el-date-picker style="width: 200px;" @change="" v-model="searchAnnounce.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
+                        <el-date-picker style="width: 200px;" @change="searchTopic" v-model="searchAnnounce.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
                         <p style="width: 50px;text-align: center">{{$t('operationjson.tos')}}</p>
-                        <el-date-picker style="width: 200px;" v-model="searchAnnounce.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
+                        <el-date-picker style="width: 200px;" @change="searchTopic" v-model="searchAnnounce.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
                     </div>
                 </el-form-item>
                 <el-row :gutter="20" style="margin: 20px 0">

src/views/topicpage/topicdetail.vue

@@ -178,8 +178,8 @@
                                 </div>
                                 <div>
                                     <div style="margin: 15px 0;color:#1A1A1E;line-height: 24px;overflow: hidden;" @click="eventtopiccontent($event)">
-                                        <span v-if="item.alltext" v-html="item.pcState==1?(item.simpleContent+(item.simpleContent.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"></span>
-                                        <span v-else v-html="item.pcState==1?item.simpleContent:publicFun.analyzeEmoji(item.discussContentconst)"></span>
+                                        <span v-if="item.alltext" v-html="item.pcState==1?(item.simpleContent.slice(0,140)+(item.simpleContent.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"></span>
+                                        <span v-else v-html="item.pcState==1?item.discussContent:publicFun.analyzeEmoji(item.discussContentconst)"></span>
                                         <i
                                                 v-if="publicFun.getTextInRichtext(item.discussContentconst).length>140"
                                                 @click="item.alltext = !item.alltext"