Merge branch 'feature/Feature_loginPage' into develop

src/views/pset/login_setting.vue

@@ -16,7 +16,8 @@
 
     </div>
     <div class="mymain-container">
-      <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+      <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"></el-table-column>
         <el-table-column align="center" label="轮播图名称" prop="imgCarouselName" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="轮播图" prop="imgCarouselUrl" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -456,7 +457,7 @@
 
         },
         created() {
-            this.getList();
+           // this.getList();
         },
         components: {
             Pagination,