Merge branch 'hqyDev' of http://git.dayaedu.com/liushengqiang/classroom-app into jenkins-test

src/views/co-ai/index.tsx

@@ -370,6 +370,21 @@ export default defineComponent({
       }
     });
 
+    // 判断 值当前有没有图片
+    const isMusicImg = computed(() => {
+      const musicsData = data.musics[data.musicIndex]
+      if(data.showMusicImg === 'first' && musicsData?.musicFirstImg){
+        return true
+      }
+      if(data.showMusicImg === 'fixed' && musicsData?.musicJianImg){
+        return true
+      }
+      if(musicsData?.musicImg) {
+        return true
+      }
+      return false
+    })
+
     // 判断是否可转谱 - 为空也可以转谱
     const checkConverTible = (isConvertibleScore: any, scoreType: string) => {
       if (
@@ -922,7 +937,7 @@ export default defineComponent({
                   {data.musics[data.musicIndex]?.musicSheetName}
                 </div>
                 {/* ensembleDetail */}
-                {isEnsemble.value ? (
+                {(isEnsemble.value || !isMusicImg.value) ? (
                   <div class={styles.iframeSection}>
                     <>
                       {/* {loading.value && (
@@ -1026,7 +1041,7 @@ export default defineComponent({
                 </Popover>
               )}
 
-              {!isEnsemble.value && (
+              {(!isEnsemble.value && isMusicImg.value) && (
                 <img id="coai-2" src={icon_down} onClick={handleSave} />
               )}
               {data.musics[data.musicIndex]?.id && (

src/views/creation/index.module.less

@@ -7,7 +7,7 @@
   top: 0;
   left: 0;
   background: url("./images/bg.png") no-repeat;
-  background-size: cover;
+  background-size: 100% 100%;
 }
 .creation{
   :global{
@@ -309,8 +309,9 @@
     line-height: 20px;
     :global{
       .van-text-ellipsis__action{
-        color: #FFFFFF;
+        color: #5CCEFF;
         font-weight: 500;
+        margin-left: 2px;
       }
     }
   }
@@ -687,6 +688,12 @@
     .musicShareSection{
       min-height: calc(var(--creationHeight, 100vh) - var(--barheight) - 20vh - 340px - 55px);
     }
+    .wxpopup{
+      img{
+        width: 54%;
+        margin-right: 18px;
+      }
+    }
   }
 }
 
@@ -748,10 +755,11 @@
   left: 0;
   background: rgba(0, 0, 0, 0.5);
   z-index: 9999;
+  text-align: right;
 
   img {
     width: 88%;
-    margin: 0 6%;
+    margin-right: 6%;
   }
 }
 

src/views/download/index.module.less

@@ -35,13 +35,28 @@
   left: 0;
   background: rgba(0, 0, 0, 0.5);
   z-index: 9999;
+  text-align: right;
 
   img {
     width: 88%;
-    margin: 0 6%;
+    margin-right: 6%;
+  }
+}
+.creationTablet{
+  .wxpopup{
+    img{
+      width: 54%;
+      margin-right: 20px;
+    }
+  }
+  &.downloadContainer{
+    :global {
+      .van-image {
+        width: 60%;
+      }
+    }
   }
 }
-
 .downImg {
   // width: 275px;
   padding-top: 25px;

src/views/download/transfer.tsx

@@ -95,7 +95,7 @@ export default defineComponent({
   },
   render() {
     return (
-      <div class={[styles.downloadContainer]}>
+      <div class={[styles.downloadContainer, browser().isTablet ? styles.creationTablet : '']}>
         <Image src={student} />
 
         <div class={styles.buttonGroup}>