处理bug

public/project/preRegister.html

@@ -537,8 +537,9 @@
         },
         onConfirmSubject(options) {
           var stu = this.stu
-          stu.currentClass = options.selectedOptions[0].text
-          stu.currentClassNum = options.selectedOptions[0].value
+          stu.registerSubjectId = options.selectedOptions[0].text
+          stu.registerSubjectNum = options.selectedOptions[0].value
+
           this.subjectPicker = false
         }
       }

src/components/o-header/index.tsx

@@ -4,8 +4,6 @@ import { NavBar } from 'vant'
 import { defineComponent, PropType, Teleport } from 'vue'
 import styles from './index.module.less'
 
-type backIconColor = 'black' | 'white'
-
 export default defineComponent({
   name: 'o-header',
   props: {
@@ -16,7 +14,7 @@ export default defineComponent({
     },
     backIconColor: {
       // 返回按钮颜色
-      type: String as PropType<backIconColor>,
+      type: String as PropType<'black' | 'white'>,
       default: 'black'
     },
     isFixed: {
@@ -85,7 +83,7 @@ export default defineComponent({
       // 设置返回按钮颜色
       postMessage({
         api: 'backIconChange',
-        content: { iconStyle: 'black' as backIconColor }
+        content: { iconStyle: 'black' }
       })
     }
   },
@@ -160,12 +158,12 @@ export default defineComponent({
                 style={{
                   background: this.background,
                   color: this.color,
-                  paddingTop: `${this.navBarHeight}px`,
-                  zIndex: 99
+                  paddingTop: `${this.navBarHeight}px`
                 }}
                 left-arrow={this.isBack}
                 rightText={this.rightText}
                 fixed={this.isFixed}
+                zIndex={2000}
                 border={this.border}
                 onClick-right={() => this.clickRight()}
                 onClick-left={this.onClickLeft}

src/school/manage-teacher/index.tsx

@@ -347,7 +347,7 @@ export default defineComponent({
           actions={
             [
               { name: '全部', id: 'ALL' },
-              { name: '注销', id: 'CANCEL' },
+              // { name: '注销', id: 'CANCEL' },
               { name: '冻结', id: 'LOCKED' },
               { name: '正常', id: 'ACTIVATION' }
             ] as any

src/school/mass-message/create-message.tsx

@@ -488,7 +488,7 @@ export default defineComponent({
               const classList = val.class || []
               const studentList = val.student || []
               const teacherList = val.teacher || []
-              const manageList = val.manage || []
+              const schoolList = val.school || []
 
               const tempList: any = []
               classList.forEach((item: any) => {
@@ -515,7 +515,7 @@ export default defineComponent({
                   avatar: item.avatar
                 })
               })
-              manageList.forEach((item: any) => {
+              schoolList.forEach((item: any) => {
                 tempList.push({
                   receiveType: 'SCHOOL',
                   receiveId: item.id,
@@ -561,6 +561,7 @@ export default defineComponent({
               tempStudent.splice(sIndex, 1)
             }
             forms.selectList = selectList
+            console.log(forms.selectList, 'forms.selectList')
 
             const index = forms.receives.findIndex(
               (item: any) => item.receiveId === forms.delSelectItem.receiveId

src/school/mass-message/select-sned.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
         class: state.selectClass,
         student: state.selectStudent,
         teacher: state.selectTeacher,
-        manage: state.selectManage
+        school: state.selectManage
       }
       emit('close')
       emit('update:selectList', params)

src/student/member-center/index.tsx

@@ -236,7 +236,7 @@ export default defineComponent({
             <div class={styles['system-list']}>
               <div class={[styles['system-item'], styles.active]}>
                 <p class={[styles.title, 'van-hairline--bottom']}>
-                  {memberType[this.selectMember.cardType]}
+                  半年会员
                   <span>（6个月）</span>
                 </p>
                 <div class={styles.priceGroup}>
@@ -254,9 +254,7 @@ export default defineComponent({
 
           <div class={[styles.intro]}>
             <p>
-              酷乐秀会员可使用包括平台提供的所有训练乐谱，并专享“
-              <b>小酷Ai</b>
-              ”八大核心功能，孩子在家就能轻松完成乐器自主规范练习。
+              团练宝会员使用包括平台提供教材的所有训练乐谱，并专享“乐器练习云教练”八大核心功能，孩子在家就能轻松完成乐器自主规范练习。
             </p>
           </div>
 

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

@@ -320,7 +320,7 @@ export default defineComponent({
           />
         </Popup>
         {/* 班级 */}
-        <Popup v-model:show={state.classStatus} position="bottom" round>
+        <Popup v-model:show={state.classStatus} position="bottom" round duration={0}>
           <Picker
             showToolbar
             columns={state.classList}
@@ -334,7 +334,7 @@ export default defineComponent({
           />
         </Popup>
         {/* 声部 */}
-        <Popup v-model:show={state.subjectStatus} position="bottom" round>
+        <Popup v-model:show={state.subjectStatus} position="bottom" round duration={0}>
           <Picker
             showToolbar
             columns={state.subjectList}

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

@@ -404,7 +404,9 @@ export default defineComponent({
             {/* <i class={styles.codeClose} onClick={() => (state.showQrcode = false)}></i> */}
             <div class={styles.codeImg}>
               <div class={styles.codeContent}>
-                <h2 class={styles.codeTitle}>乐团报名</h2>
+                <h2 class={styles.codeTitle}>
+                  {orderType.value === 'VIP' ? '开通会员' : '乐团报名'}
+                </h2>
                 <div class={styles.codeName}>
                   请截图下方二维码 登录{state.pay_channel === 'wx_pub' ? '微信' : '支付宝'}
                   扫码支付

src/student/payment-result/index.tsx

@@ -11,6 +11,7 @@ import request from '@/helpers/request'
 import { useRoute } from 'vue-router'
 import { orderStatus } from '@/constant'
 import { browser, moneyFormat } from '@/helpers/utils'
+import { useEventListener, useWindowScroll } from '@vueuse/core'
 
 export default defineComponent({
   name: 'payment-result',
@@ -18,7 +19,9 @@ export default defineComponent({
     const route = useRoute()
     const state = reactive({
       orders: {} as any,
-      goodsInfos: [] as any
+      goodsInfos: [] as any,
+      backIconColor: 'white' as any,
+      background: 'transparent'
     })
     const getDetails = async () => {
       try {
@@ -68,11 +71,27 @@ export default defineComponent({
 
     onMounted(() => {
       getDetails()
+      useEventListener(document, 'scroll', () => {
+        const { y } = useWindowScroll()
+        if (y.value > 52) {
+          state.background = '#fff'
+          state.backIconColor = 'black'
+        } else {
+          state.background = 'transparent'
+          state.backIconColor = 'white'
+        }
+      })
     })
     return () => (
       <div class={styles.paymentResult}>
         <div class={styles.paymentTitle}>
-          {browser().isApp && <OHeader border={false} background="transparent" />}
+          {browser().isApp && (
+            <OHeader
+              border={false}
+              background={state.background}
+              backIconColor={state.backIconColor}
+            />
+          )}
 
           {state.orders.id && (
             <>
@@ -90,7 +109,7 @@ export default defineComponent({
 
         <CellGroup inset class={styles.cellGroup}>
           <Cell>
-            {{ title: () => '付款时间', value: () => <span>{state.orders.createTime}</span> }}
+            {{ title: () => '付款时间', value: () => <span>{state.orders.payTime || '--'}</span> }}
           </Cell>
           <Cell>
             {{ title: () => '订单编号', value: () => <span>{state.orders.orderNo}</span> }}