Merge remote-tracking branch 'origin/master'

src/views/findeventpage/newEventpage.vue

@@ -94,7 +94,10 @@
                         </div>
                     </el-col>
                 </el-row>
-                <div class="content_btn">
+                <div class="content_btn" v-if="evnetList.length==0">
+                    <span>没有找到相应的活动，请更换筛选条件！</span>
+                </div>
+                <div v-else class="content_btn">
                     <p v-if="sizeListResult > searchs.pageIndex" @click="load">查看更多活动</p>
                     <span v-else>没有更多了</span>
                 </div>
@@ -164,8 +167,7 @@
         <el-dialog :visible.sync="vueQrVisible" width="360px"  :close-on-click-moda="false" center>
             <div style="text-align: center;margin: 0 20px;">
                 <img :src="activityContact.contactImg" alt="" style="width: 140px;height: 140px;margin: 15px;padding: 5px;border: 1px solid #E8E8E8;">
-                <p style="color: #1A1A1E;">添加客服微信获取发布资格添加客服微信获取发布资格</p>
-                <p style="color: #1A1A1E;margin-top: 10px;">客服微信：{{activityContact.contactWay}}</p>
+                <p style="color: #1A1A1E;margin-top: 10px;">{{activityContact.contactWay}}</p>
             </div>
         </el-dialog>