Merge remote-tracking branch 'origin/dev2.1.1' into dev2.1.1

src/views/mobile/proFeedback/firstStage.vue

@@ -14,7 +14,7 @@
             <el-button @click="handleApply" v-if="detailInfo&&detailInfo.activityStage<3" style="border: unset;">免费报名</el-button>
             <el-button @click="handleToSecondStage" v-if="detailInfo&&detailInfo.activityStage==3" style="border: unset;">项目评选</el-button>
         </div>
-        <div class="customerButton" @click="handleToMaster">
+        <div class="customerButton" @click="handleToMaster" v-if="detailInfo&&detailInfo.isHasProfessor">
             <p><i class="iconfont icon-Icon-zhuanjiatuanduiguanli" style="font-size: .6rem;"></i></p>
             <p>特邀嘉宾</p>
         </div>

src/views/mobile/proFeedback/secondStage.vue

@@ -20,8 +20,9 @@
                 <div class="bannerImg" :style="{backgroundImage: 'url('+subjectInfo.subjectVotedBackground+')'}" v-if="subjectInfo">
                     <div class="buttonLink">
                         <el-button type="default" plain @click="handleToFirstStage">活动介绍</el-button>
-                        <el-button type="default" plain @click="handleToMaster">特约嘉宾</el-button>
+                        <el-button type="default" v-if="subjectInfo.isHasProfessor" plain @click="handleToMaster">特约嘉宾</el-button>
                     </div>
+
                 </div>
                 <div class="content_data">
                     <div class="activityIntro" v-if="!searchBarFixed">