skyblued 2 years ago
parent
commit
feddeb455e

+ 2 - 3
src/components/tick/index.module.less

@@ -6,12 +6,11 @@
   height: 10PX;
   border-radius: 100%;
   &.active{
-    background-color: #01C1B5;
+    background-color: var(--van-primary-color);
   }
   &.first{
-    // background-color: #666666;
     &.active{
-      background-color: #FF9941!important;
+      // background-color: #fff!important;
     }
   }
 }

+ 38 - 22
src/pages/detail/tick-popup/index.tsx

@@ -10,30 +10,46 @@ export default defineComponent({
   props: {
     show: {
       type: Boolean,
-      default: false
+      default: false,
     },
     score: {
-      default: ''
-    }
+      default: '',
+    },
+  },
+  methods: {
+    sendMessage: () => {
+      window.parent.postMessage(
+        {
+          api: 'headerTogge',
+          playState: runtime.playState,
+          show: true
+        },
+        '*'
+      )
+    },
   },
   render() {
-    return (
-      (this.score && runtime.osmd) || this.show? (
-        <Popup
-          show={state.activeTick > -1}
-          closeable
-          close-icon-position="bottom-right"
-          onClickCloseIcon={RunTimeUtils.stopTick}
-          style={{
-            width: '100%',
-            height: '100%',
-            display: 'flex',
-            background: 'transparent',
-          }}
-        >
-          <Tick dots={(runtime as any)?.osmd?.numerator || getDuration((runtime as any).osmd).numerator || 0} repeat={state.activeTickRepeat}/>
-        </Popup>
-      ) : null
-    )
-  }
+    return (this.score && runtime.osmd) || this.show ? (
+      <Popup
+        show={state.activeTick > -1}
+        closeable
+        close-icon-position="bottom-right"
+        onClickCloseIcon={() => {
+          RunTimeUtils.stopTick()
+          this.sendMessage()
+        }}
+        style={{
+          width: '100%',
+          height: '100%',
+          display: 'flex',
+          background: 'transparent',
+        }}
+      >
+        <Tick
+          dots={(runtime as any)?.osmd?.numerator || getDuration((runtime as any).osmd).numerator || 0}
+          repeat={state.activeTickRepeat}
+        />
+      </Popup>
+    ) : null
+  },
 })

File diff suppressed because it is too large
+ 3 - 3
src/subpages/colexiu/buttons/icons/section1.svg


+ 11 - 11
src/subpages/colexiu/buttons/index.module.less

@@ -196,13 +196,13 @@
   .label {
     position: absolute;
     font-size: 4px;
+    padding: 0 2px;
     color: var(--primary-color);
-    line-height: 7px;
     background: #ffe8b1;
-    border-radius: 5px;
-    border: 1px solid #ffffff;
-    right: -4px;
-    top: -1px;
+    border-radius: 10px;
+    border: .5px solid #ffffff;
+    right: 0;
+    top: 0;
   }
 }
 
@@ -366,17 +366,17 @@
       border-radius: 8px;
     }
     .van-popover__action {
-      width: 130px;
-      height: 40px;
-      padding: 0 14px;
+      width: 60px;
+      height: 20px;
+      padding: 0 6px;
       & > img {
-        width: 38px;
-        margin-right: 16px;
+        width: 14px;
+        margin-right: 8px;
       }
     }
     .action-text {
       flex: 1;
-      font-size: 14px;
+      font-size: 5px;
       text-align: justify;
       text-align-last: justify;
       text-justify: distribute-all-lines; // 这行必加,兼容ie浏览器

+ 1 - 1
src/subpages/colexiu/buttons/player.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
       window.parent.postMessage(
         {
           api: 'headerTogge',
-          playState: runtime.playState,
+          playState: runtime.playState
         },
         '*'
       )

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

@@ -1,6 +1,6 @@
 .feedback {
   width: 180px;
-  height: 145px;
+  height: 160px;
   overflow: hidden;
   border-radius: 5px;
 }
@@ -43,7 +43,6 @@
     }
     .van-radio[aria-checked='true'] {
       border-color: var(--primary-color);
-      background: #e2fff9;
       .van-radio__label {
         color: var(--primary-color);
       }
@@ -56,7 +55,6 @@
   padding: 4px 4px;
   border-radius: 3px;
   line-height: 1.2;
-  height: 33px;
   overflow-y: auto;
   textarea::-webkit-input-placeholder{
     color: #999;

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

@@ -58,14 +58,14 @@ export default defineComponent({
             class={styles.text}
             placeholder="请详细描述您遇到的问题,以便我们尽快为您解决!"
             maxlength={200}
-            rows="2"
+            rows="4"
             autosize
             show-word-limit
             v-model={text.value}
           />
           <div style={{ display: 'flex', justifyContent: 'center' }}>
-            <Button onClick={submit} class={styles.submit}>
-              <img style={{width: '100%'}} src={bgSubmit} alt="提交" />
+            <Button type="primary" round onClick={submit} class={styles.submit}>
+              提交反馈
             </Button>
           </div>
         </div>

+ 1 - 0
src/subpages/colexiu/popups/sound-effect/index.module.less

@@ -117,6 +117,7 @@
 .des {
   font-size: 6px;
   color: #dde6f9;
+  margin-top: 14px;
 }
 .lampWrap {
   display: flex;

Some files were not shown because too many files changed in this diff