update

packages/qjkankan-editor/src/components/materialListInMaterialSelector.vue

@@ -259,9 +259,9 @@
           v-show="isRequestingMoreData"
           :isDarkTheme="isDarkTheme"
         />
-        <div class="no-more-data" v-show="!hasMoreData">
+        <!-- <div class="no-more-data" v-show="!hasMoreData">
           - {{$i18n.t('gather.no_more_data')}} -
-        </div>
+        </div> -->
       </div>
       <!-- 无数据时的提示 -->
       <div v-show="!(listLocalLength !== 0 || hasMoreData)" class="no-data">

packages/qjkankan-editor/src/views/base/Toolbar.vue

@@ -148,13 +148,14 @@ export default {
       tabs: [
         "开场提示",
         "开场动画",
+        "开场封面",
         "访问密码",
         "自动巡游",
         "背景音乐",
         "自定义LOGO",
         "自定义遮罩",
         "自定义按钮",
-        "开场封面",
+       
       ],
       activeTab: "开场提示",
       jianjieLength: 0,

packages/qjkankan-editor/src/views/base/coverBase.vue

@@ -75,15 +75,18 @@ pc端视频位置 videoPcLoc
     </i>
     <br />
     <div class="switch-wrapper">
-      <span class="label">{{$i18n.t('edit_settings.cover_show')}}</span>
-      <Switcher :value="info.coverInfo.isShowCover" @change="onSwitcherChange"></Switcher>
+      <span class="label">{{ $i18n.t("edit_settings.cover_show") }}</span>
+      <Switcher
+        :value="info.coverInfo.isShowCover"
+        @change="onSwitcherChange"
+      ></Switcher>
     </div>
     <div class="cover_pull">
       <!-- 封面类型选择下拉框 -->
       <div class="cover_pull_tit">{{ cover_pull_tit }}</div>
       <Select v-model="info.coverInfo.coverSelect">
         <Option
-          v-for="item in selecList"
+          v-for="item in selectList"
           :key="item.type"
           :label="item.txt"
           :value="item.type"
@@ -503,13 +506,13 @@ export default {
       upType: "",
       upTypeSta: "",
 
-      selecList: [
+      selectList: [
+        { txt: i18n.t("edit_settings.coverSelecImg"), type: "img" },
+        { txt: i18n.t("edit_settings.coverSelecVideo"), type: "video" },
         {
           txt: i18n.t("edit_settings.coverSelecVideoAndImg"),
           type: "videoAndImg",
         },
-        { txt: i18n.t("edit_settings.coverSelecImg"), type: "img" },
-        { txt: i18n.t("edit_settings.coverSelecVideo"), type: "video" },
       ],
 
       coverInfo: {
@@ -526,18 +529,18 @@ export default {
 
         // 有关上传视频
         // 视频pc端地址
-        videoPc:'',
+        videoPc: "",
         // 视频pc端位置
         videoPcLoc: "center",
         // 视频pc端图片
-        videoPcIcon:'',
+        videoPcIcon: "",
 
         // 视频移动端地址
-        videoMo:'',
+        videoMo: "",
         // 视频移动端位置
         videoMoLoc: "center",
         // 视频移动端图片
-        videoMoIcon:'',
+        videoMoIcon: "",
 
         // 视频的背景设置
         coverVideoBac: "colorFill",
@@ -548,7 +551,7 @@ export default {
         coverVideoControl: 0,
         // 视频的出现顺序
         coverVideoOrder: "before",
-        isShowCover: 0
+        isShowCover: 0,
       },
       coverImgBacList: [
         { txt: i18n.t("edit_settings.coverImgBacSelec1"), type: "colorFill" },
@@ -584,8 +587,8 @@ export default {
   methods: {
     //是否显示
     onSwitcherChange(data) {
-      console.log(data,'dadad');
-      this.info.coverInfo.isShowCover = data
+      console.log(data, "dadad");
+      this.info.coverInfo.isShowCover = data;
     },
     // 视频的进入方式
     coverVideoInWayChange(val) {
@@ -611,23 +614,22 @@ export default {
         else this.info.coverInfo.coverBac = selected[0].icon;
       } else {
         // 视频上传
-        if (this.selectingFor === "pc"){
-          console.log(selected[0],'selected[0]');
+        if (this.selectingFor === "pc") {
+          console.log(selected[0], "selected[0]");
           this.info.coverInfo.videoPc = selected[0].ossPath;
           this.info.coverInfo.videoPcIcon = selected[0].icon;
-        }
-
-        else if (this.selectingFor === "mobile"){
+        } else if (this.selectingFor === "mobile") {
           this.info.coverInfo.videoMo = selected[0].ossPath;
           this.info.coverInfo.videoMoIcon = selected[0].icon;
-        }
-        else this.info.coverInfo.videoBacImg = selected[0].icon;
+        } else this.info.coverInfo.videoBacImg = selected[0].icon;
       }
       this.isShowSelectionWindow = false;
     },
     onCancelPcTip() {
-      this.info.coverInfo.coverPc = "";
-      console.log('onCancelPcTip');
+      this.$nextTick(() => {
+        this.info.coverInfo.coverPc = "";
+        console.log("onCancelPcTip-1");
+      });
     },
     onCancelAppTip() {
       this.info.coverInfo.coverMo = "";
@@ -671,7 +673,7 @@ export default {
   activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
 .coverBase {
   padding: 24px 30px;
   background: #252526;
@@ -867,4 +869,4 @@ export default {
     }
   }
 }
-</style>
+</style>