柜组列表和通讯录树样式修改

ybf_admin/src/pages/in/contact/counter.vue

 <template>
   <div class="main">
-    <div class="title">全部柜组（ 共5个 ）</div>
+    <div class="title">全部柜组（ 共<span>{{page.total}}</span>个 ）</div>
     <div class="searchs">
       <div class="buttons">
         <el-button class="button buttonlight" size="small" @click="addCounter">添加柜组</el-button>
@@ -37,7 +37,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="principal"
+          prop="principalName"
           label="柜组负责人"
           align="center"
         ></el-table-column>
@@ -60,18 +60,9 @@
         <el-table-column label="创建时间" width="120" align="center" prop="createDate"/>
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template slot-scope="scope">
-            <el-button type="text" class="btn" @click="handleDetail(scope.row.id)"
-              >详情</el-button
-            >
-            <el-button type="text" class="btn" @click="handleEdit(scope.row.id)"
-              >编辑</el-button
-            >
-            <el-button
-              type="text"
-              @click="handleDelete(scope.row.id)"
-              class="listButtonRed"
-              >删除</el-button
-            >
+            <el-button type="text" class="btn" @click="handleDetail(scope.row.id)" >详情</el-button>
+            <el-button type="text" class="btn" @click="handleEdit(scope.row.id)" >编辑</el-button >
+            <el-button type="text" @click="handleDelete(scope.row.id)" class="listButtonRed">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -160,8 +151,16 @@ export default {
           _this.tableData = []
         }
         if(res.result == 'success'){
-          _this.tableData = res.data.adminShops.list
-          _this.page.total = Number(res.data.adminShops.total)
+          let data = res.data.pageInfo.list
+          _this.tableData  =  data.map((v,i)=>{
+            let obj = {}
+            for(let key in v.adminShop){
+              obj[key] = v.adminShop[key]
+              obj.principalName = v.principal
+            }
+            return obj
+          })
+          _this.page.total = Number(res.data.pageInfo.total)
         }
       })
     },
@@ -179,7 +178,12 @@ export default {
       this.$confirm('确定删除该柜组吗？', {
         }).then(() => {
         stallDel({shopIds:id}).then(res=>{
-          _this.$message(res.data)
+          if(res.result == 'fail'){
+            _this.$message.error(res.errorMsg)
+          }
+          if(res.result == 'success'){
+            _this.getListData()
+          }
         })
         }).catch(() => {
           this.$message.info("取消删除")
@@ -194,7 +198,12 @@ export default {
       this.$confirm('确定批量删除柜组吗？', {
       }).then(() => {
         stallDel({shopIds:delIds}).then(res=>{
-          _this.$message(res.data)
+          if(res.result == 'fail'){
+            _this.$message.error(res.errorMsg)
+          }
+          if(res.result == 'success'){
+            _this.getListData()
+          }
         })
       }).catch(() => {
         this.$message.info("取消删除")

ybf_admin/src/pages/in/contact/mail.vue

@@ -10,7 +10,7 @@
               <span class="number">{{ allNumber }}</span>
             </div>
           </div>
-          <div class="ty" style="margin:15px 0;" @click="getNoGroupMember(1,1)">
+          <div class="ty" style="margin:12px 0;" @click="getNoGroupMember(1,1)">
             <div>
               <span>未分组</span>
               <span class="number">{{ wNumber }}</span>
@@ -26,9 +26,6 @@
               expand-on-click-node
               @node-click="handleTreeClick"
             >
-             <!--  <span class="custom-tree-node" slot-scope="{ node, data }">
-                <span>{{ node.label }}</span>
-              </span> -->
             </el-tree>
           </div>
         </div>
@@ -713,11 +710,11 @@ export default {
 
 <style scoped>
 .trees >>> .el-tree-node__content {
-  padding: 10px;
-  border-bottom: 1px solid #fff;
+  padding: 5px;
+  /*border-bottom: 1px solid #fff;*/
 }
  .trees >>> .el-tree-node__children .el-tree-node__content {
-  background-color: #dadad97a;
+  /*background-color: #dadad97a;*/
 
 }
 .btn >>> .el-button + .el-button {