Merge remote-tracking branch 'origin/master'

src/views/findeventpage/eventdetail.vue

@@ -28,14 +28,14 @@
                     <p><i class="iconfont icon-dingwei"></i> {{eventdata.channelAddress}}</p>
                 </div>
                 <div style="text-align: center;">
-                    <p v-if="userInfo&&userInfo.empId!=eventdata.createdBy||!userInfo">
+                    <span v-if="userInfo&&userInfo.empId!=eventdata.createdBy||!userInfo">
                         <el-button type="primary" round style="width:130px;" v-if="eventdata.activityState==2&&!eventdata.isApply" @click="handleApply(eventdata)">{{$t('activityInfo.freeApply')}}</el-button>
                         <el-button type="primary" round style="width:130px;" disabled v-if="eventdata.channelType!=4&&eventdata.activityState==2&&eventdata.isApply">{{$t("activityInfo.hasApply")}}</el-button>
                         <el-button type="primary" round style="width:130px;" v-if="eventdata.channelType==4&&eventdata.activityState==2&&eventdata.isApply" @click="handleToSuccess">{{$t("commonTitle.vipLookTitle")}}</el-button>
-                        <el-button type="primary" round style="width:160px;"disabled v-if="eventdata.activityState>2">{{eventdata.activityState==4?$t("activityInfo.hasFilled"):eventdata.activityState==3?$t("activityInfo.applyEnd"):eventdata.activityState==5?$t("activityInfo.activityEnd"):""}}</el-button>
-                        <el-button type="primary" round style="width:160px;" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</el-button>
-                    </p>
-                    <p style="margin-top: 20px;" v-if="eventdata.hasLive == 1" @click="openeventlive(eventdata)">
+                        <el-button type="primary" round style="width:130px;"disabled v-if="eventdata.activityState>2">{{eventdata.activityState==4?$t("activityInfo.hasFilled"):eventdata.activityState==3?$t("activityInfo.applyEnd"):eventdata.activityState==5?$t("activityInfo.activityEnd"):""}}</el-button>
+                        <el-button type="primary" round style="width:130px;" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</el-button>
+                    </span>
+                    <span style="margin-left: 15px;" v-if="eventdata.hasLive == 1" @click="openeventlive(eventdata)">
                         <el-button v-if="eventdata.baseLive.liveState==0" type="info" round style="width: 130px;font-size: 14px;">
                             <i class="iconfont icon-zhibo" style="font-size: 14px;"></i>
                             {{$t('activityInfo.liveNotStart')}}
@@ -51,7 +51,7 @@
                         <el-button v-if="eventdata.baseLive.liveState==2&&eventdata.baseLive.liveBack == 1" type="info" round style="width: 130px;font-size: 14px;">
                             {{$t('activityInfo.liveHasEnd')}}
                         </el-button>
-                    </p>
+                    </span>
                 </div>
                 <div v-if="eventdata.activityState!=5"  @click="handleReturn" style="color:#3F3F53;text-align: center;line-height: 60px;cursor: pointer;">
                     <i class="iconfont icon-fenxiang" style="margin-right: 10px;"></i>{{$t('activityInfo.shareButton')}}

src/views/publishactivity/pubactivities.vue

@@ -66,10 +66,10 @@
                             <el-button v-if="scope.row.channelState == 3" type="text" @click="urlclk(scope.row)">
                                 {{$t('pubactivities.share')}}
                             </el-button>
-                            <el-button v-if="scope.row.hasLive == 1&&scope.row.liveState!=3" type="text" @click="messageclk(scope.row)">
+                            <el-button v-if="scope.row.hasLive == 1&&scope.row.liveState!=2" type="text" @click="messageclk(scope.row)">
                                 {{$t('livedata.pushinformation')}}
                             </el-button>
-                            <el-button v-if="scope.row.hasLive == 1&&scope.row.liveState!=3" type="text" @click="getprocessLiveState(scope.row)">
+                            <el-button v-if="scope.row.hasLive == 1&&scope.row.liveState!=2" type="text" @click="getprocessLiveState(scope.row)">
                                 {{scope.row.liveState==0?$t('livedata.start'):scope.row.liveState==1?$t('livedata.finish'):''}}
                             </el-button>
                         </template>