lex 2 years ago
parent
commit
b01a131b18

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

@@ -95,7 +95,7 @@ export default defineComponent({
         forms.currentGrade = detail.currentGrade
         forms.currentGradeTxt = grade ? grade.text : ''
         forms.currentClass = detail.currentClass
-        forms.currentClassTxt = cls.text
+        forms.currentClassTxt = cls ? cls.text : ''
         forms.registerSubjectId = detail.registerSubjectId
         forms.registerSubjectTxt = subjects ? subjects.text : ''
         forms.parentName = detail.parentName

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

@@ -179,7 +179,7 @@ export default defineComponent({
           if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
             // 默认关闭支付二维码弹窗
             // state.showQrcode = false
-            clearInterval(orderTimer)
+            clearInterval(state.orderTimer)
             // window.location.replace(
             //   window.location.origin + '/#/payment-result?orderNo=' + state.orderNo
             // )
@@ -189,7 +189,7 @@ export default defineComponent({
           }
         } catch {
           //
-          clearInterval(orderTimer)
+          clearInterval(state.orderTimer)
         }
       }, 5000)
     }

+ 5 - 1
src/views/courseware-record/index.tsx

@@ -422,7 +422,11 @@ export default defineComponent({
                       title: () => (
                         <div class={styles.userInfo}>
                           <p class={[styles.userName, 'van-ellipsis']}>{item.teacherName}</p>
-                          <p class={[styles.courseName, 'van-ellipsis']}>{courseEmnu[item.type]}</p>
+                          <p class={[styles.courseName, 'van-ellipsis']}>
+                            {['INSTRUMENTAL_ENSEMBLE', 'EUPHONIUM_SINGLE'].includes(item.type)
+                              ? courseEmnu[item.type]
+                              : courseEmnu[item.type] + '单技课'}
+                          </p>
                         </div>
                       ),
                       value: () => (

+ 3 - 1
src/views/exercise-record/index.tsx

@@ -54,7 +54,9 @@ export default defineComponent({
         const { endTime, startTime, ...re } = forms
         //
         const res = await request.post(
-          `${platformApi.value}/musicPracticeRecord/school/studentPracticeThisWeek`,
+          `${platformApi.value}/musicPracticeRecord/${
+            globalState.platformType === 'TEACHER' ? 'teacher' : 'school'
+          }/studentPracticeThisWeek`,
           {
             data: { ...re, endTime: endTime + ' 23:59:59', startTime: startTime + ' 00:00:00' }
           }

+ 9 - 1
src/views/exercise-record/modals/student-item.tsx

@@ -7,6 +7,7 @@ import phoneIcon from '@/school/images/phone-icon.png'
 import { postMessage } from '@/helpers/native-message'
 import { Icon, ActionSheet, showToast, Image, Cell } from 'vant'
 import { useRouter } from 'vue-router'
+import item from '@/student/coupons/item'
 const myForms = ref({}) as any
 export default defineComponent({
   props: ['item', 'forms'],
@@ -98,7 +99,14 @@ export default defineComponent({
                 </div>
                 <div class={styles.userItem}>
                   <p class={styles.topText}>
-                    <span>{props.item.trainingTime ? props.item.trainingTime : 0}</span>分钟
+                    <span
+                      style={{
+                        color: !props.item.standardFlag ? '#F44541' : '#333'
+                      }}
+                    >
+                      {props.item.trainingTime ? props.item.trainingTime : 0}
+                    </span>
+                    分钟
                   </p>
                   <p class={styles.bottomText}>练习时长</p>
                 </div>