Merge remote-tracking branch 'origin/master'

src/views/findeventpage/newEventpage.vue

@@ -76,7 +76,8 @@
                                     {{item.channelType==5?$t('activityInfo.redMoneyType'):item.channelLabel}}
                                 </p>
                                 <div v-if="item.channelType==5">
-                                    <span><el-button type="primary" @click="toeventdetail(item)" round plain size="mini">{{$t('activityInfo.alreadyJoin')}}</el-button></span>
+                                    <span style="color: #9197B4" v-if="item.activityState == 5&&item.isJoin==2">{{$t('activityInfo.activityEnd')}}</span>
+                                    <span v-else><el-button type="primary" @click="toeventdetail(item)" round plain size="mini">{{$t('activityInfo.alreadyJoin')}}</el-button></span>
                                 </div>
                                 <div v-if="item.channelType!=5&&userInfo&&userInfo.empId!=item.createdBy||item.channelType!=5&&!userInfo">
                                     <span style="color: #0ABB87;" v-if="item.isJoin==1&&item.activityState != 3">{{$t('activityInfo.hasApply')}}</span>

src/views/topicpage/topicdetail.vue

@@ -180,7 +180,7 @@
                                 <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.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>
+                                        <span v-else v-html="item.pcState==1?item.discussContentlin:publicFun.analyzeEmoji(item.discussContentconst)"></span>
                                         <i
                                                 v-if="publicFun.getTextInRichtext(item.discussContentconst).length>140"
                                                 @click="item.alltext = !item.alltext"