From 9808962ae17585a0b74308aa014ad5f87cbaf234 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Thu, 26 Oct 2023 09:30:34 +0800
Subject: [PATCH] 1

---
 src/App.vue                                        |   2 +-
 src/api/userinfo.js                                |  20 +-
 src/components/merchantManagement/agencyList.vue   |  57 ++++
 .../merchantManagement/brokerageConfig.vue         |  59 ++++
 src/components/merchantManagement/firmInfo.vue     |  59 ++++
 src/components/merchantManagement/homePage.vue     |  56 ++++
 src/components/merchantManagement/infoList.vue     |  59 ++++
 src/components/merchantManagement/jobList.vue      |  60 ++++
 src/components/merchantManagement/memberInfo.vue   | 102 +++++--
 src/components/merchantManagement/mineBill.vue     |  59 ++++
 .../merchantManagement/navigationConfig.vue        |  59 ++++
 src/components/merchantManagement/orderList.vue    |  59 ++++
 src/components/merchantManagement/qiwei.vue        |  59 ++++
 .../merchantManagement/serviceMarket.vue           |  59 ++++
 src/components/merchantManagement/townsmanList.vue |  59 ++++
 .../usercenter/components/dataStatistics.vue       | 136 ++++-----
 src/router/index.js                                |  82 +++++-
 src/style/index.less                               |  15 +-
 src/views/merchantBack.vue                         | 321 ++++++++++++++++++---
 19 files changed, 1231 insertions(+), 151 deletions(-)
 create mode 100644 src/components/merchantManagement/agencyList.vue
 create mode 100644 src/components/merchantManagement/brokerageConfig.vue
 create mode 100644 src/components/merchantManagement/firmInfo.vue
 create mode 100644 src/components/merchantManagement/homePage.vue
 create mode 100644 src/components/merchantManagement/infoList.vue
 create mode 100644 src/components/merchantManagement/jobList.vue
 create mode 100644 src/components/merchantManagement/mineBill.vue
 create mode 100644 src/components/merchantManagement/navigationConfig.vue
 create mode 100644 src/components/merchantManagement/orderList.vue
 create mode 100644 src/components/merchantManagement/qiwei.vue
 create mode 100644 src/components/merchantManagement/serviceMarket.vue
 create mode 100644 src/components/merchantManagement/townsmanList.vue

diff --git a/src/App.vue b/src/App.vue
index c73f4e7..23e154e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
 import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
 let sp = document.createElement('script')
-sp.src = '//at.alicdn.com/t/c/font_3135652_st06ih16ux9.js'
+sp.src = '//at.alicdn.com/t/c/font_3135652_vt5pe6yxuqg.js'
 document.body.appendChild(sp)
 export default {
   provide() {
diff --git a/src/api/userinfo.js b/src/api/userinfo.js
index 1555957..10cca75 100644
--- a/src/api/userinfo.js
+++ b/src/api/userinfo.js
@@ -248,7 +248,7 @@ export function dataStatisticsTeamDetailApi (data) {
   });
 }
 // 获取成员分组信息
-export function getMemberGroupApi () {
+export function getMemberGroupApi (data) {
   return request({
     url: "/yishoudan/agency/team/list",
     method: "get",
@@ -290,4 +290,22 @@ export function moveGroupPrevApi (data) {
     url: "/yishoudan/agency/team/prev/" + data,
     method: "get",
   });
+}
+
+// 大屏显示开关
+export function memberShowScreenApi (data) {
+  return request({
+    url: "/yishoudan/user/agencyCorpUser/showAgencyScreen",
+    method: "post",
+    data: setqs(data),
+  });
+}
+
+// 大参与数据统计开关
+export function memberJoinDataApi (data) {
+  return request({
+    url: "/yishoudan/user/agencyCorpUser/inAgencyStatistics",
+    method: "post",
+    data: setqs(data),
+  });
 }
\ No newline at end of file
diff --git a/src/components/merchantManagement/agencyList.vue b/src/components/merchantManagement/agencyList.vue
new file mode 100644
index 0000000..5d7540c
--- /dev/null
+++ b/src/components/merchantManagement/agencyList.vue
@@ -0,0 +1,57 @@
+<template>
+  <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>代理列表</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {}
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+    this.$emit('setTitle', '代理列表')
+  },
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {},
+  // 组件方法
+  methods: {},
+}
+</script>
+
+<style scoped lang="less">
+</style>
diff --git a/src/components/merchantManagement/brokerageConfig.vue b/src/components/merchantManagement/brokerageConfig.vue
new file mode 100644
index 0000000..fe284e3
--- /dev/null
+++ b/src/components/merchantManagement/brokerageConfig.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>佣金配置</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '佣金配置')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/firmInfo.vue b/src/components/merchantManagement/firmInfo.vue
new file mode 100644
index 0000000..6f2b921
--- /dev/null
+++ b/src/components/merchantManagement/firmInfo.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>企业信息</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '企业信息')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/homePage.vue b/src/components/merchantManagement/homePage.vue
new file mode 100644
index 0000000..98c7284
--- /dev/null
+++ b/src/components/merchantManagement/homePage.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>后台首页</a-breadcrumb-item>
+    </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {}
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+    this.$emit('setTitle', '后台首页')
+  },
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {},
+  // 组件方法
+  methods: {},
+}
+</script>
+
+<style scoped lang="less">
+</style>
diff --git a/src/components/merchantManagement/infoList.vue b/src/components/merchantManagement/infoList.vue
new file mode 100644
index 0000000..0ac4f6b
--- /dev/null
+++ b/src/components/merchantManagement/infoList.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>通讯录</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '通讯录')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/jobList.vue b/src/components/merchantManagement/jobList.vue
new file mode 100644
index 0000000..fa09c14
--- /dev/null
+++ b/src/components/merchantManagement/jobList.vue
@@ -0,0 +1,60 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>职位列表</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '职位列表')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 93ac809..7362b5f 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -67,7 +67,7 @@
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <a-menu-item key="all" class="fsa bb_after fw500" @click="selectGroup('all')">
               全部部门
-              <i class="the_num f14" @click.stop>18</i>
+              <i class="the_num f14" @click.stop>{{totalNum}}</i>
             </a-menu-item>
           </a-menu>
           <!-- <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div> -->
@@ -84,7 +84,7 @@
                     <div @click="index + 1 < groupList.length?moveList(item,'down'):null" :class="index + 1 == groupList.length? 'unactive':''">下移</div>
                   </div>
                 </a-dropdown>
-                <div class="the_num f14 tac" style="min-width:12px" @click.stop>6</div>
+                <div class="the_num f14 tac" style="min-width:12px" @click.stop>{{item.userNum}}</div>
               </a-menu-item>
             </template>
           </a-menu>
@@ -98,7 +98,7 @@
       </div>
       <div class="rightContainer mb24">
         <div class="fsa pb14 bb1 mb24">
-          <div class="f16 fw500">{{ selectedKeys[0] == 'all' ? '全部成员（19人）':selectedKeys[0] + '（8人）' }}</div>
+          <div class="f16 fw500">{{ selectedKeys[0] == 'all' ? `全部成员（${totalGroupNum}人）`:selectedKeys[0] + `（${subGroupNum}人）` }}</div>
           <!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> -->
           <a-button class="addmemeber f14" @click="showDetail('add')">
             <i class="iconfont icon-fangda mr4"></i> 添加成员
@@ -124,12 +124,7 @@
             </div>
           </a-table>
           <div class="pagecontainer mt16">
-            <!-- <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="20" :total="pagination.total" @change="onChange" /> -->
-            <a-pagination :current="pagination.pageNum" :page-size-options="pagination.pageSizeOptions" :default-current="1" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="pagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
-            <!-- <div class="ant-pagination-options-quick-jumper f14 ml12">
-              <span>共{{ pagination.total }}条，</span>跳至
-              <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
-            </div>-->
+            <a-pagination :current="pagination.pageNum" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="pagination.total" @change="onChange" @showSizeChange="onPageChange" size="small" show-size-changer show-quick-jumper />
           </div>
         </div>
         <!-- <div v-else-if="modalTitle == '添加成员' || modalTitle == '编辑成员'">
@@ -255,8 +250,9 @@
               </div>-->
             </a-select>
           </a-form-item>
+          <!-- v-if="currentMember.agencyRole != 1" -->
           <a-form-item label="角色">
-            <a-select placeholder="请选择角色" :defaultActiveFirstOption="false" v-decorator="['agencyRole',{ rules: [{ required: true, message: '请选择角色' }] },]" dropdownClassName="groupSelectDrop">
+            <a-select placeholder="请选择角色" :disabled="currentMember.agencyRole == 1" :defaultActiveFirstOption="false" v-decorator="['agencyRole',{ rules: [{ required: true, message: '请选择角色' }] },]" dropdownClassName="groupSelectDrop">
               <a-select-option v-for="(item,index) in roleOptions" :value="item.value" class="groupSelectSub fsa" :key="index">
                 <div>{{item.label}}</div>
               </a-select-option>
@@ -357,11 +353,7 @@ export default {
       visible: false,
       currentMember: {},
       modalTitle: '',
-      roleOptions: [
-        // { label: "创建人", value: "1" },
-        { label: '管理员', value: '2' },
-        { label: '成员', value: '3' },
-      ],
+
       permissionName: '查看职位，报名，查看报名，查看老乡，修改密码，修改手机号',
       permission: 'job:list,apply:add,apply:list,apply:user,user:pwd,user:tel',
       expandedRowKeys: [],
@@ -374,6 +366,8 @@ export default {
       isEdit: false, // 编辑部门名称的判断
       selectedKeys: ['all'],
       menuType: 'group',
+      totalGroupNum: 0,
+      totalNum: 0,
     }
   },
   // 计算属性
@@ -446,7 +440,7 @@ export default {
             return text1
           },
           ellipsis: true,
-          width: 120,
+          width: 200,
         },
         {
           title: '手机号',
@@ -488,6 +482,20 @@ export default {
       ]
       return columns
     },
+    roleOptions() {
+      if (this.currentMember.agencyRole == 1) {
+        return [
+          { label: '创建人', value: '1' },
+          { label: '管理员', value: '2' },
+          { label: '成员', value: '3' },
+        ]
+      } else {
+        return [
+          { label: '管理员', value: '2' },
+          { label: '成员', value: '3' },
+        ]
+      }
+    },
   },
   // 侦听器
   watch: {},
@@ -558,6 +566,12 @@ export default {
       this.getMemberList()
       console.log(e)
     },
+    onPageChange(current, size) {
+      console.log(current)
+      console.log(size)
+      this.pagination.pageSize = size
+      this.getMemberList()
+    },
     async getMemberList() {
       // let jobinfo = {...this.pagination , searchTag:1}
       try {
@@ -565,9 +579,11 @@ export default {
         console.log(this.pagination)
         getMemberListApi(this.pagination).then(({ data }) => {
           if (data.status === 200) {
+            this.totalGroupNum = data.data.recordCount
+            this.subGroupNum = data.data.recordCount
+
             this.memberList = data.data.recordList
             this.memberList.forEach((item, index) => {
-              // item.group = '部门' + ((index % 5) + 1)
               // item1.children.forEach((item) => {
               item.inAgencyStatistics = item.inAgencyStatistics == 0 ? true : false
               item.showAgencyScreen = item.showAgencyScreen == 0 ? true : false
@@ -595,13 +611,16 @@ export default {
         console.log(error)
       }
     },
+
     getMemberGroup() {
       getMemberGroupApi().then(({ data }) => {
         if (data.status == 200) {
           console.log(data)
           this.groupList = data.data.list
+          this.totalNum = 0
           this.groupList.forEach((item, index) => {
             console.log(item)
+            this.totalNum += item.userNum
             if (index > 0) {
               item.checked = false
             } else {
@@ -732,7 +751,7 @@ export default {
             aliasName: this.currentMember.aliasName,
             tel: this.currentMember.tel,
             group: this.currentMember.group,
-            agencyTeamId: this.currentMember.agencyTeamName,
+            agencyTeamId: this.currentMember.agencyTeamId,
             showAgencyScreen: this.currentMember.showAgencyScreen,
             inAgencyStatistics: this.currentMember.inAgencyStatistics,
           })
@@ -762,6 +781,7 @@ export default {
           console.log(data)
           if (data.status == 200) {
             this.getMemberList()
+            this.getMemberGroup()
           } else {
             console.log(data.msg)
             this.$message.warning(data.msg)
@@ -778,6 +798,7 @@ export default {
       if (typeof item != 'object') {
         this.pagination.agencyTeamIds = ''
       } else {
+        this.subGroupNum = item.userNum
         this.pagination.agencyTeamIds = item.id + ''
       }
       this.getMemberList()
@@ -839,6 +860,7 @@ export default {
                 this.permissionName = getAgencyPermissionNameById(this.permission)
                 this.modalTitle = ''
                 this.getMemberList()
+                this.getMemberGroup()
               } else {
                 this.$message.warning(data.msg)
                 this.visible = false
@@ -913,31 +935,55 @@ export default {
       this.memberList.forEach((item) => {
         if (item.id == e.id) {
           item[type] = !item[type]
-          console.log(item[type])
-          if (type == 'showAgencyScreen' && item['showAgencyScreen'] == true) {
-            item['inAgencyStatistics'] = true
-          } else if (type == 'inAgencyStatistics' && item['inAgencyStatistics'] == false) {
-            item['showAgencyScreen'] = false
+          let status = item[type] == true ? 0 : 1
+          if (type == 'showAgencyScreen') {
+            this.memberShowScreen({ id: e.id, showAgencyScreen: status })
+          } else {
+            this.memberJoinData({ id: e.id, inAgencyStatistics: status })
           }
-
-          console.log(item)
+          // if (type == 'showAgencyScreen' && item['showAgencyScreen'] == true) {
+          //   item['inAgencyStatistics'] = true
+          // } else if (type == 'inAgencyStatistics' && item['inAgencyStatistics'] == false) {
+          //   item['showAgencyScreen'] = false
+          // }
         }
       })
       setTimeout(() => {
         that.$forceUpdate()
       }, 10)
     },
+
     /**
      * 大屏显示
      */
     memberShowScreen(val) {
-      memberShowScreenApi().then(({ data }) => {})
+      console.log(val)
+      memberShowScreenApi(val)
+        .then(({ data }) => {
+          console.log(data)
+          if (data.status == 200) {
+            this.getMemberList()
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
     /**
      * 参与统计
      */
     memberJoinData(val) {
-      memberJoinDataApi().then(({ data }) => {})
+      console.log(val)
+      memberJoinDataApi(val)
+        .then(({ data }) => {
+          console.log(data)
+          if (data.status == 200) {
+            this.getMemberList()
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
     moveList(item, type) {
       console.log(item)
@@ -1063,7 +1109,7 @@ export default {
   // height: calc(100vh - 105px);
   .leftContainer {
     width: 260px;
-    min-width: 220px;
+    // min-width: 220px;
     height: 100%;
     overflow: hidden;
     /deep/ .searchbox {
diff --git a/src/components/merchantManagement/mineBill.vue b/src/components/merchantManagement/mineBill.vue
new file mode 100644
index 0000000..f711404
--- /dev/null
+++ b/src/components/merchantManagement/mineBill.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>我的账单</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '我的账单')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/navigationConfig.vue b/src/components/merchantManagement/navigationConfig.vue
new file mode 100644
index 0000000..444cba0
--- /dev/null
+++ b/src/components/merchantManagement/navigationConfig.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>导航配置</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '导航配置')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/orderList.vue b/src/components/merchantManagement/orderList.vue
new file mode 100644
index 0000000..ff4bd13
--- /dev/null
+++ b/src/components/merchantManagement/orderList.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>工单列表</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '工单列表')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/qiwei.vue b/src/components/merchantManagement/qiwei.vue
new file mode 100644
index 0000000..ae8888e
--- /dev/null
+++ b/src/components/merchantManagement/qiwei.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>企微配置</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '企微配置')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/serviceMarket.vue b/src/components/merchantManagement/serviceMarket.vue
new file mode 100644
index 0000000..7b02e1c
--- /dev/null
+++ b/src/components/merchantManagement/serviceMarket.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>服务市场</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+  created () {
+    this.$emit('setTitle', '服务市场')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/merchantManagement/townsmanList.vue b/src/components/merchantManagement/townsmanList.vue
new file mode 100644
index 0000000..ee98ad3
--- /dev/null
+++ b/src/components/merchantManagement/townsmanList.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class>
+    <a-breadcrumb class="newBreadcrumb mt0 mb16">
+      <a-breadcrumb-item href>
+        <router-link :to="{name:'merchantBack'}">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>老乡列表</a-breadcrumb-item>
+     </a-breadcrumb>
+    <div class="bodyContainer">
+      <div class="setMiddle tac setH">
+        <svg class="svg_icon f320" aria-hidden="true">
+          <use xlink:href="#icon-yemianjianshezhong" />
+        </svg>
+        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data () {
+    return {
+
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+  * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+  */
+   created () {
+    this.$emit('setTitle', '老乡列表')
+  },
+  /**
+  * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+  * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+  */
+  mounted () {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 61984ea..e8420a5 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -13,7 +13,7 @@
       <div class="leftContainer pb24">
         <div class="searchbox pb12 ml12 mr12">
           <div class="searchinput">
-            <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
+            <a-input-search placeholder="搜索成员" v-model.trim="contentListSearchForm.keys" allowClear @search="onDataSearch" @keyup.enter="onDataSearch" @input="resetsearch">
               <!-- <a-icon slot="prefix" type="search" class="cccc" />
               <a-button slot="enterButton" class="cblue">搜索</a-button>-->
             </a-input-search>
@@ -35,10 +35,10 @@
           <!-- <div class="bb1 ml12 mr12 mt4 mb8" style="wdith:calc(100% - 24px)"></div> -->
           <!-- <div class="f12 c9 ml24 mb8">默认角色（11人）</div> -->
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <template v-for="(item, index) in groupList">
-              <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
-                <span>{{item.teamName}}</span>
-                <i class="the_num" @click.stop>3</i>
+            <template v-for="(item, index) in groupDataList">
+              <a-menu-item :key="item.agencyTeamName" class="fsa showdot" @click="selectGroup(item)">
+                <span>{{item.agencyTeamName}}</span>
+                <i class="the_num" @click.stop>{{item.users.length}}</i>
               </a-menu-item>
             </template>
           </a-menu>
@@ -47,7 +47,7 @@
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <a-menu-item key="all" class="fsa showdot bb_after fw500" @click="selectGroup('all')">
               全部部门
-              <span>32</span>
+              <span>{{totalDataList.length}}</span>
             </a-menu-item>
           </a-menu>
           <!-- <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
@@ -234,69 +234,7 @@ export default {
         keys: null,
         // searchTag: 1,
       },
-      billList: [
-        // 报名明细的表格配置
-        {
-          id: 1,
-          name: '房竟慧',
-          age: 21,
-          sex: '女',
-          nation: '汉',
-          tel: 15868868888,
-          IDCard: 40082720011208972,
-          storeJob: '常州华耀光伏普工',
-          recordDate: '2023-09-12 14:00',
-          state: '报名中',
-        },
-        {
-          id: 2,
-          name: '范明',
-          age: 36,
-          sex: '男',
-          nation: '汉',
-          tel: 15868868888,
-          IDCard: 40082720011208972,
-          storeJob: '郑州八大街富士康小时工',
-          recordDate: '2023-09-12 14:00',
-          state: '报名中',
-        },
-        {
-          id: 3,
-          name: '李泽阳',
-          age: 21,
-          sex: '女',
-          nation: '汉',
-          tel: 15868868888,
-          IDCard: 40082720011208972,
-          storeJob: '武汉远大住工普工',
-          recordDate: '2023-09-12 14:00',
-          state: '报名中',
-        },
-        {
-          id: 4,
-          name: '张鸿儒',
-          age: 21,
-          sex: '女',
-          nation: '汉',
-          tel: 15868868888,
-          IDCard: 40082720011208972,
-          storeJob: '宁波密封条普工',
-          recordDate: '2023-09-12 14:00',
-          state: '报名中',
-        },
-        {
-          id: 5,
-          name: '陈伟运',
-          age: 21,
-          sex: '女',
-          nation: '汉',
-          tel: 15868868888,
-          IDCard: 40082720011208972,
-          storeJob: '昆山洽兴包装厂普工',
-          recordDate: '2023-09-12 14:00',
-          state: '报名中',
-        },
-      ],
+      billList: [],
       contentListSearchForm: { pageNum: 1, pageSize: 10, keys: '' },
       townsmanDetailVisible: false,
       isspinning: false,
@@ -328,6 +266,11 @@ export default {
       dateType: '',
       dateVal: '',
       tableHeight: 300,
+      totalDataList: [],
+      groupDataList: [],
+      totalGroupNum: 0,
+      currentGroup: {},
+ 
     }
   },
   // 计算属性
@@ -626,6 +569,8 @@ export default {
         console.log(value)
         if (value == 'group') {
           console.log(this.columns)
+          that.selectedKeys = ['all']
+          this.selectGroup('all')
           that
             .getDataStatisticsList()
             .then(() => {
@@ -798,12 +743,17 @@ export default {
         })
         console.log(newList)
         if (this.menuType == 'group') {
-          this.dataList = data.data.list
+          console.log('isgroup')
+          this.dataList = fullCopy(data.data.list)
         } else {
-          this.dataList = newList
+          console.log('isrole')
+          this.dataList = fullCopy(newList)
         }
         this.groupDataList = fullCopy(data.data.list)
         this.totalDataList = fullCopy(newList)
+        if (this.currentGroup) {
+          this.selectGroup(this.currentGroup)
+        }
         this.isspinning = false
       }
     },
@@ -978,11 +928,45 @@ export default {
       }
       this.isspinning = false
     },
-    selectGroup(item) {
-      console.log(item)
-      this.selectedKeys = [item.teamName || item]
-      this.contentListSearchForm.agencyTeamIds = item.id + ''
-      this.getDataStatisticsList()
+    selectGroup(val) {
+      console.log(val)
+      this.selectedKeys = [val.agencyTeamName || 'all']
+      if (typeof val == 'object') {
+        this.currentGroup = val
+        this.groupDataList.forEach((item) => {
+          console.log(item)
+          console.log()
+          if (item.agencyTeamId == val.agencyTeamId) {
+            this.dataList = item.users
+            this.totalObj.arrived = 0
+            this.totalObj.entry = 0
+            this.totalObj.obJob = 0
+            this.totalObj.passed = 0
+            this.totalObj.signUps = 0
+            this.totalObj.finshedGPA = 0
+            this.totalObj.entryGPA = 0
+            this.dataList.forEach((item1) => {
+              this.totalObj.arrived += item1.arrived
+              this.totalObj.entry += item1.entry
+              this.totalObj.obJob += item1.obJob
+              this.totalObj.passed += item1.passed
+              this.totalObj.signUps += item1.signUps
+              this.totalObj.finshedGPA += item1.finshedGPA
+              this.totalObj.entryGPA += item1.entryGPA
+            })
+          }
+        })
+        console.log(this.dataList)
+      } else {
+        this.currentGroup = {}
+
+        this.getDataStatisticsList()
+      }
+
+      // this.getDataStatisticsList()
+    },
+    onDataSearch() {
+        this.getDataStatisticsList()
     },
   },
 }
diff --git a/src/router/index.js b/src/router/index.js
index a9566a0..3b5b45c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,9 +9,9 @@ const routes = [
     name: "Home",
     redirect: "/main",
     component: () => import("../views/main.vue"),
-	
+
     children: [
-		
+
       {
         path: "/main",
         name: "Main",
@@ -287,12 +287,12 @@ const routes = [
         component: () =>
           import("../components/userinfo/usercenter/components/mybill.vue"),
       },
-    ],
+    ], 
   },
   {
     path: "/merchantBack",
     name: "merchantBack",
-    redirect: "merchantBack/workBench",
+    redirect: "merchantBack/homePage",
 
     component: () => import("../views/merchantBack.vue"),
     children: [
@@ -325,16 +325,90 @@ const routes = [
         name: "RoleManagement",
         component: () => import("../components/merchantManagement/roleManagement.vue"),
       },
+      // 工作台
       {
         path: "workBench",
         name: "WorkBench",
         component: () => import("../components/merchantManagement/workBench.vue"),
       },
+      // 通知中心
       {
         path: "notificationCenter",
         name: "NotificationCenter",
         component: () => import("../components/merchantManagement/notificationCenter.vue"),
       },
+      // 后台首页
+      {
+        path: "homePage",
+        name: "HomePage",
+        component: () => import("../components/merchantManagement/homePage.vue"),
+      },
+      // 职位列表
+      {
+        path: "jobList",
+        name: "TheJobList",
+        component: () => import("../components/merchantManagement/jobList.vue"),
+      },
+      // 佣金配置
+      {
+        path: "brokerageConfig",
+        name: "BrokerageConfig",
+        component: () => import("../components/merchantManagement/brokerageConfig.vue"),
+      },
+      // 老乡列表
+      {
+        path: "townsmanList",
+        name: "TownsmanList",
+        component: () => import("../components/merchantManagement/townsmanList.vue"),
+      },
+      // 代理列表
+      {
+        path: "agencyList",
+        name: "AgencyList",
+        component: () => import("../components/merchantManagement/agencyList.vue"),
+      },
+      // 通讯录
+      {
+        path: "infoList",
+        name: "InfoList",
+        component: () => import("../components/merchantManagement/infoList.vue"),
+      },
+      // 工单列表
+      {
+        path: "orderList",
+        name: "OrderList",
+        component: () => import("../components/merchantManagement/orderList.vue"),
+      },
+      // 我的账单
+      {
+        path: "mineBill",
+        name: "MineBill",
+        component: () => import("../components/merchantManagement/mineBill.vue"),
+      },
+      // 企微配置
+      {
+        path: "qiwei",
+        name: "Qiwei",
+        component: () => import("../components/merchantManagement/qiwei.vue"),
+      },
+      // 导航配置
+      {
+        path: "navigationConfig",
+        name: "NavigationConfig",
+        component: () => import("../components/merchantManagement/navigationConfig.vue"),
+      },
+      // 企业信息
+      {
+        path: "firmInfo",
+        name: "FirmInfo",
+        component: () => import("../components/merchantManagement/firmInfo.vue"),
+      },
+      // 服务市场
+      {
+        path: "serviceMarket",
+        name: "ServiceMarket",
+        component: () => import("../components/merchantManagement/serviceMarket.vue"),
+      },
     ]
   },
   {
diff --git a/src/style/index.less b/src/style/index.less
index 40c450f..ac771ad 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/c/font_3135652_etcavihgi6d.css";
+@import "http://at.alicdn.com/t/c/font_3135652_vt5pe6yxuqg.css";
 
 // 初始化页面样式
 body,
@@ -412,6 +412,9 @@ i {
 .f36 {
 	font-size: 36px !important;
 }
+.f320 {
+	font-size: 320px !important;
+}
 .c3 {
 	color: #333;
 }
@@ -446,6 +449,9 @@ i {
 	margin-left: 50%;
 	transform: translateX(-50%);
 }
+.setH{
+  transform: translate(-50%, 50%);
+}
 .flex1 {
 	flex: 1;
 }
@@ -455,7 +461,7 @@ i {
 }
 .bodyContainer {
 	padding: 16px;
-  min-height: calc(100vh - 170px);
+	min-height: calc(100vh - 170px);
 	// height: 97%;
 	background-color: #fff;
 }
@@ -508,6 +514,9 @@ i {
 .mt20 {
 	margin-top: 20px;
 }
+.mt60{
+  margin-top: 60px;
+}
 .titlestyle {
 	font-size: 16px;
 	font-weight: 600;
@@ -753,7 +762,7 @@ i {
 			display: flex;
 			padding: 12px 0;
 			font-size: 14px;
-      align-items: center;
+			align-items: center;
 			// font-weight: bold;
 			justify-content: space-between;
 			border-bottom: 1px solid #eee;
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index d657312..117716b 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -18,7 +18,7 @@
           </div>
           <a-menu :selectedKeys="[$route.name]" :openKeys.sync="openKeys" @click="handleClick" class mode="inline" style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
             <template v-for="(item, index) in roles">
-              <!-- <a-menu-item :key="item.name" v-if="item.path != '' && item.level < 3">
+              <a-menu-item :key="item.name" v-if="item.path != '' && item.level < 3">
                 <router-link :to="{ name: item.name }">
                   <i class="iconfont f12 mr8" :class="item.icon" />
                   <a-badge dot v-if="myStatisticRedDot && item.name == 'myStatistic'">
@@ -26,7 +26,7 @@
                   </a-badge>
                   <span v-else class="nav-text" v-text="item.title"></span>
                 </router-link>
-              </a-menu-item>-->
+              </a-menu-item>
               <a-sub-menu :key="item.name" v-if="item.path == ''">
                 <span slot="title">
                   <i class="iconfont f12 mr8" :class="item.icon" />
@@ -109,65 +109,102 @@ export default {
         {
           id: 294,
           parentId: '',
-          name: 'dashboard',
+          name: 'HomePage',
           url: ' ',
-          icon: 'icon-yibiaopan',
+          icon: 'icon-houtaishouye',
+          component: '',
+          path: 'HomePage',
+          title: '后台首页',
+          menuName: 'HomePage',
+          level: 1,
+          menuType: 1,
+        },
+        {
+          id: 294,
+          parentId: '',
+          name: 'JobManagement',
+          url: ' ',
+          icon: 'icon-zhiweiguanli',
           component: '',
           path: '',
-          title: '仪表盘',
+          title: '职位管理',
           menuName: 'dashboard',
           level: 1,
           menuType: 1,
           children: [
-            // {
-            //   id: 295,
-            //   parentId: 294,
-            //   name: 'MemberInfo',
-            //   url: '/memberInfo',
-            //   icon: '',
-            //   component: 'home',
-            //   path: '/home',
-            //   title: '我的团队',
-            //   menuName: 'dashboard',
-            //   level: 2,
-            //   menuType: 1,
-            //   children: '',
-            // },
             {
               id: -110,
               parentId: 294,
-              name: 'WorkBench',
+              name: 'TheJobList',
               url: 'http://www.idaotian.com/box/btv/#/',
               icon: 'home',
               component: '',
               path: 'http://www.idaotian.com/box/btv/#/',
-              title: '工作台',
-              menuName: '工作台',
+              title: '职位列表',
+              menuName: '职位列表',
             },
             {
               id: -110,
               parentId: 294,
-              name: 'BocaiTV',
+              name: 'BrokerageConfig',
               url: 'http://www.idaotian.com/box/btv/#/',
               icon: 'home',
               component: '',
               path: 'http://www.idaotian.com/box/btv/#/',
-              title: '伯才TV',
-              menuName: '伯才TV',
+              title: '佣金配置',
+              menuName: '佣金配置',
             },
+          ],
+        },
+        {
+          id: 294,
+          parentId: '',
+          name: 'TownsmanManagement',
+          url: ' ',
+          icon: 'icon-laoxiangguanli',
+          component: '',
+          path: '',
+          title: '老乡管理',
+          menuName: 'TownsmanManagement',
+          level: 1,
+          menuType: 1,
+          children: [
             {
-              id: 402,
+              id: -110,
               parentId: 294,
-              name: 'DataScreen',
-              url: '/statistics/dataScreen',
-              icon: '',
-              component: 'statistics/dataScreen',
-              path: '/statistics/dataScreen',
-              title: '数据大屏',
-              menuName: 'dashboard',
-              level: 2,
-              menuType: 1,
-              children: '',
+              name: 'TownsmanList',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: '老乡列表',
+              menuName: '老乡列表',
+            },
+          ],
+        },
+        {
+          id: 294,
+          parentId: '',
+          name: 'AgencyManagement',
+          url: ' ',
+          icon: 'icon-dailiguanli',
+          component: '',
+          path: '',
+          title: '代理管理',
+          menuName: 'AgencyManagement',
+          level: 1,
+          menuType: 1,
+          children: [
+            {
+              id: -110,
+              parentId: 294,
+              name: 'AgencyList',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: '代理列表',
+              menuName: '代理列表',
             },
           ],
         },
@@ -213,6 +250,110 @@ export default {
               menuType: 1,
               children: '',
             },
+            {
+              id: 296,
+              parentId: 294,
+              name: 'InfoList',
+              url: '/memberInfo',
+              icon: '',
+              component: 'home',
+              path: '/home',
+              title: '通讯录',
+              menuName: '通讯录',
+              level: 2,
+              menuType: 1,
+              children: '',
+            },
+          ],
+        },
+        // {
+        //   id: 294,
+        //   parentId: '',
+        //   name: 'dashboard',
+        //   url: ' ',
+        //   icon: 'icon-yibiaopan',
+        //   component: '',
+        //   path: '',
+        //   title: '仪表盘',
+        //   menuName: 'dashboard',
+        //   level: 1,
+        //   menuType: 1,
+        //   children: [
+        //     {
+        //       id: -110,
+        //       parentId: 294,
+        //       name: 'WorkBench',
+        //       url: 'http://www.idaotian.com/box/btv/#/',
+        //       icon: 'home',
+        //       component: '',
+        //       path: 'http://www.idaotian.com/box/btv/#/',
+        //       title: '工作台',
+        //       menuName: '工作台',
+        //     },
+        //     {
+        //       id: -110,
+        //       parentId: 294,
+        //       name: 'BocaiTV',
+        //       url: 'http://www.idaotian.com/box/btv/#/',
+        //       icon: 'home',
+        //       component: '',
+        //       path: 'http://www.idaotian.com/box/btv/#/',
+        //       title: '伯才TV',
+        //       menuName: '伯才TV',
+        //     },
+        //   ],
+        // },
+
+        {
+          id: 294,
+          parentId: '',
+          name: 'OrderManagement',
+          url: ' ',
+          icon: 'icon-gongdanguanli',
+          component: '',
+          path: '',
+          title: '工单管理',
+          menuName: 'OrderManagement',
+          level: 1,
+          menuType: 1,
+          children: [
+            {
+              id: -110,
+              parentId: 294,
+              name: 'OrderList',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: '工单列表',
+              menuName: '工单列表',
+            },
+          ],
+        },
+        {
+          id: 294,
+          parentId: '',
+          name: 'BillCenter',
+          url: ' ',
+          icon: 'icon-zhangdanzhongxin',
+          component: '',
+          path: '',
+          title: '账单中心',
+          menuName: 'BillCenter',
+          level: 1,
+          menuType: 1,
+          children: [
+            {
+              id: -110,
+              parentId: 294,
+              name: 'MineBill',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: '我的账单',
+              menuName: '我的账单',
+            },
           ],
         },
         {
@@ -223,7 +364,7 @@ export default {
           icon: 'icon-shujutongji',
           component: '',
           path: '',
-          title: '数据统计',
+          title: '数据报表',
           menuName: 'group',
           level: 1,
           menuType: 1,
@@ -242,6 +383,20 @@ export default {
               menuType: 1,
               children: '',
             },
+            {
+              id: 402,
+              parentId: 294,
+              name: 'DataScreen',
+              url: '/statistics/dataScreen',
+              icon: '',
+              component: 'statistics/dataScreen',
+              path: '/statistics/dataScreen',
+              title: '数据大屏',
+              menuName: 'dashboard',
+              level: 2,
+              menuType: 1,
+              children: '',
+            },
           ],
         },
         {
@@ -273,6 +428,93 @@ export default {
             },
           ],
         },
+        {
+          id: 294,
+          parentId: '',
+          name: 'GlobalConfig',
+          url: ' ',
+          icon: 'icon-tongyongshezhi',
+          component: '',
+          path: '',
+          title: '通用设置',
+          menuName: 'GlobalConfig',
+          level: 1,
+          menuType: 1,
+          children: [
+            {
+              id: -110,
+              parentId: 294,
+              name: 'BocaiTV',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: 'TV配置',
+              menuName: 'TV配置',
+            },
+            {
+              id: -110,
+              parentId: 294,
+              name: 'Qiwei',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: '企微配置',
+              menuName: '企微配置',
+            },
+            {
+              id: -110,
+              parentId: 294,
+              name: 'NavigationConfig',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: '导航配置',
+              menuName: '导航配置',
+            },
+          ],
+        },
+        {
+          id: 294,
+          parentId: '',
+          name: 'FirmConfig',
+          url: ' ',
+          icon: 'icon-qiyeshezhi',
+          component: '',
+          path: '',
+          title: '企业设置',
+          menuName: 'GlobalConfig',
+          level: 1,
+          menuType: 1,
+          children: [
+            {
+              id: -110,
+              parentId: 294,
+              name: 'FirmInfo',
+              url: 'http://www.idaotian.com/box/btv/#/',
+              icon: 'home',
+              component: '',
+              path: 'http://www.idaotian.com/box/btv/#/',
+              title: '企业信息',
+              menuName: '企业信息',
+            },
+          ],
+        },
+        {
+          id: 294,
+          parentId: '',
+          name: 'ServiceMarket',
+          url: ' ',
+          icon: 'icon-fuwushichang',
+          component: '',
+          path: 'ServiceMarket',
+          title: '服务市场',
+          menuName: 'ServiceMarket',
+          level: 1,
+          menuType: 1,
+        },
       ],
       openKeys: ['dashboard'],
       userbaseInfo: JSON.parse(localStorage.getItem('LOGIN_DATA')),
@@ -520,7 +762,10 @@ header.header,
 /deep/.ant-menu-item-group-title {
   padding: 0 !important;
 }
-
+.ant-menu-item > a {
+  display: block;
+  color: unset;
+}
 .topmenu {
   width: 100%;
   height: 48px;