Merge branch 'master' of http://101.200.220.49:8001/xiuli.gao/playlet

project/index.html

       (function() {
         var hm = document.createElement("script");
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
-        var s = document.getElementsByTagName("script")[0]; 
+        var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
       })();
       </script>

project/src/assets/config/interface_api.js

   login: "/api/login",
   logout: "/api/loginOut",
   userList: "/api/user/userList",
+  memberList: "/api/user/users",
   addWayList: "/api/customer/addWayList",
   tagList: "/api/tag/tagList",
   customerList: "/api/customer/customerList",

project/src/components/detials/customerProfile.vue

     <div class="bigTitle tMar30">
       <i class="el-icon-user-solid"></i>
       <span>基本信息</span>
-      <span style="color: #898D92;font-weight: 400;margin-left: 6px">所属员工可在「侧边栏-客户画像」中进行编辑</span>
+<!--      <span style="color: #898D92;font-weight: 400;margin-left: 6px">所属员工可在「侧边栏-客户画像」中进行编辑</span>-->
     </div>
     <el-skeleton :loading="loading" animated>
       <template slot="template">

project/src/components/manage/memberManage.vue

+<template>
+  <div>
+    <div class="tableInfo">
+      <div class="flex">
+        <div class="totalCustom">共<span>{{tableData&&tableData.length ? tableData.length : '-'}}</span>个成员</div>
+      </div>
+      <div class="flex">
+        <selfinput :hasLabel="false" @inputChange="inputChange"></selfinput>
+      </div>
+    </div>
+    <div style="display: flex;">
+      <div style="width: 25%;flex-shrink: 0;margin-right: 1%;background-color: #fff;padding: 15px">
+        <div class="fWeight600">
+          部门信息
+        </div>
+        <div>
+          <div v-for="c in checkList" :key="c.id" class="tMar20 flex-align-center">
+            <i class="el-icon-circle-check c-00B38A f16 rMar7 pointer" v-if="checkVals.indexOf(c.id)>-1" @click="checkDepartId(c.id)"></i>
+            <i class="el-icon-circle rMar7 pointer" @click="checkDepartId(c.id)" v-else></i>
+            {{c.name}}
+          </div>
+        </div>
+      </div>
+      <div style="flex: 1" v-loading="loading">
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%">
+          <el-table-column label="成员列表" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <div class="flex-align-center">
+                <div>
+                  <img :src="scope.row.avatar" alt="" style="width: 40px;margin-right: 10px">
+                </div>
+                <div>
+                  <div>{{scope.row.name}}</div>
+                  <div>共有{{scope.row.customer_number}}个客户</div>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="所属部门" align="center">
+            <template slot-scope="scope">
+              <div>
+                <span v-for="d in scope.row.department" class="rMar7">{{d}}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="授权状态" align="center">
+            <template slot-scope="scope">
+              <div class="flex-align-jus-center">
+                <i class="el-icon-circle-check f16 c-00B38A rMar7" v-if="scope.row.status == 1"></i>
+                <i class="el-icon-warning-outline f16 c-FF604D" v-if="scope.row.status == 4"></i>
+                {{scope.row.status == 1 ? '已授权' : '未授权'}}
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination" v-show="total>0">
+          <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pages)'>
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import selfinput from '../assembly/screen/input.vue'
+export default {
+  name:'memberManage',
+  components:{
+    selfinput
+  },
+  data () {
+    return {
+      loading: false,
+      page: 1,
+      pages: 0,
+      total: 0,
+      page_size: 20,
+      tableData: [],
+      checkVals:[],
+      checkList:[],
+
+    }
+  },
+  created () {
+    this.init(1)
+  },
+  methods: {
+    inputChange(keyword){
+      this.init(1,keyword)
+    },
+    init (page,keyword) {
+      console.log(this.checkVals);
+      this.page = page ? page : this.page;
+      this.loading = true
+      this.$axios.get(this.URL.BASEURL + this.URL.memberList, {
+        params: {
+          user_name:keyword,
+          page: this.page,
+          page_size: this.page_size
+        }
+      }).then((res) => {
+        var res = res.data
+        this.loading = false
+        if (res && res.errno == 0) {
+          this.tableData = res.rst.data;
+          this.total = res.rst.pageInfo.total;
+          this.pages = res.rst.pageInfo.pages;
+        } else if (res.errno != 4002) {
+          this.$message({
+            message: res.err,
+            type: "warning"
+          })
+        }
+      }).catch((err) => {
+        this.loading = false
+      });
+    },
+    handleCurrentChange (val) {
+      this.init(val)
+    },
+    checkDepartId(id){
+      if(this.checkVals.indexOf(id)==-1){
+        this.checkVals.push(id)
+      }else{
+        this.checkVals.splice(this.checkVals.indexOf(id),1)
+      }
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import "@/style/list.scss";
+.tableInfo {
+  height: 50px;
+}
+.el-icon-circle{
+  width: 14px;
+  height: 14px;
+  margin: 0 1px;
+  border-radius: 50%;
+  border: 1px solid #999;
+  margin-right: 8px;
+}
+</style>

project/src/router/allRouter.js

 const customerTransfer = () => import(/* webpackChunkName: 'customerTransfer' */ '@/components/customManage/customerTransfer.vue')
 const transferRecord = () => import(/* webpackChunkName: 'transferRecord' */ '@/components/customManage/transferRecord.vue')
 const authorityManage = () => import(/* webpackChunkName: 'authorityManage' */ '@/components/manage/authorityManage.vue')
+const memberManage = () => import(/* webpackChunkName: 'memberManage' */ '@/components/manage/memberManage.vue')
 const tagManage = () => import(/* webpackChunkName: 'tagManage' */ '@/components/manage/tagManage.vue')
 
 
+
 export var allRouter = [
   {
     path: '/',
         }
       },
       {
+        path: 'memberManage',
+        name: 'memberManage',
+        component: memberManage,
+        meta: {
+          keepAlive: false,
+          isLogin: true,
+          title: '成员管理'
+        }
+      },
+      {
         path: 'welcom_message_create',
         name: 'welcom_message',
         component: welcom_message,

project/src/router/navList.js

 /**
  * is_main:1 一级标题
  * path path存在 则一级标题下无二级
- * 
+ *
  */
 
 var navList = [
     small_menu: [
       {
         viewName: '成员管理',
-        path: 'materiaVideo',
+        path: 'memberManage',
       },
       {
         viewName: '授权管理',
   },
 ]
 
-export default navList;
+export default navList;

project/src/style/self.scss

   display: flex;
   align-items: center;
 }
+.flex-align-jus-center{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .flex {
   display: flex;
   align-items: center;