Merge remote-tracking branch 'origin/master'

src/common/lang/en.js

@@ -2122,6 +2122,7 @@ module.exports = {
         registration:'Others share registration',
         directscan:'Direct scan',
         statistics:'Statistics',
+        participated:'Participated',
     },
 
     //直播

src/common/lang/zh.js

@@ -2219,6 +2219,7 @@ module.exports = {
         registration:'别人分享注册',
         directscan:'直接扫描',
         statistics:'统计',
+        participated:'已参与',
     },
 
     //直播

src/components/index/PageTop.vue

@@ -143,7 +143,7 @@
                 }, {
                     id: 4,
                     name: 'Findevent',
-                    path:'/eventpage',
+                    path:'/activitylist',
                 }],
                 currentIndex: this.publicFun.getCookie("currentNav")==null||this.publicFun.getCookie("currentNav")==undefined||this.publicFun.getCookie("currentNav")==1||this.publicFun.getCookie("currentNav")==2?0:this.publicFun.getCookie("currentNav"),
                 lang: this.$i18n.locale,

src/views/findeventpage/eventpage.vue

@@ -29,7 +29,7 @@
                         <div class="gendisplay">
                             <p class="ellipsisFont1" style="height: 50px;position: relative;" :style="item.channelType==5?'color:#ff5d5d;padding-left: 30px;':''">
                                 <i v-if="item.channelType==5" class="iconfont icon-hongbao-" style="position: absolute;top: 0px;left: 10px;"></i>
-                                {{item.channelType==5?'现金红包活动':item.channelLabel}}
+                                {{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>
@@ -45,7 +45,7 @@
                         <i
                             class="signing"
                             :class="item.activityState == 2||item.activityState == 4?'signingup':item.activityState == 3?'applyend':item.activityState == 5?'activityEnd':''">
-                            {{item.activityState == 2||item.activityState == 4?item.channelType==5?'进行中':$t('activityInfo.applying'):item.activityState == 3?$t('activityInfo.applyEnd'):item.activityState == 5?$t('activityInfo.activityEnd'):''}}
+                            {{item.activityState == 2||item.activityState == 4?item.channelType==5?$t('pubactivities.conduct'):$t('activityInfo.applying'):item.activityState == 3?$t('activityInfo.applyEnd'):item.activityState == 5?$t('activityInfo.activityEnd'):''}}
                         </i>
                     </div>
                 </div>

src/views/findeventpage/eventsuccess.vue

@@ -38,7 +38,7 @@
                 <div class="breadcrumb">
                     <el-breadcrumb separator=">">
                         <el-breadcrumb-item :to="{ path: '/' }">{{$t("topNav.index")}}</el-breadcrumb-item>
-                        <el-breadcrumb-item :to="{ path: '/eventpage' }">{{$t("topNav.Findevent")}}</el-breadcrumb-item>
+                        <el-breadcrumb-item :to="{ path: '/activitylist' }">{{$t("topNav.Findevent")}}</el-breadcrumb-item>
                         <el-breadcrumb-item>{{$t("activityInfo.applySuccess")}}</el-breadcrumb-item>
                     </el-breadcrumb>
                 </div>

src/views/findeventpage/myevent.vue

@@ -20,7 +20,7 @@
                                     <i
                                             class="signing"
                                             :class="item.activityState == 2||item.activityState == 4?'signingup':item.activityState == 3?'applyend':item.activityState == 5?'activityEnd':''">
-                                        {{item.activityState == 2||item.activityState == 4?$t('activityInfo.applying'):item.activityState == 3?$t('activityInfo.applyEnd'):item.activityState == 5?$t('activityInfo.activityEnd'):''}}
+                                        {{item.activityState == 2||item.activityState == 4?item.channelType==5?$t('pubactivities.conduct'):$t('activityInfo.applying'):item.activityState == 3?$t('activityInfo.applyEnd'):item.activityState == 5?$t('activityInfo.activityEnd'):''}}
                                     </i>
                                 </div>
                             </el-col>
@@ -38,7 +38,7 @@
                                 <p style="color: #69697A;font-size: 12px;margin: 10px 0 5px;" class="ellipsisFont1" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
                                 <p style="color: #69697A;font-size: 12px;" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p>
                                 <p style="font-size: 12px;margin-top: 5px;">
-                                    <span style="color:#0ABB87;margin-right: 20px;">{{$t('activityInfo.hasApply')}}</span>
+                                    <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>
                                     <span v-if="item.channelLabelList" style="color:#5D78FF;">
                                         <i style="margin-right: 5px;" v-for="(itemchannel,index) in item.channelLabelList" :key="index">{{itemchannel}}</i>

src/views/index/pages/index.vue

@@ -158,7 +158,7 @@
                     <div class="topUpdateTitle" style="border-bottom: 1px solid #E8EAF3;">
                         <h4>{{$t("indexCount.wonderfulEvent")}}</h4>
                         <div class="borderBottom40px"></div>
-                        <span class="lookmoreBtn" @click="handleMore('/eventpage',3)">{{$t("indexCount.lookMore")}}></span>
+                        <span class="lookmoreBtn" @click="handleMore('/activitylist',3)">{{$t("indexCount.lookMore")}}></span>
                     </div>
                     <div>
                         <div v-for="(item,index) in activityList" :key="item.channelId" style="cursor: pointer;">

src/views/publishactivity/proactivity.vue

@@ -676,7 +676,7 @@
                     if(this.formData.shareLimit.length>3)this.formData.shareLimit=this.formData.shareLimit.slice(0,3);
                     this.formData.shareLimit=this.formData.shareLimit.replace(/\D/g,'');
                 }else if(state == 4){
-                    if(this.contactsform.fieldLength.length>3)this.contactsform.fieldLength=this.contactsform.fieldLength.slice(0,3);
+                    if(this.contactsform.fieldLength.length>2)this.contactsform.fieldLength=this.contactsform.fieldLength.slice(0,2);
                     this.contactsform.fieldLength=this.contactsform.fieldLength.replace(/\D/g,'');
                 }else if(state == 5){
                     if(this.formData.questionLimit.length>2)this.formData.questionLimit=this.formData.questionLimit.slice(0,2);
@@ -988,7 +988,10 @@
                     this.valuelist = [{},{}];
                 }else if(val == 10){
                     this.contactsform.fieldName = this.$t('releasejson.addbp');
-                    this.$refs.formfieldName.clearValidate();
+                    var _this = this;
+                    setTimeout(function () {
+                        _this.$refs.formfieldName.clearValidate();
+                    },500)
                     this.isCheck = false;
                 }else if(val == 9){
                     this.isCheck = false;
@@ -1000,7 +1003,7 @@
             //添加自定义字段
             subcontacts(){
                 if(this.contactsform.fieldType == 9 || this.contactsform.fieldType == 10){
-                    if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 100){
+                    if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 50){
                         this.$message.error(this.$t('pubactivities.sizeincorrectly'));
                         return;
                     }
@@ -1030,7 +1033,7 @@
             },
             //修改自定义字段
             editcontacts(){
-                if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 100){
+                if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 50){
                     this.$message.error(this.$t('pubactivities.sizeincorrectly'));
                     return;
                 }

src/views/topicpage/topicdetail.vue

@@ -469,7 +469,7 @@
                     </li>
                 </ul>
                 <p style="color: #69697A;margin-top: 40px;font-size: 12px;text-align: center;" v-if="loading">{{$t('industryjson.loading')}}</p>
-                <p style="color: #69697A;margin-top: 40px;font-size: 12px;text-align: center;" v-if="!loading&&contentList.length!=0">{{$t('industryjson.nomore')}}</p>
+                <p style="color: #69697A;margin-top: 40px;font-size: 12px;text-align: center;" v-if="!loading&&topicdatacur_page>1">{{$t('industryjson.nomore')}}</p>
             </div>
             <div>
                 <topicbar :state="2" :hottopiclist="hottopiclist"></topicbar>