Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/views/ToConfigure/components/MemberDetails.vue

@@ -9,7 +9,7 @@
     </el-header>
     <el-main>
       <el-table :data="AllMember" :header-cell-style="{ backgroundColor: '#F4F4F4', color: '#444444', fontSize: '14px', fontWeight: '500'}">
-        <el-table-column prop="date" label="姓名" min-width="110">
+        <el-table-column prop="date" label="姓名" min-width="200">
           <template slot-scope="scope">
             <div style="display: flex; justify-content: flex-start;">
               <el-avatar :src="scope.row.phoneUrl" />

src/views/ToConfigure/components/memberConfiguration.vue

@@ -2,15 +2,15 @@
   <el-container>
     <el-main class="member_main">
       <div class="member_title">成员</div>
-      <div class="member_all cals" :class="{'color-blue': isActive === 'all'}" @click="memberAll('all')">全部成员</div>
-      <div class="member_all member_margin cals" :class="{'color-blue': isActive === 'not'}" @click="memberAll('not')">未加入团队的成员</div>
+      <div class="member_all" :class="{'color-blue': isActive === 'all'}" @click="memberAll('all')">全部成员</div>
+      <div class="member_all member_margin" :class="{'color-blue': isActive === 'not'}" @click="memberAll('not')">未加入团队的成员</div>
       <div class="member_title">团队</div>
       <div style="max-height: calc(100vh - 285px); overflow-y: auto;">
         <div class="member_team">我的团队</div>
         <div v-for="item in memberList[0]" :key="'my' + item.code">
           <div class="member_all member_space_between">
             <span
-              class="navList cals"
+              class="navList"
               :class="{'color-blue': isActive === 'my' + item.code}"
               @click="myTeam(item);isActive = 'my' + item.code"
             >{{ item.name }}</span>
@@ -29,7 +29,7 @@
         <div v-for="item in memberList[1]" :key="'all' + item.code">
           <div class="member_all member_space_between">
             <span
-              class="navList cals"
+              class="navList"
               :class="{'color-blue': isActive === 'all' + item.code}"
               @click="myTeam(item);isActive = 'all' + item.code"
             >{{ item.name }}</span>
@@ -130,16 +130,6 @@ export default {
   cursor: pointer;
   color: #409EFF;
 }
-// .cals {
-//   font-size: 14px;
-//   font-family: PingFangSC-Regular;
-//   line-height: 24px;
-//   color: #409EFF;
-// }
-// .cals:hover {
-//   cursor: pointer;
-//   color: #409EFF;
-// }
 .member_team {
   font-size: 14px;
   font-family: PingFangSC-Regular;