Merge branch 'master' into 'test'

# Conflicts:
#   src/views/business/ticket/index.vue

src/views/business/ticket/index.vue

@@ -209,7 +209,7 @@
             >编辑</el-button
             >
             <el-button
-             v-show="
+              v-show="
                 scope.row.status.value === 'off' ||
                 scope.row.status.value === 'done'
               "
@@ -219,14 +219,14 @@
               >上架</el-button
             >
             <el-button
-             v-show="scope.row.status.value === 'on'"
+              v-show="scope.row.status.value === 'on'"
               v-hasPermi="['business:ticket:on']"
               type="text"
               @click="setStatus(scope.row, 'off')"
               >下架</el-button
             >
             <el-button
-             v-show="scope.row.status.value === 'done'"
+              v-show="scope.row.status.value === 'done'"
               v-hasPermi="['business:ticket:remove']"
               type="text"
               class="del"
@@ -327,7 +327,7 @@ export default {
     },
 
     // 盲票组列表
-    getList(reset) {
+    getList() {
       this.loading = true;
       getTicketList( 'pageNum=' + this.pageParams.pageNum + '&pageSize=' + this.pageParams.pageSize + '&orderByColumn='+ this.pageParams.orderByColumn +'&isAsc='+ this.pageParams.isAsc +'&',
         this.queryParams