Merge branch 'feature-tianyong' into dev

src/views/creation/index-share.tsx

@@ -89,7 +89,7 @@ export default defineComponent({
       },
       params: {
         page: 1,
-        rows: 20
+        rows: 4
       },
       messageStatus: false,
       message: '' as any,
@@ -418,9 +418,14 @@ export default defineComponent({
       if(weixin){
         wxStatus.value = true
       }else{
-        router.push({
-          path:"/transfer"
-        })
+        // 如果是老师端
+        if (window.location.pathname.includes('teacher')) {
+          window.location.href = location.origin + '/student' + '/#/transfer'
+        } else {
+          router.push({
+            path:"/transfer"
+          })
+        }
       }
     }
 
@@ -714,11 +719,13 @@ export default defineComponent({
             <div class={[styles.musicSection, styles.musicShareSection]}>
               <div class={styles.avatarInfoBox}>
                 <div class={styles.avatar}>
-                  <Image class={[styles.userLogo, state.musicDetail.vipType === 'VIP' ? styles.vipLogo : state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP' ? styles.svipLogo : '']} src={state.musicDetail.avatar} />
-                  {
-                    (state.musicDetail.vipType === 'VIP' || state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP') &&
-                    <img class={styles.vipIcon} src={state.musicDetail.vipType === 'VIP' ? vipIcon : svipIcon} />
-                  }
+                  <div class={styles.avatarImg}>
+                    <img class={[styles.userLogo, state.musicDetail.vipType === 'VIP' ? styles.vipLogo : state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP' ? styles.svipLogo : '']} src={state.musicDetail.avatar} />
+                    {
+                      (state.musicDetail.vipType === 'VIP' || state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP') &&
+                      <img class={styles.vipIcon} src={state.musicDetail.vipType === 'VIP' ? vipIcon : svipIcon} />
+                    }                
+                  </div>
                   <div class={styles.infoCon}>
                     <div class={styles.info}>
                       <span class={styles.userName}>{state.musicDetail?.username}</span>

src/views/creation/index.module.less

@@ -333,7 +333,9 @@
     .avatar{
       display: flex;
       align-items: center;
-      position: relative;
+      .avatarImg {
+        position: relative;
+      }
       .userLogo{
         width: 44px;
         height: 44px;
@@ -350,7 +352,7 @@
       }
       .vipIcon {
         position: absolute;
-        bottom: -8px;
+        bottom: -6px;
         left: 2px;
         z-index: 1;
         width: 40px;

src/views/creation/index.tsx

@@ -674,11 +674,13 @@ export default defineComponent({
         <div class={styles.musicSection}>
           <div class={styles.avatarInfoBox}>
             <div class={styles.avatar}>
-              <Image class={[styles.userLogo, state.musicDetail.vipType === 'VIP' ? styles.vipLogo : state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP' ? styles.svipLogo : '']} src={state.musicDetail.avatar} />
-              {
-                (state.musicDetail.vipType === 'VIP' || state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP') &&
-                <img class={styles.vipIcon} src={state.musicDetail.vipType === 'VIP' ? vipIcon : svipIcon} />
-              }
+              <div class={styles.avatarImg}>
+                <img class={[styles.userLogo, state.musicDetail.vipType === 'VIP' ? styles.vipLogo : state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP' ? styles.svipLogo : '']} src={state.musicDetail.avatar} />
+                {
+                  (state.musicDetail.vipType === 'VIP' || state.musicDetail.vipType === 'PERMANENT_SVIP' || state.musicDetail.vipType === 'SVIP') &&
+                  <img class={styles.vipIcon} src={state.musicDetail.vipType === 'VIP' ? vipIcon : svipIcon} />
+                }                
+              </div>
               <div class={styles.infoCon}>
                 <div class={styles.info}>
                   <span class={styles.userName}>{state.musicDetail?.username}</span>
@@ -802,6 +804,7 @@ export default defineComponent({
           style={{ background: 'transparent' }}
         >
           <ShareModel
+            playType={state.playType}
             musicDetail={state.musicDetail}
             onClose={() => (state.shareStatus = false)}
           />

src/views/creation/share-model/index.module.less

@@ -68,7 +68,14 @@
       width: 56px;
       height: 56px;
     }
-
+    .imgLabel{
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 28px;
+      height: 14px;
+      z-index: 10;
+    }
 
   }
 
@@ -135,7 +142,11 @@
     margin-left: 10px;
     padding-left: 9px;
     border-left: 1px dashed #D8D8D8;
-
+    font-weight: 500;
+    font-size: 12px;
+    color: #01C1B5;
+    line-height: 18px;
+    padding-top: 5px;
     .tip {
       font-size: 12px;
       color: #777777;
@@ -145,7 +156,7 @@
     .iconLogo {
       width: 68px;
       height: 21px;
-      margin: 12px 0 4px;
+      margin: 5px 0 0;
     }
 
     .downTip {

src/views/creation/share-model/index.tsx

@@ -11,6 +11,8 @@ import shareBg from './images/share-bg.png'
 import audioPan from '../images/audio-pan.png'
 import smallLogo from '@common/images/icon_logo.png'
 import musicBg from './images/music-bg.png'
+import audioLabel from './images/audioLabel.png';
+import videoLabel from './images/videoLabel.png';
 import QRCode from 'qrcode'
 import { promisefiyPostMessage } from '@/helpers/native-message'
 import html2canvas from 'html2canvas'
@@ -21,6 +23,10 @@ export default defineComponent({
     musicDetail: {
       type: Object,
       default: () => {}
+    },
+    playType:{
+      type: String,
+      default: ''
     }
   },
   emits: ['close'],
@@ -205,6 +211,7 @@ export default defineComponent({
                 class={styles.muploader}
                 crossorigin="anonymous"
               />
+              <img class={styles.imgLabel} src={props.playType === "Audio" ? audioLabel : videoLabel} />
             </div>
             <div class={styles.musicDetail}>
               <p class={[styles.musicName, 'van-ellipsis']}>
@@ -222,8 +229,9 @@ export default defineComponent({
               <img src={smallLogo} class={styles.qrcodeLogo} />
             </div>
             <div class={styles.qrtips}>
+              <div>温馨提示：</div>
               <p class={styles.tip}>
-                温馨提示：保存图片到相册或长按识别二维码进入查看喔～
+                保存图片到相册或长按识别二维码进入查看喔～
               </p>
               <img src={iconLogo} class={styles.iconLogo} />
               {/* <p class={styles.downTip}>扫码下载音乐数字课堂App</p> */}

src/views/creation/text-ellipsis/index.tsx

@@ -92,7 +92,7 @@ export default defineComponent({
             <div ref="ellipsisDom" class={[styles.ellipsis, !this.ellipsisData.computedReady && styles.vis]} key={this.ellipsisData.key}>
                 <span ref="textDom">{ this.text }</span>
                 {this.ellipsisData.oversize && !this.ellipsisData.expanded && <span>...</span>}
-                {this.ellipsisData.oversize && <span class="ellipsisAct" onClick={this.handleExpand}>{ this.ellipsisData.expanded ? "收起" : "展开" }</span>}
+                {this.ellipsisData.oversize && <span class={styles.ellipsisAct} onClick={this.handleExpand}>{ this.ellipsisData.expanded ? "收起" : "展开" }</span>}
             </div>
         )
     }