Merge remote-tracking branch 'origin/master'

src/views/activity/parkactivities/index.vue

@@ -149,6 +149,7 @@
               @click="handleDelete(scope.row)"
             >删除</el-button>
             <el-switch
+              v-if="scope.row.status !== 2"
               :value="scope.row.status"
               active-color="#D84848;"
               :active-value="1"