标签页 新增搜索、高级搜索、导出、权限配置

9个期数搜索框更新

src/App.vue

@@ -198,6 +198,12 @@ html, body {
     &.width-320 {
       max-width: 320px;
     }
+    &.width-360 {
+      max-width: 360px;
+    }
+    &.width-400 {
+      max-width: 400px;
+    }
     &.width-480 {
       max-width: 480px;
     }
@@ -232,4 +238,19 @@ html, body {
     }
   }
 
+.el-table {
+  .f-c > div {
+    display: flex !important;
+    flex-flow: row;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  .avatar {
+    width: 50px;
+    margin-right: 8px;
+    border-radius: 50%;
+    height: 50px;
+  }
+}
+
 </style>

src/components/conversionList/channelConversionList.vue

@@ -140,8 +140,7 @@ export default {
       goods_id: null,
       teacherList: [],
       goodsList: [],
-      periodList: [],
-      total: 0,
+      //periodList: [],
       today: {
         text: "今天",
         onClick: () => {
@@ -343,12 +342,12 @@ export default {
       this.limit = val;
       this.getChannelTransList();
     },
-    getPeriodsOtherList() {
+    /*getPeriodsOtherList() {
       let json = { limit: 1000, page: 1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
         this.periodList = res.list;
       });
-    },
+    },*/
     getChannelTransList() {
       let json = {
         limit: this.limit,

src/components/conversionList/channelGoodsConversionList.vue

@@ -157,8 +157,7 @@ export default {
       list: [],
       goods_id: null,
       teacherList: [],
-      periodList: [],
-      total: 0,
+      //periodList: [],
       today: {
         text: "今天",
         onClick: () => {
@@ -204,7 +203,6 @@ export default {
           ];
         }
       },
-      propertyList: [],
       spanArr: [],
       contentSpanArr: [],
       searchFrom: {
@@ -391,12 +389,12 @@ export default {
       this.limit = val;
       this.getChannelTransList();
     },
-    getPeriodsOtherList() {
+    /*getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
         this.periodList = res.list;
       });
-    },
+    },*/
     getChannelTransList() {
       let json = {
         limit: this.limit,

src/components/conversionList/channelTransList.vue

@@ -65,13 +65,15 @@
       </el-form-item>
       <el-form-item label="期数名称" prop="periods_title">
         <el-select
+          :popper-class="'refresh-select-multi width-480'"
+          style="width: 480px"
           placeholder="请选择"
           v-model="searchFrom.periods_id"
           @change="onPeriodChange"
           multiple
           clearable
           filterable>
-          <el-option v-for="item in periodList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+          <el-option v-for="item in periodList" :key="item.id" :label="item.label" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="组ID">
@@ -443,6 +445,9 @@ export default {
     getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
+        res.list.forEach(val=>{
+          val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
+        })
         this.periodList = res.list;
       });
     },

src/components/conversionList/marketEnrollmentConversionList.vue

@@ -36,13 +36,15 @@
       </el-form-item>
       <el-form-item label="期数名称" prop="periods_title">
         <el-select
+          :popper-class="'refresh-select-multi width-480'"
+          style="width: 480px"
           placeholder="请选择"
           v-model="searchFrom.periods_id"
           @change="onPeriodChange"
           multiple
           clearable
           filterable>
-          <el-option v-for="item in periodList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+          <el-option v-for="item in periodList" :key="item.id" :label="item.label" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -58,12 +60,11 @@
       :header-cell-style="{background:'#5f5f5f',color:'#fff'}"
       :data="list"
       size="mini"
-      height="calc(100vh - 210px)"
       :row-class-name="tableRowClassName"
       :span-method="arraySpanMethod"
     >
-      <el-table-column prop="periods_title" align="center" min-width="80" fixed label="期数名称">
-      </el-table-column>
+      <!--height="calc(100vh - 210px)"-->
+      <el-table-column prop="periods_title" align="center" min-width="80" fixed label="期数名称"></el-table-column>
       <el-table-column prop="is_other" min-width="160" align="left" fixed label="渠道信息">
         <template slot-scope="scope">
         来源：{{scope.row.is_other==0?"内部":"外部"}}<br>
@@ -109,7 +110,6 @@ export default {
         "wait_join_num",
         "other_wait_join_num"
       ],
-      periodList:[],
       searchFrom: {
         payTime: [],
         start_at: "",
@@ -196,6 +196,9 @@ export default {
     getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
+        res.list.forEach(val=>{
+          val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
+        })
         this.periodList = res.list;
       });
     },
@@ -292,10 +295,12 @@ export default {
 
 <style scoped lang="less">
 .searchFrom{
-  position: absolute;
-  top: 20px;
+  /*position: absolute;
+  top: 20px;*/
+}
+.el-table{
+  /*margin-top: 130px;*/
 }
-.el-table{margin-top: 130px;}
 /deep/.el-table--enable-row-hover .el-table__body tr:hover > td {
   background-color: #fff;
 }
@@ -306,6 +311,6 @@ export default {
   max-width: 100% !important;
 }
 .el-main .content .router-block .child-view {
-  height: 100vh;
+  /*height: 100vh;*/
 }
 </style>

src/components/conversionList/periodsConversionList.vue

@@ -11,8 +11,7 @@
           end-placeholder="结束日期"
           :picker-options="{shortcuts:[today,yesterday,last7Day,last30Day]}"
           :default-time="['00:00:00','23:59:59']"
-          @change="getChannelTransList"
-        ></el-date-picker>
+          @change="getChannelTransList"></el-date-picker>
       </el-form-item>
       <el-form-item label="开结课日期">
         <el-date-picker
@@ -24,8 +23,7 @@
           end-placeholder="结束日期"
           :picker-options="{shortcuts:[classToday,classYesterday,classLast7Day,classLast30Day]}"
           :default-time="['00:00:00','23:59:59']"
-          @change="getChannelTransList"
-        ></el-date-picker>
+          @change="getChannelTransList"></el-date-picker>
       </el-form-item>
       <el-form-item label="渠道code">
         <el-input v-model="searchFrom.invite_type" style="width: 110px"></el-input>
@@ -38,25 +36,23 @@
           clearable
           placeholder="请选择"
           style="width: 150px"
-          @change="selectChange"
-        >
+          @change="selectChange">
           <el-option
             v-for="(data,index) in watchList"
             :key="index"
             :label="data.title"
-            :value="data.id"
-          ></el-option>
+            :value="data.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="期数名称" prop="periods_title">
         <el-select
+          style="width: 480px"
           placeholder="请选择"
           v-model="searchFrom.periods_id"
           @change="onPeriodChange"
           multiple
-          filterable
-        >
-          <el-option v-for="item in periodList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+          filterable>
+          <el-option v-for="item in periodList" :key="item.id" :label="item.label" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="组ID">
@@ -69,15 +65,13 @@
           placeholder="请选择"
           @change="changeTeacher"
           clearable
-          style="width: 100px"
-        >
+          style="width: 100px">
           <el-option label="暂不分配" value="0"></el-option>
           <el-option
             v-for="(data,index) in teacherList"
             :key="index"
             :label="data.name"
-            :value="data.id"
-          ></el-option>
+            :value="data.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -92,15 +86,13 @@
       :data="list"
       @sort-change="sortMethod"
       :style="{width: width+'px'}"
-      fixed
-    >
+      fixed>
       <el-table-column prop="periods_title" label="期数名称" ></el-table-column>
       <el-table-column
         prop="duration_over_at"
         label="开课看课时间"
         style="font-size:12px;"
-        width="200"
-        >
+        width="200">
         <template slot-scope="scope">
           开课日期：{{scope.row.start_at}}
           <br>
@@ -164,7 +156,6 @@ export default {
       teacherList: [],
       goodsList: [],
       periodList: [],
-      total: 0,
       today: {
         text: "今天",
         onClick: () => {
@@ -453,6 +444,9 @@ export default {
     getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
+        res.list.forEach(val=>{
+          val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
+        })
         this.periodList = res.list;
         console.log(320)
       });

src/components/conversionList/sourceConversionList.vue

@@ -35,13 +35,13 @@
       </el-form-item>
       <el-form-item label="期数名称" prop="periods_title">
         <el-select
+          style="width: 480px"
           placeholder="请选择"
           v-model="searchFrom.periods_id"
           @change="onPeriodChange"
           multiple
-          filterable
-        >
-          <el-option v-for="item in periodList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+          filterable>
+          <el-option v-for="item in periodList" :key="item.id" :label="item.label" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="转化前商品">
@@ -193,7 +193,6 @@ export default {
       teacherList: [],
       goodsList: [],
       periodList: [],
-      total: 0,
       today: {
         text: "今天",
         onClick: () => {
@@ -473,6 +472,9 @@ export default {
     getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
+        res.list.forEach(val=>{
+          val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
+        })
         this.periodList = res.list;
         console.log(320)
       });

src/components/conversionList/squadConversionList.vue

@@ -37,13 +37,13 @@
       </el-form-item>
       <el-form-item label="期数名称" prop="periods_title">
         <el-select
+          style="width: 480px"
           placeholder="请选择"
           v-model="searchFrom.periods_id"
           @change="onPeriodChange"
           multiple
-          filterable
-        >
-          <el-option v-for="item in periodList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+          filterable>
+          <el-option v-for="item in periodList" :key="item.id" :label="item.label" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -117,7 +117,6 @@ export default {
       teacherList: [],
       goodsList: [],
       periodList: [],
-      total: 0,
       today: {
         text: "今天",
         onClick: () => {
@@ -355,6 +354,9 @@ export default {
     getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
+        res.list.forEach(val=>{
+          val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
+        })
         this.periodList = res.list;
       });
     },

src/components/conversionList/teacherConversionList.vue

@@ -29,8 +29,7 @@
           clearable
           placeholder="请选择"
           style="width: 150px"
-          @change="selectChange"
-        >
+          @change="selectChange">
           <el-option
             v-for="(data,index) in watchList"
             :key="index"
@@ -41,12 +40,13 @@
       </el-form-item>
       <el-form-item label="期数名称" prop="periods_title">
         <el-select
+          style="width: 480px"
           placeholder="请选择"
           v-model="searchFrom.periods_id"
           @change="onPeriodChange"
           multiple
           filterable>
-          <el-option v-for="item in periodList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+          <el-option v-for="item in periodList" :key="item.id" :label="item.label" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -121,7 +121,6 @@ export default {
       teacherList: [],
       goodsList: [],
       periodList: [],
-      total: 0,
       today: {
         text: "今天",
         onClick: () => {
@@ -358,6 +357,9 @@ export default {
     getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
+        res.list.forEach(val=>{
+          val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
+        })
         this.periodList = res.list;
       });
     },

src/components/conversionList/teacherPeriodsConversionList.vue

@@ -35,12 +35,13 @@
       </el-form-item>
       <el-form-item label="期数名称" prop="periods_title">
         <el-select
+          style="width: 480px"
           placeholder="请选择"
           v-model="searchFrom.periods_id"
           @change="onPeriodChange"
           multiple
           filterable>
-          <el-option v-for="item in periodList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+          <el-option v-for="item in periodList" :key="item.id" :label="item.label" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="老师">
@@ -164,7 +165,6 @@ export default {
       teacherList: [],
       goodsList: [],
       periodList: [],
-      total: 0,
       today: {
         text: "今天",
         onClick: () => {
@@ -456,6 +456,9 @@ export default {
     getPeriodsOtherList() {
       let json = { limit: 1000,page:1,max_watch_num:20 };
       getPeriodsOtherListApi(json).then(res => {
+        res.list.forEach(val=>{
+          val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
+        })
         this.periodList = res.list;
       });
     },

src/components/exchange/add.vue

@@ -14,7 +14,7 @@
       <el-form-item label="活动方案">
         <el-select
           v-model="newIntegral.source"
-          :prop-class="'refresh-select-multi width-480'"
+          :popper-class="'refresh-select-multi width-480'"
           style="width: 480px" placeholder="请选择" filterable>
           <el-option
             v-for="(data,index) in classSource"

src/components/framework/index.vue

@@ -54,6 +54,8 @@
     .menu-block{
       float: left;
       height: 100%;
+      background-color: #333333;
+      /*height: calc(100vh - 60px);*/
       /*overflow: auto;
       position: fixed;
       left: 0;
@@ -69,9 +71,9 @@
         height: 100%;
         position: relative;
         .child-view{
-          height: calc(100% - 40px);
+          /*height: calc(100% - 40px);
           width: 100%;
-          overflow-y: auto;
+          overflow-y: auto;*/
         }
       }
     }

src/components/lesson/index.vue

 <template>
   <div class="user">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline="" class="search-form">
-          <el-form-item label="课程标题">
-            <el-input v-model="searchFrom.title"></el-input>
-          </el-form-item>
-          <el-form-item label="">
-            <div class="search-btn-block">
-              <el-button type="primary" plain @click="getUser" icon="el-icon-search">搜索</el-button>
-              <el-button type="success" plain @click="add" v-if="!$store.state.readonly" icon="el-icon-plus">新增课程</el-button>
-            </div>
-          </el-form-item>
+      <el-form-item label="课程标题">
+        <el-input v-model="searchFrom.title"></el-input>
+      </el-form-item>
+      <el-form-item label="">
+        <div class="search-btn-block">
+          <el-button type="primary" plain @click="getUser" icon="el-icon-search">搜索</el-button>
+          <el-button type="success" plain @click="add" v-if="!$store.state.readonly" icon="el-icon-plus">新增课程</el-button>
+        </div>
+      </el-form-item>
     </el-form>
     <el-tabs v-model="searchFrom.type" type="card" style="background: white;padding-top: 10px" @tab-click="getUser">
       <el-tab-pane label="全部" name="-1"></el-tab-pane>
       <el-tab-pane label="日课" name="1"></el-tab-pane>
       <el-tab-pane label="月课" name="0"></el-tab-pane>
     </el-tabs>
-    <el-table
-      :data="userList"
-      style="width: 100%">
+    <el-table :data="userList">
       <el-table-column
         prop="title"
         label="课程名">
@@ -181,8 +179,8 @@
     margin: 0;
   }
   .user{
-    height: 100%;
-    overflow: auto;
+    /*height: 100%;*/
+    /*overflow: auto;*/
     padding: 20px 0;
     .btn-content{
       text-align: center;

src/components/marketStatistics/index.vue

@@ -8,8 +8,7 @@
       height="calc(100vh - 60px)"
       size="mini"
       :row-class-name="tableRowClassName"
-      :span-method="arraySpanMethod"
-    >
+      :span-method="arraySpanMethod">
       <el-table-column min-width="180" prop="wait_join_num" align="left" fixed="left" label="期数总状况">
         <template slot-scope="scope">
           期数名称：{{scope.row.title}}

src/components/periods/dialog.vue

 <template>
   <div>
-    <el-dialog
-      :title="dialogObj.title"
-      :visible.sync="dialogObj.show"
-    >
+    <el-dialog :title="dialogObj.title" :visible.sync="dialogObj.show">
       <el-table
         :data="goodList"
         style="width: 100%"
         row-key="id"
         highlight-current-row
         @current-change="handleCurrentChange">
-        <el-table-column
-          prop="id"
-          label="商品ID">
-        </el-table-column>
+        <el-table-column prop="id" label="商品ID"></el-table-column>
         <el-table-column
           prop="name"
           label="名称">

src/components/periods/index.vue

@@ -6,7 +6,9 @@
           <el-input v-model="title" placeholder="请输入内容" style="width: 150px" clearable></el-input>
         </el-form-item>
         <el-form-item label="商品名称">
-          <el-select v-model="goodsId" filterable placeholder="请选择" style="width: 150px" @change="onSearch" clearable>
+          <el-select
+            :popper-class="'refresh-select-multi width-400'" style="width: 400px"
+            v-model="goodsId" filterable placeholder="请选择" @change="onSearch" clearable>
             <el-option
               v-for="(data,index) in goodList"
               :key="index"

src/components/periods/newDialog.vue

@@ -2,26 +2,23 @@
   <div>
     <el-dialog
       :title="dialogObj.title"
-      center
-      append-to-body
+      center append-to-body
       :visible.sync="show"
       width="800px">
       <div v-loading="loading">
         <el-form ref="form" :model="form" label-width="120px" :rules="rules">
-          <el-row>
-            <el-col :span="10">
-              <el-form-item label="商品名称" prop="goods_id">
-                <el-select v-model="form.goods_id" placeholder="请选择" @change="onOptionChange" :disabled="form.id ? true : false">
-                  <el-option
-                    v-for="(data,index) in goodList"
-                    :key="index"
-                    :label="data | filterGoods"
-                    :value="data.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-form-item label="商品名称" prop="goods_id">
+            <el-select
+              :popper-class="'refresh-select-multi width-480'" style="width: 480px"
+              v-model="form.goods_id" placeholder="请选择" @change="onOptionChange" :disabled="form.id ? true : false">
+              <el-option
+                v-for="(data,index) in goodList"
+                :key="index"
+                :label="data | filterGoods"
+                :value="data.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="期数名称" prop="title">
             <el-input v-model="form.title"></el-input>
           </el-form-item>
@@ -83,10 +80,10 @@
             </el-select>
           </el-form-item>
         </el-form>
-        <span slot="footer" class="dialog-footer">
+      </div>
+      <div slot="footer" class="dialog-footer">
         <el-button @click="show = false">取 消</el-button>
         <el-button type="primary" @click="sub">确 定</el-button>
-      </span>
       </div>
     </el-dialog>
   </div>

src/components/system/role.vue

@@ -96,7 +96,7 @@
         limit: 10,
         roleList:[],
         exportMenuList:[
-          '2-3','5-10','5-2','5-1','5-3','5-8','5-9','3-1','7-9','6-3'
+          '2-3','5-10','5-2','5-1','5-3','5-8','5-9','3-1','7-9','6-3', '10-8'
         ],
         dialog:{
           title:'新增角色',

src/components/system/staff.vue

@@ -81,7 +81,7 @@
       </el-table-column>
     </el-table>
     <page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
-    <el-dialog :title="dialog.title" :visible.sync="dialog.show" width="500px">
+    <el-dialog :title="dialog.title" :visible.sync="dialog.show" width="800px">
 
       <el-form ref="dialogForm" :rules="dialog.form.rules" :model="dialog.form" label-width="100px">
         <el-form-item label="真实姓名：" prop="name">
@@ -334,7 +334,7 @@
   }
 
   .user {
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding: 20px 0;
 

src/components/system/staffRecord.vue

@@ -151,7 +151,7 @@
 
 <style lang="less" scoped>
   .user {
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding: 20px 0;
 

src/components/user/index.vue

 <template>
   <div class="user" v-loading="loading">
     <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
-          <el-form-item label="ID">
-            <el-input v-model="searchFrom.userId"></el-input>
-          </el-form-item>
-          <el-form-item label="昵称">
-            <el-input v-model="searchFrom.nickName"></el-input>
-          </el-form-item>
-          <el-form-item label="电话">
-            <el-input v-model="searchFrom.mobile"></el-input>
-          </el-form-item>
-          <el-form-item label="等级">
-            <el-input v-model="searchFrom.level"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <div class="flexRow">
-              <el-button type="primary" plain @click="getUser">搜索</el-button>
-              <!--<el-button type="success" plain @click="syncUser">同步最新数据</el-button>-->
-            </div>
-          </el-form-item>
+      <el-form-item label="ID">
+        <el-input v-model="searchFrom.userId"></el-input>
+      </el-form-item>
+      <el-form-item label="昵称">
+        <el-input v-model="searchFrom.nickName"></el-input>
+      </el-form-item>
+      <el-form-item label="电话">
+        <el-input v-model="searchFrom.mobile"></el-input>
+      </el-form-item>
+      <el-form-item label="等级">
+        <el-input v-model="searchFrom.level"></el-input>
+      </el-form-item>
+      <!--<el-form-item label="标签">
+        <el-cascader
+          style="width: 320px" placeholder="选择标签" clearable @change="tagChange"
+          :options="options" :props="{ multiple: true, checkStrictly: true }"></el-cascader>
+      </el-form-item>-->
+      <el-form-item>
+        <div class="flexRow">
+          <el-button type="primary" plain @click="getUser">搜索</el-button>
+          <!--<el-button type="success" plain @click="syncUser">同步最新数据</el-button>-->
+        </div>
+      </el-form-item>
     </el-form>
     <el-table
       :data="userList"
       style="width: 100%">
-      <el-table-column
-        className="f-c"
-        label="用户">
+      <el-table-column className="f-c" label="用户">
         <template slot-scope="scope">
-          <img class="avatar" :src="scope.row.avatar">{{scope.row.nickname}}(ID:{{scope.row.user_id}})
+          <img class="avatar" :src="scope.row.avatar">{{scope.row.nickname}}<br>(ID:{{scope.row.user_id}})
         </template>
       </el-table-column>
-      <el-table-column
-        prop="mobile"
-        label="手机号">
-      </el-table-column>
-      <el-table-column
-        prop="created_at"
-        label="注册时间" sortable>
-      </el-table-column>
-      <el-table-column
-        prop="last_login_at"
-        label="最后登录时间" sortable>
-      </el-table-column>
-      <el-table-column
-        prop="baby_name"
-        label="宝宝名称" >
-      </el-table-column>
-      <el-table-column
-        prop="birthday"
-        label="宝宝生日" >
-      </el-table-column>
-      <el-table-column
-        prop="sex"
-        label="宝宝性别" :formatter="sexFormatter" >
-      </el-table-column>
-      <el-table-column
-        label="操作">
+      <el-table-column prop="mobile" label="手机号"></el-table-column>
+      <el-table-column prop="created_at" label="注册时间" width="105px" sortable></el-table-column>
+      <el-table-column prop="last_login_at" label="最后登录" width="105px" sortable></el-table-column>
+      <!--<el-table-column prop="last_login_at" label="最后登录时间" width="120px" sortable></el-table-column>-->
+      <el-table-column prop="baby_name" label="宝宝名称"></el-table-column>
+      <el-table-column prop="birthday" label="宝宝生日" width="105px"></el-table-column>
+      <el-table-column prop="sex" label="宝宝性别" width="80px" :formatter="sexFormatter"></el-table-column>
+      <el-table-column label="操作" width="100px">
         <template slot-scope="scope">
-          <el-button size="mini" plain type="primary" @click="goToDetail(scope.row.user_id)">
-            查看详情
-          </el-button>
+          <el-button size="mini" plain type="primary" @click="goToDetail(scope.row.user_id)">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -123,6 +106,9 @@
       this.getUser()
     },
     methods:{
+      tagChange() {
+
+      },
       sexFormatter(item){
         if(item.sex==0){
           return '保密'
@@ -204,16 +190,10 @@
   }
 </script>
 
-<style scoped lang="less">
-  @import "../../util/public";
-  .avatar {
-    width: 50px;
-    margin-right: 5px;
-    border-radius: 50%;
-    height: 50px;
-  }
+<style lang="less">
+  /*@import "../../util/public";*/
   .user{
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding: 20px 0;
     .btn-content{
@@ -228,11 +208,3 @@
   }
 
 </style>
-<style>
-  .f-c > div {
-    display: flex !important;
-    flex-flow: row;
-    justify-content: flex-start;
-    align-items: center;
-  }
-</style>

src/components/userDetail/index.vue

@@ -97,24 +97,19 @@
               </el-table>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="periods_title"
-            label="期数名称">
+          <el-table-column prop="periods_title" label="期数名称">
             <template slot-scope="scope">
               <router-link :to="{name:'class', query: { goods_id: scope.row.goods_id, periods_id: scope.row.periods_id}}" >
                 {{scope.row.periods_title}}
               </router-link>
             </template>
           </el-table-column>
-          <el-table-column
-            label="看课权限">
+          <el-table-column label="看课权限">
             <template slot-scope="scope">
               {{scope.row.is_view_course === 1 ? '是' : '否'}}
             </template>
           </el-table-column>
-          <el-table-column
-            className="f-c"
-            label="老师">
+          <el-table-column className="f-c" label="老师">
             <template slot-scope="scope">
               <router-link :to="`/teacher/${scope.row.teacher_id}`" >
                 <div class="f-c">
@@ -125,24 +120,11 @@
               </router-link>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="join_num"
-            label="加入人数">
-          </el-table-column>
-          <el-table-column
-            prop="max_join_num"
-            label="最大加入人数">
-          </el-table-column>
-          <el-table-column
-            prop="start_at"
-            label="开课时间">
-          </el-table-column>
-          <el-table-column
-            prop="created_at"
-            label="创建时间">
-          </el-table-column>
-          <el-table-column
-            label="操作" width="400px">
+          <el-table-column prop="join_num" label="加入人数"></el-table-column>
+          <el-table-column prop="max_join_num" label="最大加入人数"></el-table-column>
+          <el-table-column prop="start_at" label="开课时间"></el-table-column>
+          <el-table-column prop="created_at" label="创建时间"></el-table-column>
+          <el-table-column label="操作" width="340px">
             <template slot-scope="scope">
               <el-button @click="showUser(scope.row)" size="mini" type="primary"> 班级成员</el-button>
               <el-button  size="mini" type="warning" v-if="!$store.state.readonly"  @click="editPrivilege(scope.row)" >编辑</el-button>

src/service/api.js

@@ -1337,6 +1337,14 @@ export const postTagApi = function (json) {
 export const putTagApi = function (json) {
   return Vue.prototype.$put(`${_baseUrl}api/admin/category/${json.category_id}`, json)
 };
+// 根据标签搜索用户
+export const getTagUserApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/advanced/search`, json)
+};
+// 根据标签搜索用户
+export const TagUserApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/advanced/search`, json)
+};
 // 获取员工列表
 export const getStaffListApi = function (json) {
   return Vue.prototype.$fetch(`${_baseUrl}api/admin/staff/list`, json)