natasha 1 vuosi sitten
vanhempi
commit
4d4e4522ec

+ 30 - 122
src/views/content_manage/course_manage/LiveCourse.vue

@@ -25,18 +25,7 @@
                         <label>状态</label>
                         <el-select v-model="searchStatus" @change="getList" placeholder="请选择">
                             <el-option
-                                v-for="item in searchStatusList"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </div>
-                    <div class="search-item">
-                        <label>学段</label>
-                        <el-select v-model="searchStudy" @change="getList" placeholder="请选择">
-                            <el-option
-                                v-for="item in studyList"
+                                v-for="item in $checkStatusList"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value">
@@ -56,30 +45,16 @@
                         width="64">
                     </el-table-column>
                     <el-table-column
-                        prop="title"
+                        prop="name"
                         label="名称"
                         sortable
                         min-width="128">
                     </el-table-column>
                     <el-table-column
-                        prop="teacher"
+                        prop="teacher_name_desc"
                         label="教师"
                         width="80"
                         sortable>
-                        <template slot-scope="scope">
-                            <p class="teacher-list">
-                                {{formatterTracher(scope.row)}}
-                            </p>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                        prop="study"
-                        label="学段"
-                        width="80"
-                        sortable>
-                        <template slot-scope="scope">
-                            {{formatterStudy(scope.row)}}
-                        </template>
                     </el-table-column>
                     <el-table-column
                         prop="price"
@@ -87,8 +62,8 @@
                         width="154" 
                         sortable>
                         <template slot-scope="scope">
-                            <span class="currectPrice">¥{{scope.row.price | cutMoneyFiter}}</span>
-                            <span class="oldPrice">(¥{{scope.row.oldPrice | cutMoneyFiter}})</span>
+                            <span class="currectPrice">¥{{scope.row.price_discount | cutMoneyFiter}}</span>
+                            <span class="oldPrice">(¥{{scope.row.price | cutMoneyFiter}})</span>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -97,19 +72,19 @@
                         width="104" >
                         <template slot-scope="scope">
                             <div class="status-box">
-                                <span :style="{background:statusList[scope.row.status].bg}"></span>
-                                <b :style="{color:statusList[scope.row.status].color}">{{statusList[scope.row.status].text}}</b>
+                                <span :style="{background:$checkStatusColorList[scope.row.status].bg}"></span>
+                                <b :style="{color:$checkStatusColorList[scope.row.status].color}">{{$checkStatusColorList[scope.row.status].text}}</b>
                             </div>
                         </template>
                     </el-table-column>
                     <el-table-column
-                        prop="creator"
+                        prop="creator_name"
                         label="创建人"
                         min-width="80"
                         sortable>
                     </el-table-column>
                     <el-table-column
-                        prop="data"
+                        prop="create_time"
                         label="创建时间"
                         sortable
                         width="160">
@@ -190,6 +165,7 @@ import Header from "../../../components/Header.vue";
 import NavMenu from "../../../components/NavMenu.vue"
 import Breadcrumb from '../../../components/Breadcrumb.vue';
 import { cutMoneyFiter } from '@/utils/defined';
+import { getLogin } from "@/api/ajax";
 
 export default {
   //import引入的组件需要注入到对象中才能使用
@@ -229,72 +205,6 @@ export default {
         searchInput:'',
         searchStatus: '',
         searchStudy: '',
-        searchStatusList:[
-            {
-                value:'',
-                label:'全部'
-            },
-            {
-                value:'1',
-                label:'已上架'
-            },
-            {
-                value:'0',
-                label:'未上架'
-            },
-            {
-                value:'2',
-                label:'待审核'
-            },
-            {
-                value:'3',
-                label:'被驳回'
-            }
-        ],
-        studyList:[
-            {
-                value:'',
-                label:'全部'
-            },
-            {
-                value:'0',
-                label:'初一'
-            },
-            {
-                value:'1',
-                label:'初二'
-            },
-            {
-                value:'2',
-                label:'初三'
-            },
-            {
-                value:'3',
-                label:'高一'
-            }
-        ],
-        statusList:{
-            '1':{
-                text:'已上架',
-                bg:'#00B42A',
-                color:''
-            },
-            '0':{
-                text:'未上架',
-                bg:'#165DFF',
-                color:''
-            },
-            '2':{
-                text:'待审核',
-                bg:'#C9CDD4',
-                color:''
-            },
-            '3':{
-                text:'被驳回',
-                bg:'#F53F3F',
-                color:'#F53F3F'
-            }
-        },
         tableData:[
             {
                 id:'1',
@@ -431,30 +341,27 @@ export default {
   //方法集合
   methods: {
     // 查询列表
-    getList(){
-    },
-    // 处理老师
-    formatterTracher(row){
-        let teacher = ''
-        if(row.teacher){
-           teacher = row.teacher.join() 
+    getList(page){
+        if(page){
+            this.pageNumber = page
         }
-        return teacher
-    },
-    // 处理学段
-    formatterStudy(row){
-        let studyCn = ''
-        let list = this.studyList
-        if(row.study){
-            for(let i=0;i<list.length;i++){
-                if(row.study===list[i].value){
-                    studyCn = list[i].label
-                }
-            }
-        }else{
-            studyCn = '未知'
+        let MethodName = "/CourseServer/Manager/PageQuery/PageQueryZBCourseList";
+        let data = {
+            search_content: this.searchInput.trim(),
+            status: this.searchStatus,
+            page_capacity:this.pageSize,
+            cur_page:this.pageNumber
         }
-        return studyCn
+        getLogin(MethodName, data)
+        .then((res) => {
+            if(res.status===1){
+               this.tableData = res.zb_course_list
+               this.total_count = res.total_count
+            }
+        })
+        .catch(() => {
+            this.loading = false
+        });
     },
     // 创建机构或者编辑信息
     handleEdit(row){
@@ -539,6 +446,7 @@ export default {
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {
     this.getTableHeight();
+    this.getList()
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {

+ 1 - 1
src/views/organize_manage/CreateOrganize.vue

@@ -408,7 +408,7 @@ export default {
             },
             manager:{
                 user_name: this.managerForm.name,
-                real_name: this.managerForm.real_name,
+                real_name: this.managerForm.realName,
                 phone: this.managerForm.phone,
                 email: this.managerForm.email,
                 password: this.managerForm.newPwd