更新

public/project/css/companionTeacher.css

@@ -158,6 +158,7 @@ span {
   margin: 0 auto;
   min-height: 100vh;
   overflow: hidden;
+  position: relative;
 }
 
 .banner,

public/project/css/initiation.css

@@ -15,6 +15,7 @@ span {
   margin: 0 auto;
   min-height: 100vh;
   overflow: hidden;
+  position: relative;
 }
 
 .banner,

public/project/css/manageTeacher.css

@@ -158,6 +158,7 @@ span {
   margin: 0 auto;
   min-height: 100vh;
   overflow: hidden;
+  position: relative;
 }
 
 .banner,

public/project/css/preRegister.css

@@ -15,6 +15,7 @@ span {
   margin: 0 auto;
   min-height: 100vh;
   overflow: hidden;
+  position: relative;
 }
 
 .banner,

public/project/css/schoolRegister.css

@@ -158,6 +158,7 @@ span {
   margin: 0 auto;
   min-height: 100vh;
   overflow: hidden;
+  position: relative;
 }
 
 .banner,

public/project/schoolRegister.html

@@ -136,7 +136,7 @@
 
     <van-popup v-model:show="showPicker" position="bottom" round>
       <van-picker show-toolbar :columns="columns" @cancel="showPicker = false" @confirm="onConfirm"
-        :columns-field-names="{ text: 'name', value: 'code', children: 'areas' }" />
+        :columns-field-names="{ text: 'name', value: 'code' }" />
     </van-popup>
 
     <van-popup v-model:show="submitStatus" round style="width: 75%" :close-on-click-overlay="false">
@@ -155,7 +155,7 @@
   <!-- <script src="https://cdn.jsdelivr.net/npm/umi-request@1.4.0/dist/index.min.js"></script> -->
   <script src="./js/axios.js"></script>
   <script type="text/javascript" src="./js/utils.js"></script>
-  <script type="text/javascript" src="./js/area.js"></script>
+  <!-- <script type="text/javascript" src="./js/area.js"></script> -->
   <script>
     // 乐团交付，乐团停止或关闭，有新的交付团；则不允许报名
     var classList = []
@@ -196,25 +196,30 @@
         }
         try {
           this.setLoading(true)
-          console.log(areas)
-          const tempareas = []
-          areas.forEach(item => {
-            const temp = {
-              name: item.name,
-              code: item.code,
-              areas: []
-            }
-            if (item.areas && item.areas.length > 0) {
-              item.areas.forEach(child => {
-                temp.areas.push({
-                  name: child.name,
-                  code: child.code,
-                })
-              })
-            }
-            tempareas.push(temp)
-          })
-          this.columns = tempareas || []
+          // console.log(areas)
+          // const tempareas = []
+          // areas.forEach(item => {
+          //   const temp = {
+          //     name: item.name,
+          //     code: item.code,
+          //     areas: []
+          //   }
+          //   if (item.areas && item.areas.length > 0) {
+          //     item.areas.forEach(child => {
+          //       temp.areas.push({
+          //         name: child.name,
+          //         code: child.code,
+          //       })
+          //     })
+          //   }
+          //   tempareas.push(temp)
+          // })
+          // this.columns = tempareas || []
+
+          var res = await axios.get('/api-school/open/school/city')
+          if (res.data.code === 200) {
+            this.columns = res.data.data || []
+          }
         } catch {
           vant.showDialog({
             message: '信息获取失败，请联系老师',

src/school/companion-teacher/companion-detail.tsx

@@ -248,7 +248,7 @@ export default defineComponent({
                     postMessage({
                       api: 'callPhone',
                       content: {
-                        id: state.detail.phone
+                        phone: state.detail.phone
                       }
                     })
                     state.showMessage = false

src/school/companion-teacher/index.tsx

@@ -356,7 +356,7 @@ export default defineComponent({
                     postMessage({
                       api: 'callPhone',
                       content: {
-                        id: form.selectItem.phone
+                        phone: form.selectItem.phone
                       }
                     })
                     form.showMessage = false

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

@@ -73,7 +73,6 @@ export default defineComponent({
         )
         const detail = data || {}
 
-        console.log(detail, 'detail')
         state.detail = detail
 
         const grade: any = state.currentGrade.find((item: any) => item.value == detail.currentGrade)
@@ -109,7 +108,6 @@ export default defineComponent({
             }
           }
         )
-        console.log(subjects, 'subject')
         const rows = subjects.data.rows || []
         rows.forEach((item: any) => {
           state.subjectList.push({
@@ -185,6 +183,14 @@ export default defineComponent({
               v-model={forms.username}
               maxlength={15}
               rules={[{ validator, message }]}
+              // onBlur={() => {
+              //   setTimeout(function () {
+              //     const scrollHeight =
+              //       document.documentElement.scrollTop || document.body.scrollTop || 0
+
+              //     window.scrollTo(0, Math.max(scrollHeight - 1, 0))
+              //   }, 100)
+              // }}
             />
             <Field
               required
@@ -278,6 +284,7 @@ export default defineComponent({
               placeholder="请输入手机号"
               v-model={forms.phone}
               maxlength={11}
+              type="tel"
               rules={[{ pattern: state.pattern, message: '输入监护人手机号码有误' }]}
             />
           </CellGroup>
@@ -290,7 +297,14 @@ export default defineComponent({
         </Form>
 
         {/* 年级 */}
-        <Popup v-model:show={state.gradeStatus} position="bottom" round>
+        <Popup
+          v-model:show={state.gradeStatus}
+          position="bottom"
+          round
+          safeAreaInsetBottom
+          // duration={0}
+          lazyRender={false}
+        >
           <Picker
             showToolbar
             columns={state.currentGrade}

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

@@ -118,18 +118,33 @@ export default defineComponent({
         }
 
         const refundReason = form.resionList.find((item: any) => item.value === form.checked)
-
+        console.log({
+          merOrderNo: form.refundSelect.orderNo,
+          refundReason: refundReason.text
+        })
+        // return
         await request.post('/api-student/userPaymentOrder/refundPayment', {
           data: {
             merOrderNo: form.refundSelect.orderNo,
             refundReason: refundReason.text
           }
         })
+        form.refundStatus = false
+        onSearch()
       } catch {
         //
       }
     }
 
+    const onSearch = () => {
+      form.params.page = 1
+      form.list = []
+      form.listState.dataShow = true // 判断是否有数据
+      form.listState.loading = false
+      form.listState.finished = false
+      getList()
+    }
+
     onMounted(() => {
       getDefaultParams()
       getList()
@@ -197,7 +212,10 @@ export default defineComponent({
                             round
                             plain
                             color="#AAAAAA"
-                            onClick={() => (form.refundStatus = true)}
+                            onClick={() => {
+                              form.refundSelect = item
+                              form.refundStatus = true
+                            }}
                           >
                             申请退款
                           </Button>
@@ -215,7 +233,7 @@ export default defineComponent({
 
         <Popup v-model:show={form.refundStatus} round style={{ width: '90%' }}>
           <div class={styles.container}>
-            <div class={styles.dialogTitle}>
+            <div class={[styles.dialogTitle, styles.dialogRefund]}>
               <i></i>
               申请退款
             </div>

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

@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, reactive, ref } from 'vue'
+import { defineComponent, onMounted, reactive, ref, nextTick } from 'vue'
 import { Image, showDialog, Sticky, Tab, Tabs } from 'vant'
 import styles from './index.module.less'
 // import { useRect } from '@vant/use'
@@ -27,7 +27,10 @@ export default defineComponent({
       if (name === 'payment') {
         await getRegisterStatus()
       }
-      state.tabValue = name
+
+      nextTick(() => {
+        state.tabValue = name
+      })
     }
 
     const getRegisterStatus = async () => {
@@ -40,13 +43,17 @@ export default defineComponent({
         // 判断是否报名注册过
         state.register = data.register
         if (data.register) {
-          state.tabValue = 'payment'
+          nextTick(() => {
+            state.tabValue = 'payment'
+          })
         }
 
         // 	购买状态, 判断是否已经购买完了
         if (data.purchase) {
-          state.tabValue = 'order'
           state.purchase = data.purchase
+          nextTick(() => {
+            state.tabValue = 'order'
+          })
         }
 
         // INITIATION_SURVEY: '启蒙调查',

src/student/my-orchestra/index.tsx

@@ -9,6 +9,7 @@ export default defineComponent({
   name: 'my-orchestra',
   setup() {
     const router = useRouter()
+
     return () => (
       <div class={styles.myOrchestra}>
         <OHeader
@@ -19,7 +20,7 @@ export default defineComponent({
         />
 
         <div class={[styles.gridContainer, styles.gridClass]}>
-          {[1, 2, 3, 4, 5].map((item: any) => (
+          {[1, 2].map((item: any) => (
             <CellGroup class={styles.classCellGroup}>
               <Cell center titleStyle={{ flex: '0 auto' }} valueClass={styles.classCheckbox}>
                 {{
@@ -27,9 +28,8 @@ export default defineComponent({
                   title: () => (
                     <div class={styles.content}>
                       <div class={styles.teacherName}>
-                        {item.teacherName} <Tag type="primary">{item.name}</Tag>
+                        1211212 <Tag type="primary">长笛班</Tag>
                       </div>
-                      <div class={styles.orchestraName}>{item.orchestraName}</div>
                     </div>
                   )
                 }}

src/student/trade-record/component/paid-list.tsx

@@ -164,6 +164,9 @@ export default defineComponent({
             refundReason: refundReason.text
           }
         })
+
+        form.refundStatus = false
+        onSearch()
       } catch {
         //
       }