Merge branch 'master' into liua

* master:
  协同备课编辑页面选择教师

src/pages/personal/components/MyCourse/xtbk-create.vue

@@ -7,15 +7,20 @@
         <span class="subTitle"
           >我的课程 - 我创建的 -
           <span class="pointer" @click="goBack">协同备课</span> -
-          <span style="color: #000">创建课程</span></span
+          <span v-if="zx_id === undefined" style="color: #000">创建课程</span>
+          <span v-else style="color: #000">编辑课程</span>
+          </span
         >
       </div>
     </el-card>
 
     <el-card>
-      <div style="color: #050026; font-size: 18px; font-weight: 400">
+      <div v-if="zx_id === undefined" style="color: #050026; font-size: 18px; font-weight: 400">
         创建课程
       </div>
+      <div v-else style="color: #050026; font-size: 18px; font-weight: 400">
+        编辑课程
+      </div>
       <div class="formContent">
         <el-form
           v-if="!loading"
@@ -89,7 +94,7 @@
             <el-form-item
               style="flex: 1"
               label="开始时间"
-              prop="zx_start_datetime"
+              prop="zx_kssj"
             >
               <el-config-provider :locale="local">
                 <el-date-picker
@@ -218,7 +223,7 @@ export default {
     return {
       local: zhcn,
       https: window.GLOBAL_CONFIG.api,
-      zx_id: "",
+      zx_id: this.$route.query.id,
       wholeData: {},
       formline: {
         ywj: "",
@@ -398,7 +403,15 @@ export default {
             for (let key in this.formline) {
               this.formline[key] = res.data.one_info[key];
             }
-            this.isCheckedTeacher = res.data.one_info.zx_bkjs_json;
+            this.checkList = [];
+            if(res.data.one_info.zx_bkjs_json){
+              this.isCheckedTeacher = res.data.one_info.zx_bkjs_json;
+              res.data.one_info.zx_bkjs_json.forEach(item => {
+              this.checkList.push(item.user_id)
+            })
+            }else{
+              this.isCheckedTeacher = [];
+            }
             console.log("object :>> ", this.formline);
             this.loading = false;
 

src/pages/personal/components/MyCourse/xtbk.vue

@@ -52,13 +52,13 @@
           <img class="cover" :src="https + item.zx_img" alt="" />
           <div class="main">
             <p class="main-title">{{ item.zx_name }}</p>
-            <img
+            <img style="cursor: pointer;"
               @click="editData(item.zx_id)"
               class="edit"
               src="@/assets/img/edit.png"
               alt=""
             />
-            <img
+            <img style="cursor: pointer;"
               @click="deleteData(item.zx_id)"
               class="delete"
               src="@/assets/img/delete.png"
@@ -67,7 +67,7 @@
 
             <p class="main-content">{{ item.zx_brief }}</p>
             <div>
-              <img src="@/assets/img/zhjy/img_3.png" alt="" />{{ item.zx_zrjs }}
+              <img :src="userMsg.user_avatar" alt="" />{{ item.zx_zrjs }}
             </div>
           </div>
         </div>
@@ -83,7 +83,7 @@
 </template>
 
 <script>
-import { grade_list, xtbk_list, subject_list, xtbk_delete } from "./api";
+import { grade_list, xtbk_list, subject_list, xtbk_delete,user_list } from "./api";
 
 export default {
   data() {
@@ -101,6 +101,7 @@ export default {
         grade: "",
         subject: "",
       },
+      userMsg:{}
     };
   },
   methods: {
@@ -138,6 +139,20 @@ export default {
         }
       });
     },
+    // 获取用户信息
+    getUser() {
+      let data = {
+        page: 1,
+        limit: "20",
+        keyword: "",
+        user_name: "",
+        user_role_id: "75",
+      };
+      user_list(data).then((res) => {
+        this.userMsg = res.data;
+      });
+    },
+    // 初始化
     initData() {
       let data = {
         page: this.page,
@@ -193,6 +208,7 @@ export default {
   // },
   mounted() {
     this.initData();
+    this.getUser();
     this.gradeListData();
     this.subjectListData();
     // const _this = this;

src/pages/zbkt/wlzb/detail.vue

@@ -533,7 +533,7 @@
             网络异常请稍后或点击页面刷新
           </div>
           <!-- <div class="prism-player" ></div> -->
-          <div class="slave">助教：{{ dgMsg.slave_teacher }}</div>
+          <div v-if="dgMsg.slave_teacher" class="slave">助教：{{ dgMsg.slave_teacher }}</div>
           <div class="watch">当前观看人数：{{ dgMsg.lll }}人</div>
         </div>
   

src/pages/zbkt/wlzb/index.vue

@@ -10,21 +10,32 @@ import {
   Histogram as IconHistogram,
   Search as IconSearch,
 } from "@element-plus/icons-vue";
-import { zbkt_list, zbkt_recommend, grade_list,team_list,zbdg_add } from "./api";
+import {
+  zbkt_list,
+  zbkt_recommend,
+  grade_list,
+  team_list,
+  zbdg_add,
+} from "./api";
 
 const https = ref(window.GLOBAL_CONFIG.api);
 
 const nj = ref([]);
-grade_list().then(res=>{
+grade_list().then((res) => {
   console.log(res);
-  nj.value = [{ n: '全部', v: undefined }].concat(res.data.page_data.map(({ grade_name, grade_id }) => ({ v: grade_id, n: grade_name })))
-})
+  nj.value = [{ n: "全部", v: undefined }].concat(
+    res.data.page_data.map(({ grade_name, grade_id }) => ({
+      v: grade_id,
+      n: grade_name,
+    }))
+  );
+});
 
 // const fc = ref([])
-team_list().then(res=>{
+team_list().then((res) => {
   console.log(res.data);
   // fc.value = [{ n: '全部', v: undefined }].concat(res.data.page_data.map(({ subject_name, grade_id }) => ({ v: grade_id, n: grade_name })))
-})
+});
 // const nj = [
 //   { n: "全部", v: null },
 //   { n: "幼儿园", v: "20" },
@@ -285,21 +296,20 @@ const queryForm = ref({
 
 // 直播课程添加
 let addData = {
-     kzkt_zbkc:{
-        kz_title:'测试',
-        kz_kcjj:'简介',
-        grade_id:1,
-        subject_id:1,
-        kz_master_teacher:'demo2',
-        kz_img:'',
-        kz_kss:'',
-
-    }
-}
-function addZb(){
-  zbdg_add(addData).then(res=>{
+  kzkt_zbkc: {
+    kz_title: "测试",
+    kz_kcjj: "简介",
+    grade_id: 1,
+    subject_id: 1,
+    kz_master_teacher: "demo2",
+    kz_img: "",
+    kz_kss: "",
+  },
+};
+function addZb() {
+  zbdg_add(addData).then((res) => {
     console.log(res);
-  })
+  });
 }
 
 let zbMsg = ref([]);
@@ -501,7 +511,7 @@ function hrefTo(href) {
           :key="i"
         >
           <div class="w-264px h-full flex-none zhiboImg">
-            <img :src="i.img" alt="" class="w-full h-full" />
+            <img :src="https + i.img" alt="" class="w-full h-full" />
           </div>
           <div class="p-2 pr-6 flex-auto flex flex-col">
             <div class="flex justify-between w-full items-center py-1">
@@ -526,9 +536,9 @@ function hrefTo(href) {
             </div>
 
             <div class="text-sm py-1 flex-auto">
-              <span>{{ i.nj }}</span>
+              <span>{{ i.grade_name }}</span>
               <span class="mx-2">|</span>
-              <span>{{ i.xk }}</span>
+              <span>{{ i.subject_name }}</span>
             </div>
 
             <div class="flex text-sm justify-between items-center">
@@ -583,7 +593,7 @@ function hrefTo(href) {
               @click="handleTjzbClick(i)"
             >
               <div class="w-full flex-none">
-                <img :src="i.img" alt="" class="w-full h-full" />
+                <img :src="https + i.img" alt="" class="w-full h-full" />
               </div>
               <div class="p-2">
                 {{ i.name }}
@@ -601,7 +611,7 @@ function hrefTo(href) {
               @click="handlePhbClick(i)"
             >
               <img
-                :src="i.img"
+                :src="https + i.img"
                 alt=""
                 class="w-full h-full overflow-hidden rounded-md"
               />
@@ -633,7 +643,7 @@ function hrefTo(href) {
             >
               <div class="w-110px flex-none relative">
                 <img
-                  :src="i.img"
+                  :src="https + i.img"
                   alt=""
                   class="w-full h-full rounded-sm overflow-hidden"
                 />
@@ -657,10 +667,10 @@ function hrefTo(href) {
               </div>
               <div class="px-1 leading-tight">
                 <p>{{ i.kcjj }}</p>
-                <span class="time">{{i.time}}</span>
+                <span class="time">{{ i.starttime }}</span>
               </div>
             </div>
-          </template>   
+          </template>
         </div>
       </div>
     </div>
@@ -671,11 +681,18 @@ function hrefTo(href) {
 .border_b {
   border-bottom: 1px solid #e4e6e8;
 }
-.zhiboImg{
-  img{
+.zhiboImg {
+  img {
     border-radius: 7.5px;
   }
 }
+.time {
+  height: 30px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #9d9ab9;
+  line-height: 30px;
+}
 .input {
   height: 50px;
   width: 500px;
@@ -696,10 +713,10 @@ function hrefTo(href) {
   min-height: 320px;
   max-height: 790px;
 }
-.index{
+.index {
   border-radius: 0 5px 0 0;
 }
-.tuijian{
+.tuijian {
   margin-right: 18px;
   // margin-bottom: 0;
 }