skyblued 2 лет назад
Родитель
Сommit
d8308ac170

+ 8 - 5
src/subpages/colexiu/buttons/evaluating.tsx

@@ -79,7 +79,7 @@ const formatTimes = () => {
     const rate = runtime.speed / detailState.baseSpeed //1
     const start = difftime + (item.sourceRelativeTime || item.relativeTime) - starTime
     const end = difftime + (item.sourceRelaEndtime || item.relaEndtime) - starTime
-    console.log(start, end , starTime)
+    console.log(start, end, starTime)
     const isStaccato =
       typeof note.voiceEntry.isStaccato === 'function' ? note.voiceEntry.isStaccato() : note.voiceEntry.isStaccato
     const noteRate = isStaccato ? 0.5 : 1
@@ -102,7 +102,7 @@ const formatTimes = () => {
     if (note.noteElement.isRestFlag && !!note.stave && !!nextNote && nextNote.noteElement.isRestFlag) {
       skip = true
     }
-    if (note.measureOpenIndex != recordMeasure){
+    if (note.measureOpenIndex != recordMeasure) {
       measureIndex++
       recordMeasure = note.measureOpenIndex
     }
@@ -114,7 +114,7 @@ const formatTimes = () => {
       nextFrequency: formatPitch(item.noteElement?.pitch?.nextFrequency),
       prevFrequency: formatPitch(item.noteElement?.pitch?.prevFrequency),
       // 重复的情况index会自然累加,render的index是谱面渲染的index
-      measureIndex: measureIndex,//note.measureOpenIndex, 
+      measureIndex: measureIndex, //note.measureOpenIndex,
       measureRenderIndex: note.noteElement.sourceMeasure.measureListIndex,
       dontEvaluating: ListenMode || dontEvaluatingMode || item.skipMode,
       musicalNotesIndex: index, //item.i,
@@ -281,7 +281,7 @@ const timeupdate = () => {
     console.log('第一次播放时间', nowTime)
     // synced = true
     let time = runtime.audiosInstance?.audios[playUrl.value].currentTime
-    if (unitTestData.isSelectMeasureMode){
+    if (unitTestData.isSelectMeasureMode) {
       time = time - detailState.section[0].time
     }
     console.log('已播放时长: ', time * 1000)
@@ -553,7 +553,10 @@ export default defineComponent({
           <Transition name="finish">
             {startButtonShow.value && (
               <div
-                style={{ backgroundImage: `url(${iconEvaluatingStart})` }}
+                style={{
+                  backgroundImage: `url(${iconEvaluatingStart})`,
+                  'transform': detailState.isSpecialShapedScreen ? `translateX(${detailState.notchHeight / 4}px)`  : '',
+                }}
                 class={[styles.evaluatStartBtn]}
                 onClick={() => {
                   setPlayer()

+ 1 - 0
src/subpages/colexiu/buttons/index.module.less

@@ -50,6 +50,7 @@
     white-space: nowrap;
     font-size: 10px;
     color: #985131;
+    font-weight: bold;
   }
   .album {
     font-size: 6px;

+ 2 - 2
src/subpages/colexiu/popups/feedback/index.module.less

@@ -20,10 +20,10 @@
   height: 100%;
 }
 .btns {
-  flex: 1;
   display: flex;
   justify-content: center;
   align-items: center;
+  margin-top: 8px;
 }
 .sub {
   font-size: 6px;
@@ -61,12 +61,12 @@
   }
 }
 .text {
+  flex:1;
   background: #f8f8f8;
   font-size: 6px;
   padding: 4px 4px;
   border-radius: 3px;
   line-height: 1.2;
-  overflow-y: auto;
   textarea::-webkit-input-placeholder {
     color: #999;
   }

+ 1 - 1
src/subpages/colexiu/popups/feedback/index.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
             class={styles.text}
             placeholder="请详细描述您遇到的问题,以便我们尽快为您解决!"
             maxlength={200}
-            rows="2"
+            rows="3"
             autosize
             show-word-limit
             v-model={text.value}

+ 4 - 1
src/subpages/colexiu/popups/follow/index.tsx

@@ -215,7 +215,10 @@ export default defineComponent({
           <Transition name="start" duration={300}>
             {!data.start && (
               <Button
-                style={{ backgroundImage: `url(${iconFollwBtn})` }}
+                style={{
+                  backgroundImage: `url(${iconFollwBtn})`,
+                  marginLeft: detailState.isSpecialShapedScreen ? `${detailState.notchHeight / 4}px` : '',
+                }}
                 class={[styles.button, styles.start, styles.followBtn]}
                 onClick={() => handleStart()}
               ></Button>

+ 3 - 3
src/subpages/colexiu/popups/setting/index.module.less

@@ -138,8 +138,8 @@
   display: flex;
   justify-content: space-evenly;
   align-items: center;
-  padding: 2px 5px;
-  border-radius: 2px;
+  padding: 2px;
+  border-radius: 4px;
   background: var(--primary-color);
   margin-left: auto;
   :global {
@@ -152,7 +152,6 @@
       color: #fff;
       line-height: normal;
       white-space: nowrap;
-      padding: 2px 2px;
     }
     .van-radio {
       flex: 1;
@@ -160,6 +159,7 @@
       align-items: center;
       justify-content: center;
       border-radius: 2px;
+      padding: 1px;
     }
     .van-radio[aria-checked='true'] {
       background: #fff;