Merge branch 'feature-tianyong'

src/views/article-center/help-center-detail.module.less

@@ -43,6 +43,12 @@
     padding-top: 12px;
     margin-bottom: 10px;
   }
+  :global {
+    .van-nav-bar__title {
+      margin-top: 2px;
+      margin-left: 40px;
+    }
+  }
 }
 
 .titleInfo {

src/views/creation/edit/index.module.less

@@ -6,7 +6,7 @@
   position: relative;
   line-height: 0;
   overflow: visible !important;
-  margin-bottom: 24px !important;
+  margin-bottom: 12px !important;
 
   .videoBg {
     width: 100%;
@@ -212,4 +212,11 @@
   margin: 32px 24px 12px;
   font-weight: 500;
   font-size: 16px;
+  :global {
+    .van-button__content {
+      .van-button__text {
+        font-size: 16px;
+      }
+    }
+  }
 }

src/views/creation/edit/index.tsx

@@ -1,6 +1,6 @@
 import MHeader from '@/components/col-header'
 import MSticky from '@/components/col-sticky'
-import { defineComponent, onMounted, reactive } from 'vue'
+import { defineComponent, onMounted, reactive, onBeforeUnmount } from 'vue'
 import styles from './index.module.less'
 import { Button, Field } from 'vant'
 import MUploader from '@/components/col-upload'
@@ -66,8 +66,15 @@ export default defineComponent({
         }
       )
     }
-
+    // 设置导航栏颜色
+    function setStatusBarTextColor(isWhite: boolean) {
+      postMessage({
+        api: 'setStatusBarTextColor',
+        content: { statusBarTextColor: isWhite }
+      });
+    }
     onMounted(async () => {
+      setStatusBarTextColor(false);
       try {
         const { data } = await api_userMusicDetail(state.id)
         state.musicDetail = data
@@ -84,6 +91,9 @@ export default defineComponent({
         //
       }
     })
+    onBeforeUnmount(() => {
+      setStatusBarTextColor(true);
+    });
     return () => (
       <div class={isTablet ? styles.creationTablet : ''}>
         <MSticky position="top">

src/views/creation/index-share.tsx

@@ -21,6 +21,7 @@ import iconZanActive from './images/icon-zan-active.png'
 import logoImg from './images/logo.png';
 import logo1Img from './images/logo1.png';
 import backImg from "./images/back.png";
+import back1Img from "./images/back1.png";
 import videobg from "./images/videobg.png";
 import audioPan from './images/audio-pan.png';
 import audioLabel from './share-model/images/audioLabel.png';
@@ -38,7 +39,8 @@ import {
   getAuth,
   getGradeCh,
   getSecondRPM,
-  removeAuth
+  removeAuth,
+  setAuth
 } from '@/helpers/utils'
 import { postMessage, promisefiyPostMessage } from '@/helpers/native-message'
 import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
@@ -119,6 +121,10 @@ export default defineComponent({
     const {playStaff, pauseStaff, updateProgressStaff} = staffMoveInstance()
     // 点赞
     const onStarChange = async () => {
+      const Authorization = getAuth()
+      if (!Authorization && route.query.Authorization) {
+        setAuth(route.query.Authorization)
+      }
       await checkLogin();
       // 是否登录
       if (!state.loginTag) {
@@ -441,7 +447,7 @@ export default defineComponent({
     });
     // 初始化五线谱
     function initStaff(){
-      const src = `/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
+      const src = `https://test.colexiu.com/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
       // const src = `http://192.168.3.68:3000/instrument.html#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
       staffState.staffSrc = src
       window.addEventListener('message', (event) => {
@@ -629,7 +635,7 @@ export default defineComponent({
                 {
                   isLandscapeScreen.value &&
                     <div class={styles.backBox}>
-                      <img class={styles.backImg} src={backImg} onClick={handlerBack}/>
+                      <img class={styles.backImg} src={state.playType === 'Video' ? back1Img : backImg} onClick={handlerBack}/>
                       <div class={[styles.musicDetail, state.playType === 'Audio' && styles.adMusicDetail]}>
                         <div class={styles.musicSheetName}>
                             <NoticeBar

src/views/creation/index.module.less

@@ -502,6 +502,10 @@
     .van-empty__description {
       color: #fff;
     }
+    .van-cell {
+      padding-left: 0;
+      padding-right: 0;
+    }
   }
 }
 
@@ -681,7 +685,7 @@
   padding: 0;
   margin-top: 25px;
   &:first-child{
-    margin-top: 20px;
+    margin-top: 15px;
   }
   &.likeShareItemLast{
     padding-bottom: 20px;
@@ -725,7 +729,7 @@
     .usernameCon{
       display: flex;
       align-items: center;
-      margin-top: 6px;
+      margin-top: 4px;
       .likeNum{
         display: flex;
         align-items: center;
@@ -750,7 +754,7 @@
         font-weight: 400;
         font-size: 13px;
         color: #DEDEDE;
-        line-height: 13px;
+        //line-height: 13px;
       }
     }
   }

src/views/creation/index.tsx

@@ -424,7 +424,7 @@ export default defineComponent({
     }
     // 初始化五线谱
     function initStaff(){
-      const src = `/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
+      const src = `https://test.colexiu.com/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
       // const src = `http://192.168.3.68:3000/instrument.html#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
       staffState.staffSrc = src
       window.addEventListener('message', (event) => {

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

@@ -70,7 +70,7 @@
     }
     .imgLabel{
       position: absolute;
-      right: 0;
+      right: -1px;
       top: 0;
       width: 28px;
       height: 14px;
@@ -179,9 +179,14 @@
     position: absolute;
     top: 12px;
     right: 12px;
-    font-size: 16px;
+    font-size: 20px;
     color: #999999;
   }
+  :global {
+    .van-grid {
+      justify-content: space-around;
+    }
+  }
 }
 
 .share__header {