Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

src/api/course/courseWatchComment.js

@@ -70,6 +70,15 @@ export function exportCourseWatchComment(query) {
   })
 }
 
+// 导出公域看课评论
+export function exportPublicCourseWatchComment(query) {
+  return request({
+    url: '/course/userCourseComment/publicCourseVideoWatchComment/export',
+    method: 'get',
+    params: query
+  })
+}
+
 // 手动拉黑外部联系人
 export function addBlack(query) {
   return request({

src/api/course/userCourseVideo.js

@@ -119,6 +119,14 @@ export function getVideoListByCourseId(query) {
   })
 }
 
+export function getPublicVideoListByCourseId(query) {
+  return request({
+    url: '/course/userCourseVideo/getPublicVideoListByCourseId',
+    method: 'get',
+    params: query
+  })
+}
+
 export function sortCourseVideo(list) {
   return request({
     url: '/course/userCourseVideo/sortCourseVideo',

src/views/components/course/userCourseCatalogDetails.vue

@@ -151,7 +151,7 @@
         <el-form-item label="课程排序" prop="courseSort">
           <el-input-number v-model="form.courseSort" :min="1"></el-input-number>
         </el-form-item>
-        
+
 
         <el-form-item label="视频缩略图" prop="thumbnail">
           <el-upload v-model="form.thumbnail" class="avatar-uploader" :action="uploadUrl" :show-file-list="false"
@@ -624,6 +624,7 @@ import {
   getSort,
   getUserCourseVideo,
   getVideoListByCourseId,
+  getPublicVideoListByCourseId,
   getVideoListByCourseIdAll,
   sortCourseVideo,
   updates,
@@ -1025,7 +1026,8 @@ export default {
     },
     getList() {
       this.loading = true;
-      getVideoListByCourseId(this.queryParams).then(response => {
+      const api = this.usePublicVideoLibrary ? getPublicVideoListByCourseId : getVideoListByCourseId;
+      api(this.queryParams).then(response => {
         this.userCourseVideoList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/components/course/userCourseCatalogDetailsZM.vue

@@ -581,6 +581,7 @@ import {
   getSort,
   getUserCourseVideo,
   getVideoListByCourseId,
+  getPublicVideoListByCourseId,
   getVideoListByCourseIdAll,
   sortCourseVideo,
   updates,
@@ -601,6 +602,12 @@ import { getConfigByKey } from '@/api/system/config'
 export default {
   name: "userCourseCatalog",
   components: {VideoUpload, QuestionBank, CourseWatchComment, CourseProduct, draggable},
+  props: {
+    usePublicVideoLibrary: {
+      type: Boolean,
+      default: false
+    }
+  },
   watch:{
     // 深度监听 rules 数组的变化，以更新总权重
     "form.randomRedPacketRulesArr": {
@@ -1150,7 +1157,8 @@ export default {
     },
     getList() {
       this.loading = true;
-      getVideoListByCourseId(this.queryParams).then(response => {
+      const api = this.usePublicVideoLibrary ? getPublicVideoListByCourseId : getVideoListByCourseId;
+      api(this.queryParams).then(response => {
         this.userCourseVideoList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/course/publiccourse/courseWatchComment/index.vue

@@ -230,8 +230,8 @@
 </template>
 
 <script>
-import { listPublicCourseVideoWatchComment, delCourseWatchComment, exportCourseWatchComment, addBlack,clearBlack,updateBarrageStatus } from "@/api/course/courseWatchComment";
-import { delUserCourseComment,exportUserCourseComment } from "@/api/course/userCourseComment";
+import { listPublicCourseVideoWatchComment, delCourseWatchComment, exportCourseWatchComment, addBlack,clearBlack,updateBarrageStatus,exportPublicCourseWatchComment } from "@/api/course/courseWatchComment";
+import { delUserCourseComment } from "@/api/course/userCourseComment";
 import { addKeyword } from "@/api/system/keyword";
 
 export default {
@@ -498,7 +498,7 @@ export default {
         type: "warning"
       }).then(() => {
         this.exportLoading = true;
-        return exportUserCourseComment(queryParams);
+        return exportPublicCourseWatchComment(queryParams);
       }).then(response => {
         this.download(response.msg);
         this.exportLoading = false;

src/views/course/publiccourse/usercourse/index.vue

@@ -297,12 +297,12 @@
           </el-col>
         </el-row>
 
-        <el-form-item label="是否上架" prop="isShow" required>
-          <el-radio-group v-model="form.isShow">
-            <el-radio label="1">上架</el-radio>
-            <el-radio label="0">下架</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="是否上架" prop="isShow" required>-->
+<!--          <el-radio-group v-model="form.isShow">-->
+<!--            <el-radio label="1">上架</el-radio>-->
+<!--            <el-radio label="0">下架</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/course/publiccourse/videoResource/index.vue

@@ -829,7 +829,12 @@ import {
   batchAddVideoResource,
   batchUpdateVideoResource, listPublicVideoResource
 } from '@/api/course/videoResource'
-import {listUserCourseCategory,getPublicCatePidList,getPublicCateListByPid} from '@/api/course/userCourseCategory'
+import {
+  listUserCourseCategory,
+  getPublicCatePidList,
+  getPublicCateListByPid,
+  publicListUserCourseCategory
+} from '@/api/course/userCourseCategory'
 import {getByIds, listCourseQuestionBank} from '@/api/course/courseQuestionBank'
 import {getThumbnail} from "@/api/course/userVideo";
 import {uploadObject} from "@/utils/cos.js";
@@ -1230,7 +1235,7 @@ export default {
     },
     /** 查询视频分类列表 */
     getTypeList() {
-      listUserCourseCategory().then(response => {
+      publicListUserCourseCategory().then(response => {
         this.typeList = response.data;
       });
     },