lex 2 роки тому
батько
коміт
c1b96ab250

+ 2 - 2
src/components/o-search/index.module.less

@@ -45,7 +45,7 @@
   &.default {
     :global {
       .van-search__content {
-        background: #f3f3f3;
+        background: #f6f6f6 !important;
       }
     }
   }
@@ -53,7 +53,7 @@
   &.white {
     :global {
       .van-search__content {
-        background: #fff;
+        background: #fff !important;
       }
     }
   }

+ 2 - 2
src/constant/index.ts

@@ -126,9 +126,9 @@ export const orderStatus = {
   WAIT_PAY: '待支付',
   PAYING: '支付中',
   PAID: '已付款',
-  TIMEOUT: '订单超时',
+  TIMEOUT: '已关闭',
   FAIL: '支付失败',
-  CLOSED: '订单关闭',
+  CLOSED: '关闭',
   REFUNDING: '退款中',
   REFUNDED: '已退款'
 }

+ 1 - 1
src/student/music-group/pre-apply/component/order.tsx

@@ -205,7 +205,7 @@ export default defineComponent({
                         </Grid>
                         <div class={styles.orderPriceNum}>
                           <div class={styles.opNums}>
-                            <span>¥</span>
+                            <span>¥ </span>
                             {moneyFormat(item.currentPrice)}
                           </div>
                           <div class={styles.opBuyLength}>

+ 1 - 1
src/views/unit-test/examination-mode/index.module.less

@@ -16,7 +16,7 @@
   }
 
   .unitCount {
-    padding-top: 10px;
+    padding-top: 5px;
     display: flex;
     align-items: center;
     justify-content: space-between;

+ 0 - 1
src/views/unit-test/index.module.less

@@ -69,7 +69,6 @@
         flex-shrink: 0;
         font-family: 'DINA';
         font-size: 26px;
-        font-weight: bold;
         color: #f44541;
         line-height: 30px;
         i {

+ 2 - 3
src/views/unit-test/index.tsx

@@ -195,11 +195,10 @@ export default defineComponent({
             v-slots={{
               left: () => (
                 <div
-                  class={styles.searchBand}
-                  style={{ marginRight: '13px' }}
+                  class={['searchItem-left', form.oPopover ? 'searchItem-active' : '']}
                   onClick={() => (form.oPopover = true)}
                 >
-                  {form.statusText} <Icon name={form.oPopover ? 'arrow-up' : 'arrow-down'} />
+                  <span>{form.statusText}</span>
                 </div>
               )
             }}

+ 8 - 1
src/views/unit-test/model/anser-title/index.tsx

@@ -56,7 +56,14 @@ export default defineComponent({
       <>
         <div class={styles.unitSubjectTitle}>
           {props.index}、{props.name} <span class={styles.unitScore}>({props.score || 0}分)</span>
-          <Tag type="primary">{answerTypeName.value}</Tag>
+          <Tag
+            type="primary"
+            style={{
+              lineHeight: '20px'
+            }}
+          >
+            {answerTypeName.value}
+          </Tag>
         </div>
         {props.showRate && (
           <div class={styles.unitTitleRate}>

+ 1 - 1
src/views/unit-test/model/choice-question/index.module.less

@@ -37,7 +37,7 @@
       }
     }
     .valueAudio {
-      width: 170px;
+      width: 160px;
     }
   }
   .active {

+ 2 - 2
src/views/unit-test/model/keep-look-question/index.tsx

@@ -300,8 +300,8 @@ export default defineComponent({
      */
     const drawLine = (ctx: any, startPoint: any, endPoint: any) => {
       ctx.beginPath()
-      ctx.moveTo(Math.floor(startPoint.x) * state.dpr, Math.floor(startPoint.y) * state.dpr)
-      ctx.lineTo(Math.floor(endPoint.x) * state.dpr, Math.floor(endPoint.y) * state.dpr)
+      ctx.moveTo(Math.ceil(startPoint.x) * state.dpr, Math.ceil(startPoint.y) * state.dpr)
+      ctx.lineTo(Math.ceil(endPoint.x) * state.dpr, Math.ceil(endPoint.y) * state.dpr)
       ctx.lineWidth = 2 * state.dpr
       ctx.strokeStyle = '#FF8057'
 

+ 1 - 1
src/views/unit-test/model/play-question/index.module.less

@@ -11,7 +11,7 @@
 
 .unitAnswers {
   padding-top: 20px;
-  padding-bottom: 30px;
+  padding-bottom: 20px;
 }
 
 .playSection {

+ 1 - 1
src/views/unit-test/model/result-finish/index.module.less

@@ -63,7 +63,7 @@
   .finishRight {
     text-align: center;
     height: 50px;
-    line-height: 46px;
+    line-height: 44px;
     width: 100%;
     font-size: 18px;
     font-weight: 500;

+ 14 - 12
src/views/unit-test/model/unit-audio/index.tsx

@@ -52,7 +52,20 @@ export default defineComponent({
     })
     return () => (
       <div class={styles.unitAudio}>
-        <div class={styles.htmlAudio}>
+        <div
+          class={styles.htmlAudio}
+          onClick={(e: any) => {
+            e.stopPropagation()
+            if (state.audioStatus === 'stopped') {
+              eventUnit.emit('unitAudioStop')
+              htick.play()
+              state.audioStatus = 'paused'
+            } else if (state.audioStatus === 'paused') {
+              htick.pause()
+              state.audioStatus = 'stopped'
+            }
+          }}
+        >
           <div class={styles.htmlTimes}>
             <Icon class={styles.iconAudio} name={iconAudio} />
             <span>{state.duration}"</span>
@@ -63,17 +76,6 @@ export default defineComponent({
           <Icon
             name={state.audioStatus === 'stopped' ? iconPause : iconPlay}
             class={styles.audioStatus}
-            onClick={(e: any) => {
-              e.stopPropagation()
-              if (state.audioStatus === 'stopped') {
-                eventUnit.emit('unitAudioStop')
-                htick.play()
-                state.audioStatus = 'paused'
-              } else if (state.audioStatus === 'paused') {
-                htick.pause()
-                state.audioStatus = 'stopped'
-              }
-            }}
           />
         </div>
         {/* <audio controls class={styles.nativeAudio} id={state.id}>

+ 1 - 1
src/views/unit-test/unit-detail/index.module.less

@@ -16,7 +16,7 @@
   }
 
   .unitCount {
-    padding-top: 10px;
+    padding-top: 5px;
     display: flex;
     align-items: center;
     justify-content: space-between;