lex пре 2 година
родитељ
комит
7981199e67

+ 4 - 4
src/school/orchestra/modal/add-information.tsx

@@ -26,7 +26,7 @@ export default defineComponent({
       title: null,
       linkUrl: '',
       linkType: 'OUT',
-      memo: null
+      summary: null
     })
     const onSubmit = async () => {
       if (!forms.coverImage) {
@@ -35,7 +35,7 @@ export default defineComponent({
       } else if (!forms.title) {
         showToast('请输入资讯标题')
         return
-      } else if (!forms.memo) {
+      } else if (!forms.summary) {
         showToast('请输入内容简介')
         return
       } else if (!forms.linkUrl) {
@@ -76,7 +76,7 @@ export default defineComponent({
         forms.coverImage = selectItem.coverImage
         forms.title = selectItem.title
         forms.linkUrl = selectItem.linkUrl
-        forms.memo = selectItem.memo
+        forms.summary = selectItem.summary
       }
     })
 
@@ -100,7 +100,7 @@ export default defineComponent({
           type="textarea"
           rows={2}
           class={styles.field}
-          v-model={forms.memo}
+          v-model={forms.summary}
         />
 
         <div class={styles.title}>

+ 1 - 1
src/school/orchestra/orchestra-information.tsx

@@ -174,7 +174,7 @@ export default defineComponent({
                     title: () => (
                       <div>
                         <div class={[styles.title, 'van-ellipsis']}>{item.title}</div>
-                        <div class={[styles.content, 'van-multi-ellipsis--l2']}>{item.memo}</div>
+                        <div class={[styles.content, 'van-multi-ellipsis--l2']}>{item.summary}</div>
                         <div
                           style={{
                             display: 'flex',

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

@@ -177,6 +177,8 @@ export default defineComponent({
           // console.log(data)
           if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
             clearInterval(orderTimer)
+            // 默认关闭支付二维码弹窗
+            state.showQrcode = false
             window.location.replace(
               window.location.origin +
                 '/orchestra-student/#/payment-result?orderNo=' +
@@ -282,7 +284,7 @@ export default defineComponent({
         return
       }
       const users = baseState.user.data
-
+      console.group(users)
       // 判断是否需要实名认证, 姓名,卡号
       if (!users?.account.realName || !users?.account.idCardNo) {
         state.authShow = true

+ 1 - 1
src/student/music-group/shop-address/index.tsx

@@ -3,9 +3,9 @@ import { defineComponent, onMounted, onUpdated, reactive } from 'vue'
 import styles from './index.module.less'
 import iconEdit from '../pre-apply/images/icon-edit.png'
 import OSticky from '@/components/o-sticky'
-import request from '../request-music'
 import OEmpty from '@/components/o-empty'
 import { useRouter } from 'vue-router'
+import request from '@/helpers/request'
 
 export default defineComponent({
   name: 'shop-address',

+ 1 - 0
src/views/information/help-center/index.module.less

@@ -34,6 +34,7 @@
       font-size: 12px;
       color: #777777;
       line-height: 17px;
+      word-break: break-all;
     }
     .time {
       padding-bottom: 5px;

+ 1 - 1
src/views/information/index.tsx

@@ -114,7 +114,7 @@ export default defineComponent({
                   title: () => (
                     <>
                       <div class={[styles.title, 'van-ellipsis']}>{item.title}</div>
-                      {/* <div class={[styles.content, 'van-multi-ellipsis--l2']}>{item.memo}</div> */}
+                      <div class={[styles.content, 'van-multi-ellipsis--l2']}>{item.memo}</div>
 
                       <div class={styles.time}>
                         {item.createTime ? dayjs(item.createTime).format('YYYY年MM月DD日') : ''}

+ 4 - 3
src/views/unit-test/examination-mode/index.tsx

@@ -213,6 +213,7 @@ export default defineComponent({
             examName: state.examDetail.unitExaminationName
           }
         }
+        onAfter()
         state.visiableResult = true
       } catch {
         //
@@ -270,7 +271,8 @@ export default defineComponent({
                     v-model:time={state.time}
                     format={'mm:ss'}
                     autoStart={false}
-                    onFinish={() => {
+                    onFinish={async () => {
+                      await onConfirmExam()
                       state.visiableExam = true
                     }}
                   />
@@ -404,13 +406,11 @@ export default defineComponent({
             cancelButtonText="我知道了"
             onClose={() => {
               state.visiableResult = false
-              onAfter()
               router.back()
               router.back()
             }}
             onConform={() => {
               state.visiableResult = false
-              onAfter()
               router.back()
               router.back()
             }}
@@ -433,6 +433,7 @@ export default defineComponent({
           message="考试已结束"
           messageAlign="center"
           onConfirm={async () => {
+            onAfter()
             state.visiableResult = true
           }}
         />

+ 1 - 1
src/views/unit-test/index.tsx

@@ -205,7 +205,7 @@ export default defineComponent({
                 <CellGroup inset class={styles.cellGroup} border={false}>
                   <Cell
                     center
-                    isLink
+                    // isLink
                     clickable={false}
                     titleStyle={{ flex: '1 auto' }}
                     valueClass={[

BIN
src/views/unit-test/model/unit-audio/images/icon-pause.png


BIN
src/views/unit-test/model/unit-audio/images/icon-play.png


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

@@ -36,6 +36,6 @@
   }
 
   .audioStatus {
-    font-size: 18px;
+    font-size: 14px;
   }
 }

+ 5 - 7
src/views/unit-test/model/unit-audio/index.tsx

@@ -3,6 +3,8 @@ import { defineComponent, onUnmounted, reactive, watch } from 'vue'
 import styles from './index.module.less'
 import { Howl } from 'howler'
 import iconAudio from './images/icon-audio.png'
+import iconPlay from './images/icon-play.png'
+import iconPause from './images/icon-pause.png'
 import { eventUnit } from '../../unit'
 
 // 音频播放
@@ -29,17 +31,12 @@ export default defineComponent({
       //   winner: [6000, 5000]
       // }
     })
-    console.log(htick)
+    // console.log(htick)
 
     htick.on('load', (val: any) => {
-      console.log('111')
       console.log(htick.duration())
       state.duration = Math.ceil(htick.duration())
     })
-    // 播放结束
-    // htick.on('end', () => {
-    //   console.log('1')
-    // })
 
     eventUnit.on('unitAudioStop', () => {
       htick.stop()
@@ -58,8 +55,9 @@ export default defineComponent({
           </div>
 
           {/* pause-circle */}
+          {/* 'play-circle' : 'pause-circle' */}
           <Icon
-            name={state.audioStatus === 'stopped' ? 'play-circle' : 'pause-circle'}
+            name={state.audioStatus === 'stopped' ? iconPause : iconPlay}
             class={styles.audioStatus}
             onClick={(e: any) => {
               e.stopPropagation()