diff --git a/src/components/merchantManagement/dataScreen.vue b/src/components/merchantManagement/dataScreen.vue
index d346e42..4cfeb41 100644
--- a/src/components/merchantManagement/dataScreen.vue
+++ b/src/components/merchantManagement/dataScreen.vue
@@ -12,18 +12,20 @@
       <a-button class="newScreen">
         <a target="_blank" href="http://a.matripe.com.cn/dist/index.html#/statistics/rsAllotOrderDataLargeScreen">新窗口打开</a>
       </a-button>
-      <!-- <div class="pb16 bb1 mb16 f20 fsa">数据大屏</div> -->
-      <iframe src="http://a.matripe.com.cn/dist/index.html#/statistics/rsAllotOrderDataLargeScreen" frameborder="0" style="width:100%;height:100%"></iframe>
+      <largeScreen></largeScreen>
     </div>
   </div>
 </template>
 
 <script>
+import largeScreen from '../screen/largeScreen.vue'
 export default {
   // 组件名称
   name: 'dataScreen',
   // 局部注册的组件
-  components: {},
+  components: {
+    largeScreen,
+  },
   // 组件参数 接收来自父组件的数据
   props: {},
   // 组件状态值
@@ -40,7 +42,6 @@ export default {
    */
   created() {
     this.$emit('setTitle', '数据大屏')
-
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 1bea7aa..262f276 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -7,64 +7,76 @@
           <a-icon type="home" />
         </router-link>
       </a-breadcrumb-item>
-      <a-breadcrumb-item>我的团队</a-breadcrumb-item>
+      <a-breadcrumb-item>团队成员</a-breadcrumb-item>
     </a-breadcrumb>
     <div class="contentbody bodyContainer">
-      <div class="searchbox">
-        <div class="searchinput">
-          <a-input placeholder="请输入成员姓名/手机号" @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys">
-            <i slot="prefix" class="iconfont icon-sousuo"></i>
-            <button slot="suffix" @click="onSearch">搜索</button>
-          </a-input>
-          <!-- <div class="groupSelect" type="card" style="margin-bottom: 16px">
-            <div v-for="(item,index) in groupList" :class="item.checked?'active':''" :key="index" @click="changeGroup(item.teamName)" v-if="showGroup || index <= 5 && !showGroup">{{item.teamName}}</div>
-            <span class="showGroupSelect" @click="showGroup = !showGroup">{{showGroup?'收起':'展开'}}</span>
-          </div>-->
+      <div class="leftContainer br1">
+        <div class="searchbox bb1 ml12 mr12">
+          <div class="searchinput">
+            <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" enter-button allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch"></a-input-search>
+          </div>
+          <i class="iconfont icon-fangda ml12 c6 curp" @click="addGroupShow = true" style="line-height:32px"></i>
         </div>
-        <div class>
-          <button class="addGroup" @click="addGroupShow = true">添加分组</button>
-          <button class="pagechange" @click="showDetail('add')">
+        <a-menu :selectedKeys="selectedKeys" :openKeys.sync="openKeys" @click="handleClick" class mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
+          <template v-for="(item, index) in groupList">
+            <a-menu-item :key="item.teamName" @click="selectGroup(item)">{{item.teamName}}</a-menu-item>
+          </template>
+        </a-menu>
+      </div>
+      <div class="rightContainer">
+        <div class="fsa pb14 bb1 mb16">
+          <div class="f20 fw500">分组1（16人）</div>
+          <!-- <button class="addGroup" @click="addGroupShow = true">添加分组</button> -->
+          <a-button class="addmemeber f14" @click="showDetail('add')">
             <i class="iconfont icon-fangda"></i> 添加成员
-          </button>
+          </a-button>
           <!-- <button @click="changepage(1)">下一页</button> -->
         </div>
-      </div>
-      <!-- :expanded-row-keys.sync="expandedRowKeys" -->
-      <a-table :columns="columns" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle',
+        <!-- :expanded-row-keys.sync="expandedRowKeys" -->
+        <a-table :columns="columns" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle',
         }" :locale="tablenodata">
-        <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
-        <span slot="nickName" slot-scope="text, record">
-          <!-- <i class="iconfont icon-chengyuan"></i> -->
-          <svg class="svg_icon" v-if="record.agencyRole == 3" aria-hidden="true" style="width:32px">
-            <use xlink:href="#icon-chengyuan" />
-          </svg>
-          <svg class="svg_icon" v-if="record.agencyRole == 2" aria-hidden="true" style="width:32px">
-            <use xlink:href="#icon-guanliyuan" />
-          </svg>
-          <svg class="svg_icon" v-if="record.agencyRole == 1" aria-hidden="true" style="width:32px">
-            <use xlink:href="#icon-chuangjianren" />
-          </svg>
-          {{ record.aliasName || record.userName }}
-          <span>{{ record.tel?'（'+ record.tel + '）':'' }}</span>
-        </span>
-        <div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #f40">
-          <a @click="showDetail('detail', record)">详情</a>
-          <a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="showDetail('edit', record)">编辑</a>
-          <a v-if="loginUserInfo.agencyRole != 3" @click="deleteMemeber(record)">删除</a>
-        </div>
-      </a-table>
-      <div class="pagecontainer mt16">
-        <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
-        <div class="ant-pagination-options-quick-jumper f14 ml12">
-          <span>共{{ pagination.total }}条，</span>跳至
-          <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
+          <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
+          <span slot="nickName" slot-scope="text, record">
+            <!-- <i class="iconfont icon-chengyuan"></i> -->
+            <svg class="svg_icon" v-if="record.agencyRole == 3" aria-hidden="true" style="width:32px">
+              <use xlink:href="#icon-chengyuan" />
+            </svg>
+            <svg class="svg_icon" v-if="record.agencyRole == 2" aria-hidden="true" style="width:32px">
+              <use xlink:href="#icon-guanliyuan" />
+            </svg>
+            <svg class="svg_icon" v-if="record.agencyRole == 1" aria-hidden="true" style="width:32px">
+              <use xlink:href="#icon-chuangjianren" />
+            </svg>
+            {{ record.aliasName || record.userName }}
+            <!-- <span>{{ record.tel?'（'+ record.tel + '）':'' }}</span> -->
+          </span>
+          <div slot="join">
+            <a-switch default-checked @change="onChange" />
+          </div>
+          <div slot="bigScreen">
+            <a-switch default-checked @change="onChange" />
+          </div>
+          <div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #f40">
+            <a @click="showDetail('detail', record)">详情</a>
+            <a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="showDetail('edit', record)">编辑</a>
+            <a v-if="loginUserInfo.agencyRole != 3" @click="deleteMemeber(record)">删除</a>
+          </div>
+        </a-table>
+        <div class="pagecontainer mt16">
+          <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
+          <div class="ant-pagination-options-quick-jumper f14 ml12">
+            <span>共{{ pagination.total }}条，</span>跳至
+            <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
+          </div>
         </div>
       </div>
     </div>
     <a-modal :title="modalTitle" v-model="visible" centered id="demo" @cancel="modalCancel" width="640px" destroyOnClose class="detailWindow">
       <template slot="footer" v-if="this.modalTitle != '成员详情'">
-        <button style="background-color: #fff; border-color: #d9d9d9" @click="modalCancel">取消</button>
-        <button style="background-color: #f40;color: #fff;border: none;margin-left: 16px;margin-right: 16px;" @click="handleSubmit">确定</button>
+        <a-button key="back" @click="modalCancel">取消</a-button>
+        <a-button key="submit" class="ml16 mr16" type="primary" :loading="loading" @click="handleSubmit">确定</a-button>
+        <!-- <button style="background-color: #fff; border-color: #d9d9d9" @click="modalCancel">取消</button>
+        <button style="background-color: #f40;color: #fff;border: none;margin-left: 16px;margin-right: 16px;" @click="handleSubmit">确定</button>-->
       </template>
       <template slot="footer" v-else>
         <span></span>
@@ -216,6 +228,7 @@ export default {
       groupName: '', // 分组名称
       loading: false,
       idEdit: false,
+      selectedKeys: ['待分组'],
     }
   },
   // 计算属性
@@ -223,7 +236,7 @@ export default {
     columns() {
       const columns = [
         {
-          title: '序号',
+          title: '排序',
           dataIndex: 'index',
           key: 'index',
           customRender: (text, row, index) => {
@@ -237,12 +250,17 @@ export default {
           width: 60,
         },
         {
-          title: '姓名',
+          title: '成员姓名',
           dataIndex: 'nickName',
           key: 'nickName',
           scopedSlots: { customRender: 'nickName' },
           ellipsis: true,
-          width: 230,
+          width: 120,
+          onFilter: (value, record) => {
+            console.log(value)
+            console.log(record)
+            return record.aliasName.indexOf(value) === 0
+          },
         },
         // {
         //   title: '角色',
@@ -255,7 +273,7 @@ export default {
           title: '分组',
           dataIndex: 'agencyTeamId',
           key: 'agencyTeamId',
-          width: 100,
+          // width: 100,
           filters: this.groupList,
           customRender: (text, row, index) => {
             let text1
@@ -267,17 +285,35 @@ export default {
             return text1
           },
           ellipsis: true,
-          onFilter: (value, record) => {
-            console.log(value)
-            console.log(record)
-            return record.group.indexOf(value) === 0
-          },
+        },
+        // {
+        //   title: '权限',
+        //   dataIndex: 'permission',
+        //   key: 'permission',
+        //   ellipsis: true,
+        // },
+        {
+          title: '手机号',
+          dataIndex: 'tel',
+          key: 'tel',
+          ellipsis: true,
+          width: 120,
         },
         {
-          title: '权限',
-          dataIndex: 'permission',
-          key: 'permission',
+          title: '参与统计',
+          dataIndex: 'join',
+          key: 'join',
+          scopedSlots: { customRender: 'join' },
           ellipsis: true,
+          width: 80,
+        },
+        {
+          title: '大屏显示',
+          dataIndex: 'bigScreen',
+          key: 'bigScreen',
+          scopedSlots: { customRender: 'bigScreen' },
+          ellipsis: true,
+          width: 80,
         },
         {
           title: '操作',
@@ -306,7 +342,7 @@ export default {
     if (localStorage.getItem('LOGIN_DATA')) {
       this.loginUserInfo = JSON.parse(localStorage.getItem('LOGIN_DATA'))
     }
-    this.$emit('setTitle', '我的团队')
+    this.$emit('setTitle', '团队成员')
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -528,6 +564,10 @@ export default {
         },
       })
     },
+    selectGroup(item) {
+      console.log(item)
+      this.selectedKeys = [item.teamName]
+    },
     modalCancel() {
       // console.log(this);
       this.visible = false
@@ -721,149 +761,43 @@ export default {
 }
 .contentbody {
   overflow: hidden;
-  /deep/ .searchbox {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 16px;
-    .searchinput {
-      // width: 326px;
+  display: flex;
+  justify-content: space-between;
+  padding-left: 0;
+  overflow: hidden;
+  .leftContainer {
+    width: 260px;
+    height: 100%;
+    /deep/ .searchbox {
       display: flex;
-      position: relative;
-      .groupSelect {
-        display: flex;
-        position: relative;
-        flex-wrap: wrap;
-        width: 410px;
-        margin-left: 20px;
-        border-radius: 4px;
-        margin-bottom: 0 !important;
-        > div {
-          // width: 60px;
-          text-align: center;
-          padding: 5px 12px;
-          font-size: 14px;
-          border: 1px solid #eee;
-          cursor: pointer;
-          margin-bottom: 10px;
-        }
-        > div:not(:first-child) {
-          margin-left: -1px;
-          // border-left: none;
-        }
-        .active {
-          color: #ff4400;
-          border: 1px solid #ff4400;
-          z-index: 1;
-        }
-        .showGroupSelect {
-          position: absolute;
-          right: 12px;
-          top: 6px;
-          color: #ff4400;
-          font-size: 14px;
-          cursor: pointer;
-        }
-      }
-      .ant-input {
-        width: 280px;
-        position: relative;
-        height: 32px;
-        text-indent: 10px;
-        background: #fff;
-        // border: 1px solid rgba(77, 87, 94, 0.3);
-        border-radius: 0px;
-        box-shadow: 0px 2px 4px 0px transparent;
-        font-size: 14px !important;
-        padding-right: 0;
-        border-color: #ddd;
-        // z-index: ;
-        &::placeholder {
-          text-indent: 10px;
-          font-size: 14px !important;
-        }
-        &:hover {
-          border-color: #ff4400;
-          box-shadow: none;
-        }
-        &:focus {
-          border-color: #ff4400;
-        }
-      }
-      .ant-input-affix-wrapper {
-        width: unset;
-        position: relative;
-        .ant-input-prefix {
-          position: absolute;
-          width: 20px;
-          right: 0;
-          top: 16px;
-          i {
-            color: #c9c9c9;
-          }
-        }
-        .ant-input-suffix {
-          // position: absolute;
-          top: 0;
-          transform: translate(0);
-          right: 0px !important;
-        }
-      }
-      button {
-        width: 70px;
-        height: 32px;
-        color: white;
-        background: #ff4400;
-        border-color: #ff4400;
-        border: none;
-        border-radius: 0px;
-        font-size: 14px;
-        box-shadow: none;
-        cursor: pointer;
-        outline: none;
-        &:hover {
-          background-color: #ff4400cc;
-        }
-        // &:focus {
-        //   border: none;
-        // }
-      }
+      justify-content: space-between;
+      padding-bottom: 14px;
     }
-    .addGroup {
-      // width: 120px;
-      padding: 0 16px;
-      height: 32px;
-      line-height: 30px;
-      border: 1px solid #cccccc;
-      // border-radius: 4px;
-      font-size: 16px;
-      color: #333;
-      background-color: #fff;
-      &:hover {
-        border-color: #ff4400;
-        color: #ff4400;
-      }
-      &:first-child {
-        margin-right: 12px;
+    .leftMenu {
+      max-width: calc(100% - 1px);
+      margin-right: 1px;
+      border-right-color: transparent;
+      &::-webkit-scrollbar {
+        width: 0;
       }
     }
-    .pagechange {
-      // width: 120px;
-      padding: 0 16px;
+  }
+  .rightContainer {
+    flex: 1;
+    padding-left: 16px;
+    .addmemeber {
+      padding: 0 12px;
       height: 32px;
-      line-height: 30px;
-      border: 1px solid #f40;
-      // border-radius: 4px;
-      font-size: 16px;
+      line-height: 32px;
       color: #fff;
-      background-color: #ff4400;
-      &:hover {
-        opacity: 0.8;
-      }
-      &:first-child {
-        margin-right: 12px;
+      background: #1890ff;
+      border-radius: 4px;
+      i {
+        font-size: 12px;
       }
     }
   }
+
   /deep/ .ant-table-placeholder {
     min-height: 300px;
     > div {
@@ -941,19 +875,19 @@ export default {
   .ant-modal-footer {
     border-top: none;
   }
-  .ant-btn:not(.ant-btn-primary):hover,
-  .ant-btn:not(.ant-btn-primary):focus {
-    color: #ff4400;
-    background-color: #fff;
-    border-color: #ff4400;
-  }
-  .ant-btn-primary {
-    background-color: #ff4400;
-    border-color: #ff4400;
-    &:hover {
-      opacity: 0.8;
-    }
-  }
+  // .ant-btn:not(.ant-btn-primary):hover,
+  // .ant-btn:not(.ant-btn-primary):focus {
+  //   color: #ff4400;
+  //   background-color: #fff;
+  //   border-color: #ff4400;
+  // }
+  // .ant-btn-primary {
+  //   background-color: #ff4400;
+  //   border-color: #ff4400;
+  //   &:hover {
+  //     opacity: 0.8;
+  //   }
+  // }
 }
 // }
 .detailWindow {
@@ -988,18 +922,7 @@ export default {
         }
       }
     }
-    .ant-modal-footer {
-      padding: 0;
-      button {
-        outline: none;
-        width: 60px;
-        height: 32px;
-        font-size: 14px;
-        border: 1px solid #fff;
-        border-radius: 5px;
-        margin: 10px 0;
-      }
-    }
+
   }
 }
 .groupSelectDrop {
diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue
index 3212384..81dc69e 100644
--- a/src/components/screen/largeScreen.vue
+++ b/src/components/screen/largeScreen.vue
@@ -55,7 +55,7 @@
                                         <div class="ttd tc5" style="">{{item.entry}}</span>
                                         <!-- /{{parseFloat(item.entryMonthNum).toFixed(1).replace(/(.0)$/,'')}} -->
                                     </div>
-                                        <div class="ttd tc6">
+                                        <div class="ttd tc6">
 											{{item.transferRatio}}丨<span style="display: inline-block;">{{item.funnel}}</span></div>
                                     </div>
                                 </div>
@@ -72,7 +72,7 @@
                     <div class="bgppp">
                     </div>
                     <div class="animate__animated animate__zoomInDown animate_h animate__infinite animate__zoomOutUp">
-                        <!-- {{showUserName}} -->
+                        <!-- {{showUserName}} -->
 						墨竹/王泽流
                         <!-- 12 -->
                     </div>
@@ -93,9 +93,9 @@
 </template>
 <script>
 import { axios, doAsyncHttpRequest } from '@/utils/request';
-import { isNotEmptyCheck, timeagoOfDateStr } from '@/utils/commonUtil';
-import {
- screen
+import { isNotEmptyCheck, timeagoOfDateStr } from '@/utils/commonUtil';
+import {
+ screen
 } from "../../api/screen";
 // import { serverAddress, numFormat3 } from '@/utils/global';
 // import store from '@/store';
@@ -108,7 +108,7 @@ const formTailLayout = {
     labelCol: { span: 6 },
     wrapperCol: { span: 8, offset: 6 },
 };
-var timeClear;
+var timeClear;
 var timer //定时器
 var flag = false;
 var timeStamp = 0;
@@ -172,58 +172,58 @@ export default {
         var that = this;
         // document.getElementById('inputId').focus();
         // this.$refs.id.focus();
-        document.querySelector('html').setAttribute('style', 'background-image: url(http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png);background-size: 100% 100%;min-height:100vh;');
-        // overflow:hidden;
-        document.querySelector('body').setAttribute('style', 'background: none');
-	
-	// 	that.initWebSocket();
-	// 	that.initClock();
-		
-	// 	if (that.isShow) {
-	// 	    setInterval(() => that.websocketHeartCheck(), 60000); //每隔1分钟刷新一次
-	// 	}
-	
+        // document.querySelector('html').setAttribute('style', 'background-image: url(http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png);background-size: 100% 100%;min-height:100vh;');
+        // // overflow:hidden;
+        // document.querySelector('body').setAttribute('style', 'background: none');
+	
+	// 	that.initWebSocket();
+	// 	that.initClock();
+		
+	// 	if (that.isShow) {
+	// 	    setInterval(() => that.websocketHeartCheck(), 60000); //每隔1分钟刷新一次
+	// 	}
+	
 		that.getData()
-	   
+	   
 	    timer = setInterval(() => that.getData(), 60000*5); //每隔5分钟刷新一次
 
 
-    },
-	
+    },
+	
 	
     destroyed() {
         // this.websock.close() //离开路由之后断开websocket连接
     },
     beforeDestroy() { //在组件生命周期结束的时候销毁。
-        var that = this;
-		if(timer){
-			clearInterval(timer);
+        var that = this;
+		if(timer){
+			clearInterval(timer);
 		}
         document.querySelector('html').removeAttribute('style', '')
         document.querySelector('body').removeAttribute('style', '')
     },
 
-    methods: {
-		async getData(){
-			var that = this;
-			try {
-			  const data = await screen();
-			  console.log(data);
-			  if (data.status === 200) {
-				  that.array = [];
-				  // this.array = data.data.data.list
-				  for (var i = 0; i < data.data.data.list.length; i += that.pageSize) {
-				      this.array.push(data.data.data.list.slice(i, i + that.pageSize));
-				  }
-			  } else {
-			    console.log(1);
-			  }
-			} catch (error) {
-			  console.log(error);
-			  this.$message.warning(error.message);
-			}
-			
-		},
+    methods: {
+		async getData(){
+			var that = this;
+			try {
+			  const data = await screen();
+			  console.log(data);
+			  if (data.status === 200) {
+				  that.array = [];
+				  // this.array = data.data.data.list
+				  for (var i = 0; i < data.data.data.list.length; i += that.pageSize) {
+				      this.array.push(data.data.data.list.slice(i, i + that.pageSize));
+				  }
+			  } else {
+			    console.log(1);
+			  }
+			} catch (error) {
+			  console.log(error);
+			  this.$message.warning(error.message);
+			}
+			
+		},
 		
         showTargetResume(item) {
           /*if(item.targetResume - item.monthEntryNum <= 0) {
@@ -458,9 +458,9 @@ export default {
                     that.array = [];
                     for (var i = 0; i < tempList.length; i += that.pageSize) {
                         this.array.push(tempList.slice(i, i + that.pageSize));
-                    }
-					for (var i = 0; i < this.array.length; i ++) {
-					   i.disposeNum = 100
+                    }
+					for (var i = 0; i < this.array.length; i ++) {
+					   i.disposeNum = 100
 					}
                     // console.log(that.recordTodayList);
                     // console.log(tempList);
@@ -514,40 +514,40 @@ export default {
             }
         },
 
-        playAudio1() { //点击约面 到面
+        playAudio1() { //点击约面 到面
 			var that = this;
             let audio1 = new Audio()
             audio1.src = "http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/money.wav"
-            audio1.play();
-			this.showUserName_curr = '木槿/韩丽蕊'
-			setTimeout(function() {
-			    that.showUserName_curr = '';
+            audio1.play();
+			this.showUserName_curr = '木槿/韩丽蕊'
+			setTimeout(function() {
+			    that.showUserName_curr = '';
 			}, 5000)
 
         },
-        playAudio2() {
+        playAudio2() {
 				var that = this;
             let audio2 = new Audio()
             audio2.src = "http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/mario.wav"
-            audio2.play();
-			this.showUserName_curr = '木槿/韩丽蕊'
-			setTimeout(function() {
-			    that.showUserName_curr = '';
-			}, 5000)
+            audio2.play();
+			this.showUserName_curr = '木槿/韩丽蕊'
+			setTimeout(function() {
+			    that.showUserName_curr = '';
+			}, 5000)
 			
 
         },
-        playAudio3() {
+        playAudio3() {
 			var that = this;
-            let audio3 = new Audio()
-			 this.ifani = true;
+            let audio3 = new Audio()
+			 this.ifani = true;
 			
             audio3.src = "http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/huanhu.wav"
-            audio3.play();
-			
-			setTimeout(function() {
-			    that.ifani = false;
-			}, 15000)
+            audio3.play();
+			
+			setTimeout(function() {
+			    that.ifani = false;
+			}, 15000)
 			
 
         },
@@ -700,8 +700,13 @@ export default {
 @import 'http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/ant.css';
 @import 'http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/animate.min.css';
 @import 'http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/bigScreen1.css';
-div{
-	color: #fff;
+div{
+	color: #fff;
+}
+.mmtt111{
+  background-image: url('http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png');background-size: 100% 100%;
+  background-repeat: no-repeat;
+  min-height:100vh;
 }
 .imgPlay .ant-carousel .slick-slide img {
     display: inline-block;
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index f1b9ced..9afd4c9 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -43,38 +43,38 @@
           </div>-->
           <!-- <div class="fsa"> -->
           <div>
-            {{totalObj.signUps}}
+            <span class="fwb">{{totalObj.signUps}}</span>
             <div>报名</div>
           </div>
           <div>
-            {{totalObj.arrived}}
+             <span class="fwb">{{totalObj.arrived}}</span>
             <div>到面</div>
           </div>
           <div>
-            {{totalObj.passed}}
+             <span class="fwb">{{totalObj.passed}}</span>
             <div>通过</div>
           </div>
           <div>
-            {{totalObj.entry}}
+             <span class="fwb">{{totalObj.entry}}</span>
             <div>入职</div>
           </div>
           <div class="table_left">
-            {{totalObj.obJob}}
+             <span class="fwb">{{totalObj.obJob}}</span>
             <div>在职人数</div>
           </div>
           <div class="table_left">
-            {{totalObj.entryGPA}}
+             <span class="fwb">{{totalObj.entryGPA}}</span>
             <div>入职绩点</div>
           </div>
           <div>
-            {{totalObj.finshedGPA}}
+             <span class="fwb">{{totalObj.finshedGPA}}</span>
             <div>交付绩点</div>
           </div>
           <!-- </div> -->
         </div>
       </div>
       <div class="content">
-        <a-table :columns="columns" :scroll="{ y: 480 }" class="bb1 dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index" :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users">
+        <a-table :columns="columns" :scroll="{ y: tableHeight }" class="dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index" :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users">
           <span slot="custom_objob">
             <span class="fw500">在职人数</span>
           </span>
@@ -97,7 +97,7 @@
           <button slot="suffix" @click="onSearch">搜索</button>
         </a-input>-->
       </div>
-      <a-table :columns="billColumns" :scroll="{ x: 1100}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
+      <a-table :columns="billColumns" :scroll="{ x: 1100,y:600}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
         <span slot="storeJobName" slot-scope="text">{{text}}</span>
         <span slot="userName" slot-scope="text">{{text}}1</span>
 
@@ -250,6 +250,7 @@ export default {
       },
       dateType: '',
       dateVal: '',
+	  tableHeight: 300,
     }
   },
   // 计算属性
@@ -505,7 +506,7 @@ export default {
           dataIndex: 'applyUserName',
           key: 'applyUserName',
           ellipsis: true,
-          width: 90,
+          width: 120,
           slots: { title: 'applyUserName' },
           customRender: (text, row, index) => {
             return row.applyUserName
@@ -562,7 +563,13 @@ export default {
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
-  mounted() {},
+  mounted() {
+	  
+	  console.log( document.documentElement.clientHeight)
+	  console.log(document.getElementsByClassName("content")[0].offsetTop)
+	  
+	   this.tableHeight = document.documentElement.clientHeight - document.getElementsByClassName("content")[0].offsetTop - 160;
+  },
   // 组件方法
   methods: {
     /**
@@ -866,9 +873,11 @@ table {
   }
 }
 
-/deep/ .ant-table-thead > tr > th,
-/deep/ .ant-table-tbody > tr > td {
-  padding: 12px 8px !important;
+/deep/ .ant-table-thead > tr > th, /deep/ .ant-table-tbody > tr > td {
+   padding: 12px 8px !important;
+	}
+td:empty:before {
+    content: "-";
 }
 
 /deep/ .ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header {
@@ -920,7 +929,7 @@ table {
   justify-content: center;
   align-items: center;
   font-size: 22px;
-  margin-top: 60px;
+  margin-top: 48px;
   padding-bottom: 32px;
   border-bottom: 1px solid #eee;
   // padding-right: 10px;
@@ -1090,4 +1099,11 @@ table {
 // /deep/.ant-popover .ant-popover-content .ant-popover-inner-content {
 //   width: 200px !important;
 // }
+</style>
+<style>
+	.ant-modal-close-x{
+		    width: 44px;
+		    height: 44px;
+		    line-height: 44px;
+	}
 </style>
\ No newline at end of file
diff --git a/src/style/index.less b/src/style/index.less
index a114f45..895d5bc 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -186,6 +186,12 @@ i {
 .m16 {
 	margin: 16px;
 }
+.mr16 {
+	margin-right: 16px !important;
+}
+.ml16 {
+	margin-left: 16px !important;
+}
 .m0 {
 	margin: 0 !important;
 }
@@ -234,6 +240,9 @@ i {
 .pb12 {
 	padding-bottom: 12px;
 }
+.pb15 {
+	padding-bottom: 15px;
+}
 .pb4 {
 	padding-bottom: 4px;
 }
@@ -403,9 +412,12 @@ i {
 }
 .bodyContainer {
 	padding: 16px;
-	height: 97%;
+	// height: 97%;
 	background-color: #fff;
 }
+.curp {
+	cursor: pointer;
+}
 //通用类名样式结束
 
 //svg图标
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index dc9a854..cc17a76 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -84,11 +84,13 @@
           </div>
         </div>
       </div>
-      <a-layout-content class="trans" style="padding-top: 64px">
+      <a-layout-content class="trans" style="padding-top: 64px;">
         <!-- <div id="littleUse" style="margin-top: 48px"> -->
         <router-view @setTitle="setTitle"></router-view>
         <!-- </div> -->
       </a-layout-content>
+
+      <div style="height: 64px;background-color: #f5f5f5;line-height: 64px;color: #999;font-size: 14px;text-align: center;padding-left: 152px;">Copyright © 2015 - 2021 Matripe. All Rights Reserved.</div>
     </div>
     <!-- <notice @parentPageCallBack="showMessageFromChild" ref="child"></notice> -->
   </div>
@@ -123,20 +125,6 @@ export default {
           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,
@@ -191,6 +179,20 @@ export default {
               menuType: 1,
               children: '',
             },
+            {
+              id: 295,
+              parentId: 294,
+              name: 'MemberInfo',
+              url: '/memberInfo',
+              icon: '',
+              component: 'home',
+              path: '/home',
+              title: '团队成员',
+              menuName: 'dashboard',
+              level: 2,
+              menuType: 1,
+              children: '',
+            },
           ],
         },
       ],
@@ -279,7 +281,7 @@ header.header,
 
 .trans {
   -webkit-transition: all 0.2s;
-  height: calc(100vh);
+  height: calc(100vh - 64px);
   // overflow: scroll;
   background-color: #f5f5f5;
   transition: all 0.2s;