优化

src/components/class/index.vue

@@ -53,10 +53,10 @@
             <el-form-item label="老师数量">{{countObj.count_teacher_num}}</el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计学生总数">{{countObj.count_max_join_num}}</el-form-item>
+            <el-form-item label="预计学员总数">{{countObj.count_max_join_num}}</el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="班级学生总数">{{countObj.count_join_num}}</el-form-item>
+            <el-form-item label="学员总数">{{countObj.count_join_num}}</el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="结束时间">{{title.over_at}}</el-form-item>

src/components/lesson/dialog.vue

@@ -10,7 +10,7 @@
         <el-form-item label="课程标题" prop="title">
           <el-input v-model="form.title"></el-input>
         </el-form-item>
-        <el-form-item label="课程封面">
+        <el-form-item label="课程封面(670*472)">
           <el-upload
             action="/api/public/upload"
             :http-request="uploadFileMain"

src/components/order/index.vue

@@ -132,10 +132,10 @@
       <el-table-column
         label="收货地址">
         <template slot-scope="scope">
-          <div v-if="scope.row.user_address_id">
-            {{scope.row.receive_name}}<br>
-            {{scope.row.receive_mobile}}<br>
-            {{scope.row.province_name}}{{scope.row.city}}{{scope.row.area}}{{scope.row.address}}
+          <div v-if="scope.row.user_address_id && scope.row.address_info">
+            {{scope.row.address_info.receive_name}}<br>
+            {{scope.row.address_info.receive_mobile}}<br>
+            {{scope.row.address_info.province_name}}{{scope.row.address_info.city}}{{scope.row.address_info.area}}{{scope.row.address_info.address}}
           </div>
         </template>
       </el-table-column>

src/components/periods/index.vue

@@ -92,7 +92,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="总的学员数">
+        label="总学员数">
         <template slot-scope="scope">
           {{scope.row.total_user_num ? scope.row.total_user_num : ''}}
         </template>

src/components/shop/dialog.vue

@@ -59,18 +59,19 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="主图">
+        <el-form-item label="主图(750*600)">
           <el-upload
             list-type="picture-card"
             class="upload-demo"
             action="/api/public/upload"
+            :limit="1"
             :http-request="uploadFileMain"
             :file-list="form.goods_desc.img"
           >
             <i class="el-icon-plus"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="客服">
+        <el-form-item label="客服(200*200)">
           <el-upload
             list-type="picture-card"
             class="upload-demo"
@@ -432,4 +433,8 @@
     display: block;
     text-align: center;
   }
+  .size {
+    color: #666;
+    font-size: 14px;
+  }
 </style>

src/components/system/admin.vue

 <template>
   <div class="admin">
-    <div class="head clear-both">
-      <el-button @click="add" plain type="success" style="float: right" v-if="!$store.state.readonly">新增角色</el-button>
-    </div>
+    <el-form ref="searchFrom" :model="searchFrom" label-width="80px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="用户名">
+            <el-input v-model="searchFrom.user_name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="searchFrom.status" placeholder="请选择用户等级">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="启用" :value="0"></el-option>
+              <el-option label="冻结" :value="1"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item>
+            <el-button type="primary" plain @click="getList">搜索</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4" :offset="8">
+          <el-button @click="add" plain type="success" style="float: right" v-if="!$store.state.readonly">新增角色</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+    <!--<div class="head clear-both">-->
+      <!---->
+    <!--</div>-->
     <el-table
       :data="adminList"
       style="width: 100%">
@@ -161,6 +187,10 @@
         total:0,
         limit: 10,
         adminList:[],
+        searchFrom:{
+          user_name: '',
+          status: ''
+        },
         dialog:{
           dialogType:0,
           title:'新增账号',
@@ -187,7 +217,7 @@
             role_id:'',
             status:0,
             desc:''
-          }
+          },
         },
         roleList: []
       }
@@ -218,6 +248,12 @@
           limit: this.limit,
           page: this.nowPage
         }
+        if (this.searchFrom.user_name){
+          json.user_name = this.searchFrom.user_name
+        }
+        if (this.searchFrom.status !== ''){
+          json.status = this.searchFrom.status
+        }
         getAdminListApi(json).then(res=>{
           this.adminList = res.list
           this.total=Number(res.total)

src/components/system/banner.vue

@@ -80,6 +80,7 @@
             :on-remove="handleRemove">
             <i class="el-icon-plus"></i>
           </el-upload>
+          <p class="size">750*400</p>
         </div>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -290,6 +291,10 @@
      clear: both;
    }
   }
+  .size {
+    color: #666;
+    font-size: 14px;
+  }
 </style>
 <style>
   .disabled .el-upload--picture-card {

src/components/teacher/index.vue

@@ -34,10 +34,6 @@
     <el-table
       :data="userList"
       style="width: 100%">
-      <el-table-column
-        prop="id"
-        label="账号ID">
-      </el-table-column>
       <el-table-column
         prop="name"
         label="名称">

src/components/user/index.vue

@@ -28,18 +28,10 @@
       :data="userList"
       style="width: 100%">
       <el-table-column
-        prop="user_id"
-        label="账号ID">
-      </el-table-column>
-      <el-table-column
-        prop="nickname"
-        label="用户名">
-      </el-table-column>
-      <el-table-column
-        prop="avatar"
-        label="头像">
+        className="f-c"
+        label="用户">
         <template slot-scope="scope">
-          <img class="avatar" :src="scope.row.avatar">
+          <img class="avatar" :src="scope.row.avatar">{{scope.row.nickname}}(ID:{{scope.row.user_id}})
         </template>
       </el-table-column>
       <el-table-column
@@ -165,6 +157,8 @@
   @import "../../util/public";
   .avatar {
     width: 50px;
+    margin-right: 5px;
+    border-radius: 50%;
   }
   .user{
     height: 100%;
@@ -174,4 +168,13 @@
       text-align: center;
     }
   }
+
+</style>
+<style>
+  .f-c > div {
+    display: flex !important;
+    flex-flow: row;
+    justify-content: flex-start;
+    align-items: center;
+  }
 </style>

src/components/userDetail/index.vue

@@ -26,13 +26,13 @@
       </el-row>
       <el-row>
         <el-col :span="6">
-          <label>老师ID：</label>{{detail.teacher_id}}
+          <label>老师ID：</label>{{detail.teacher_id ? detail.teacher_id : ''}}
         </el-col>
         <el-col :span="6">
           <label>邀请类型：</label>{{detail.invite_type | inviteType}}
         </el-col>
         <el-col :span="6">
-          <label>邀请人ID：</label>{{detail.invite_user_id}}
+          <label>邀请人ID：</label>{{detail.invite_user_id ? detail.invite_user_id : ''}}
         </el-col>
         <el-col :span="6">
           <label>注册时间：</label>{{detail.created_at}}
@@ -59,6 +59,7 @@
         </template>
       </el-table-column>
       <el-table-column
+        className="f-c"
         label="老师">
         <template slot-scope="scope">
           <img class="avatar" :src="scope.row.teacher_qr"> {{scope.row.teacher_name}}
@@ -90,13 +91,10 @@
         label="订单号">
       </el-table-column>
       <el-table-column
-        prop="user_nickname"
-        label="用户名">
-      </el-table-column>
-      <el-table-column
-        label="头像">
+        className="f-c"
+        label="用户">
         <template slot-scope="scope">
-          <img class="avatar" :src="scope.row.user_avatar">
+          <img class="avatar" :src="scope.row.user_avatar"> {{scope.row.user_nickname}}
         </template>
       </el-table-column>
       <el-table-column
@@ -297,3 +295,12 @@
     color: #666;
   }
 </style>
+
+<style>
+  .f-c > div {
+    display: flex !important;
+    flex-flow: row;
+    justify-content: flex-start;
+    align-items: center;
+  }
+</style>