更改

src/school/orchestra/modal/teacher-list.tsx

@@ -46,6 +46,7 @@ export default defineComponent({
       params: {
         keyword: null,
         courseType: props.courseType,
+        subjectIdList: props.subjectIdList,
         page: 1,
         rows: 20
       }
@@ -101,9 +102,16 @@ export default defineComponent({
 
     // 声部变化时重新请求接口
     watch(
-      () => props.subjectId,
+      () => props.courseType,
       () => {
-        forms.params.subjectId = props.subjectId
+        forms.params.courseType = props.courseType
+        onSearch()
+      }
+    )
+    watch(
+      () => props.subjectIdList,
+      () => {
+        forms.params.subjectIdList = props.subjectIdList
         onSearch()
       }
     )

src/views/adapay/use-coupons/choice-coupon.tsx

@@ -1,8 +1,7 @@
-import ColResult from '@/components/col-result'
-import { useEventTracking } from '@/helpers/hooks'
+import OEmpty from '@/components/o-empty'
 import request from '@/helpers/request'
 import { state } from '@/state'
-import Item from '@/views/coupons/item'
+// import Item from '@/views/coupons/item'
 import { Button, Loading } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './index.module.less'
@@ -56,7 +55,6 @@ export default defineComponent({
     const canUsed = this.couponList.filter((list: any) => list.disabled)
     this.list = [...canUsable, ...canUsed]
     this.calcCoupon()
-    useEventTracking('优惠券')
   },
   methods: {
     // async getList() {
@@ -159,15 +157,12 @@ export default defineComponent({
               {this.list.length > 0 ? (
                 <>
                   {this.list.map((item: any) => (
-                    <Item item={item} isSelect onClick={this.onSelect} />
+                    // <Item item={item} isSelect onClick={this.onSelect} />
+                    <>1212</>
                   ))}
                 </>
               ) : (
-                <ColResult
-                  btnStatus={false}
-                  tips="暂无优惠券"
-                  classImgSize="SMALL"
-                />
+                <OEmpty btnStatus={false} tips="暂无优惠券" classImgSize="SMALL" />
               )}
             </>
           ) : (

src/views/adapay/userAuth/index.tsx

@@ -1,15 +1,13 @@
-import ColField from '@/components/col-field'
-import ColFieldGroup from '@/components/col-field-group'
-import ColHeader from '@/components/col-header'
 import request from '@/helpers/request'
 import { verifyIdCard } from '@/helpers/toolsValidate'
 import { postMessage } from '@/helpers/native-message'
 import { state } from '@/state'
-import { Button, CellGroup, Checkbox, Field, Form, Icon, Toast } from 'vant'
+import { Button, CellGroup, Checkbox, Field, Form, Icon, showToast, Toast } from 'vant'
 import { defineComponent } from 'vue'
 import activeButtonIcon from '@common/images/icon_checkbox.png'
 import inactiveButtonIcon from '@common/images/icon_checkbox_default.png'
 import styles from './index.module.less'
+import OHeader from '@/components/o-header'
 
 export default defineComponent({
   name: 'UserAuth',
@@ -49,7 +47,7 @@ export default defineComponent({
     async onSubmit() {
       try {
         if (!this.checked) {
-          Toast('请先阅读并同意《用户注册协议》')
+          showToast('请先阅读并同意《用户注册协议》')
           return
         }
         const url =
@@ -63,13 +61,15 @@ export default defineComponent({
             save: true
           }
         })
-        Toast('实名成功')
+        showToast('实名成功')
         state.user.data.realName = this.form.realName
         state.user.data.idCardNo = this.form.idCardNo
         setTimeout(() => {
           this.onSuccess()
         }, 500)
-      } catch {}
+      } catch {
+        //
+      }
     },
     getContractDetail() {
       // 查看协议
@@ -87,9 +87,9 @@ export default defineComponent({
   render() {
     return (
       <Form class={styles.userAuth} onSubmit={this.onSubmit}>
-        {!this.hideHeader && <ColHeader title="实名认证" />}
+        {!this.hideHeader && <OHeader title="实名认证" />}
 
-        <ColFieldGroup style={{ marginTop: '15px' }}>
+        {/* <CellGroup style={{ marginTop: '15px' }}>
           <ColField title="姓名" required>
             <Field
               name="lessonName"
@@ -114,7 +114,7 @@ export default defineComponent({
               placeholder="请输入身份证号"
             />
           </ColField>
-        </ColFieldGroup>
+        </CellGroup> */}
         <div class={styles.colProtocol}>
           {!this.exists && (
             <Checkbox