Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue

@@ -5,11 +5,11 @@
         <div>经销商管理</div>
         <div>
           <el-button type="primary" size="small" @click="handleCreate()">新建</el-button>
-          <el-button type="primary" size="small" @click="handleUpdate()">修改</el-button>
+          <el-button type="primary" size="small" @click="handleUpdate()">编辑</el-button>
           <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
-          <!-- <el-button type="primary" size="small" @click="handleDaoRu()">导入</el-button> -->
-          <el-button type="primary" size="small" disabled>下线</el-button>
+          <el-button type="danger" size="small">下线</el-button>
           <el-button type="success" size="small" @click="handleDaoChu()">导出</el-button>
+          <el-button type="info" size="small">关闭</el-button>
         </div>
       </div>
       <div class="searchcon">
@@ -31,7 +31,7 @@
       </div>
       <div class="listtop">
         <div class="tit">经销商信息列表</div>
-        <pageye v-show="list > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList" />
+        <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList" />
       </div>
       <div class="">
         <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
@@ -300,4 +300,17 @@ export default {
 /deep/ .el-collapse-item__header {
   border-bottom: 0px solid #e6ebf5;
 }
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+.pagination {
+  margin-bottom: -10px;
+}
 </style>