Merge remote-tracking branch 'origin/master'

src/views/contentManagement/activity/index.vue

@@ -239,7 +239,7 @@
         </el-form-item>
       </el-form>
       <div class="app-container">
-        <el-table :data="gridData" height="300px">
+        <el-table v-loading="loading" :data="gridData" height="300px">
           <el-table-column align="center" prop="id" label="序号" min-width="55px">
             <template slot-scope="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -322,6 +322,7 @@ export default {
       // 对话框
       dialogFormVisible: false,
       dialogVisible: false,
+      loading: false,
       // 新增课程
       form: {
         id: '',
@@ -501,9 +502,11 @@ export default {
       }
     },
     loadData1() {
+      this.loading = true
       listCmsApplication(this.queryParams1).then(response => {
         this.gridData = response.data
         this.total1 = response.total
+        this.loading = false
       })
     },
     resetQuery1() {