Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online

src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue

@@ -35,7 +35,7 @@
       </div>
       <div class="musicListCon">
         <div class="queryFrom" :class="{ isExpandAct: !isExpand }">
-          <div v-show="queryData.sourceType === 2" class="queryFromList">
+          <div v-show="[1, 2].includes(queryData.sourceType)" class="queryFromList">
             <div class="tit">教程：</div>
             <div class="queryFromCon">
               <div
@@ -97,7 +97,7 @@
             </div>
           </div>
         </div>
-        <div v-show="queryData.sourceType === 2" @click="isExpand = !isExpand" class="isExpand" :class="{ active: isExpand }">
+        <div v-show="[1, 2].includes(queryData.sourceType)" @click="isExpand = !isExpand" class="isExpand" :class="{ active: isExpand }">
           <div>{{ isExpand ? "收起" : "展开" }}</div>
           <img src="./imgs/jiao.png" alt="" />
         </div>
@@ -278,7 +278,6 @@ function clearQueryData() {
   queryData.page = 1
   queryData.rows = 21
   queryData.total = 0
-  queryData.sourceType = 5
   queryData.name = ""
   queryData.bookVersionId = ""
   queryData.audioPlayTypes = ""
@@ -347,7 +346,7 @@ function handleGetQuery() {
       lessonCoursewareKnowledgeId: queryParams.lessonCoursewareKnowledgeId
     }
   }
-  if (sourceType === 2) {
+  if ([1, 2].includes(sourceType)) {
     if (audioPlayTypesParams[0] === "SING") {
       musicalInstrumentId = ""
     }

src/views/components/element/enjoyElement/resourcesList/resourcesList.vue

@@ -139,7 +139,7 @@
     </div>
     <Modal
       :contentStyle="{
-        width: previewData.type === 'IMG' ? '860px' : '800px',
+        width: previewData.type === 'IMG' ? '900px' : '800px',
         height: previewData.type === 'IMG' ? '700px' : '500px',
         boxShadow: '0px 2px 10px 0px rgba(0,0,0,0.08)',
         borderRadius: '12px',
@@ -219,7 +219,7 @@ const tabData =
     ? [
         {
           label: "共享资源",
-          value: 2
+          value: 1
         }
       ]
     : [
@@ -310,7 +310,6 @@ function clearQueryData() {
   queryData.page = 1
   queryData.rows = 20
   queryData.total = 0
-  queryData.sourceType = 5
   queryData.name = ""
   queryData.materialTagId = ""
   queryData.subject = {