Merge branch '2023-8-21_指法遮挡' into online

src/views/co-ai/index.tsx

@@ -119,7 +119,7 @@ export default defineComponent({
             var dataURL = canvas.toDataURL('image/png', 1); //可选取多种模式
             // console.log('🚀 ~ dataURL:', dataURL);
             setTimeout(() => {
-              showToast('保存成功');
+              showToast('已保存到相册');
             }, 500);
             const res = await promisefiyPostMessage({
               api: 'savePicture',
@@ -278,12 +278,15 @@ export default defineComponent({
                     background="transparent"
                     clearable={false}
                     placeholder="请输入关键字"
+                    modelValue={musicForms.keyword}
                     onFocus={() => (data.searchNoticeShow = false)}
                     onBlur={val => {
-                      musicForms.keyword = val;
+                      musicForms.keyword = val?.trim() || '';
                       requestAnimationFrame(() => {
                         requestAnimationFrame(() => {
-                          data.searchNoticeShow = true;
+                          if (musicForms.keyword){
+                            data.searchNoticeShow = true;
+                          }
                         });
                       });
                     }}
@@ -353,37 +356,33 @@ export default defineComponent({
                 </div>
                 {data.isShowJianpu ? (
                   <>
-                    <TransitionGroup name="van-fade">
-                      {data.musics[data.musicIndex]?.musicSvg
-                        ?.split(',')
-                        .map((item: any, index: number) => {
-                          return (
-                            <img
-                              class={styles.staff}
-                              src={item + '?v=' + Date.now()}
-                              key={item}
-                              crossorigin="anonymous"
-                            />
-                          );
-                        })}
-                    </TransitionGroup>
+                    {data.musics[data.musicIndex]?.musicSvg
+                      ?.split(',')
+                      .map((item: any, index: number) => {
+                        return (
+                          <img
+                            class={styles.staff}
+                            src={item + '?v=' + Date.now()}
+                            key={item}
+                            crossorigin="anonymous"
+                          />
+                        );
+                      })}
                   </>
                 ) : (
                   <>
-                    <TransitionGroup name="van-fade">
-                      {data.musics[data.musicIndex]?.musicImg
-                        ?.split(',')
-                        .map((item: any, index: number) => {
-                          return (
-                            <img
-                              class={styles.staff}
-                              src={item + '?v=' + Date.now()}
-                              key={item}
-                              crossorigin="anonymous"
-                            />
-                          );
-                        })}
-                    </TransitionGroup>
+                    {data.musics[data.musicIndex]?.musicImg
+                      ?.split(',')
+                      .map((item: any, index: number) => {
+                        return (
+                          <img
+                            class={styles.staff}
+                            src={item + '?v=' + Date.now()}
+                            key={item}
+                            crossorigin="anonymous"
+                          />
+                        );
+                      })}
                   </>
                 )}
               </div>

src/views/courseware-list/component/book/index.tsx

@@ -89,6 +89,7 @@ export default defineComponent({
         // display: 'single', //设置单页还是双页
       });
     };
+
     const getRect = () => {
       const bookWrap = document.querySelector(
         '.bookWrap'
@@ -176,7 +177,7 @@ export default defineComponent({
         list.push(listItem);
       }
       data.list = list;
-      // console.log("🚀 ~ data.list:", data.list)
+      // console.log('🚀 ~ data.list:', data.list.length);
     };
     watch(
       () => props.show,
@@ -280,18 +281,13 @@ export default defineComponent({
                   </div>
                 );
               })}
-              <div class="page" style={{ pointerEvents: 'none' }}>
-                <div class={styles.wrap}>
-                  <div class={styles.wrapItem}></div>
-                </div>
-              </div>
-              {/* {data.list.length % 2 == 0 && (
+              {data.list.length % 2 === 1 && (
                 <div class="page" style={{ pointerEvents: 'none' }}>
                   <div class={styles.wrap}>
                     <div class={styles.wrapItem}></div>
                   </div>
                 </div>
-              )} */}
+              )}
             </div>
           )}
         </div>

src/views/courseware-list/index.tsx

@@ -1,6 +1,7 @@
 import {
   computed,
   defineComponent,
+  nextTick,
   onBeforeMount,
   onMounted,
   reactive,
@@ -363,7 +364,7 @@ export default defineComponent({
 
                   <div class={styles.name}>{item.name}</div>
                   {/* 课程教材不需要收藏 */}
-                  {data.tab !== 'course' && (
+                  {!data.loading && data.tab !== 'course' && (
                     <div
                       id={index === 0 ? 'courseware-1' : ''}
                       class={styles.favoriteBtn}

src/views/courseware-play/component/musicScore.tsx

@@ -101,7 +101,7 @@ export default defineComponent({
     // 去云教练完整版
     const gotoAccomany = () => {
       if (!state.user.data?.vipMember) {
-        showVip.value = true;
+        // showVip.value = true;
         return;
       }
       if (isLoading.value) return;
@@ -156,7 +156,7 @@ export default defineComponent({
         {isLoaded.value && (
           <div
             style={{
-              display: props.activeModel ? '' : 'none'
+              display: props.activeModel || !state.user.data?.vipMember ? '' : 'none'
             }}
             class={styles.startBtn}
             onClick={(e: Event) => {

src/views/courseware-play/index.tsx

@@ -184,6 +184,10 @@ export default defineComponent({
         activeData.model =
           ev.data.show || (ev.data.playState == 'play' ? false : true);
       }
+      if (ev.data?.api === 'api_fingerPreView'){
+        clearInterval(activeData.timer)
+        activeData.model = !ev.data.state
+      }
     };
 
     onMounted(() => {
@@ -329,7 +333,7 @@ export default defineComponent({
 
     /** 弹窗关闭 */
     const handleClosePopup = () => {
-      setModelOpen();
+      // setModelOpen();
     };
     return () => (
       <div id="playContent" class={styles.playContent}>

src/views/school-register/index.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, reactive } from 'vue';
+import { defineComponent, onMounted, reactive, ref } from 'vue';
 import styles from './index.module.less';
 import MHeader from '@/components/m-header';
 import { Area, Button, CellGroup, Field, Form, Popup, showToast } from 'vant';
@@ -133,19 +133,29 @@ export default defineComponent({
         }
       }, 1000);
     };
-    const handleSubmit = async () => {
+    const formRef = ref();
+    const handleSubmit = () => {
       forms.name = forms.name.trim();
-      if (!forms.code) {
-        showToast('请输入验证码');
-        return;
-      }
-      const res = await api_schoolSave({ ...forms });
-      if (res?.code === 200) {
-        if (res?.data?.id) {
-          forms.id = res.data.id;
-        }
-        data.success = true;
-      }
+      formRef.value
+        .validate()
+        .then(async () => {
+          if (!forms.code) {
+            showToast('请输入验证码');
+            return;
+          }
+          const res = await api_schoolSave({ ...forms });
+          if (res?.code === 200) {
+            if (res?.data?.id) {
+              forms.id = res.data.id;
+            }
+            data.success = true;
+          }
+        })
+        .catch((err: any) => {
+          console.log('🚀 ~ err:', err);
+          formRef.value.scrollToField(err[0].name);
+        });
+      return;
     };
     return () => (
       <div class={styles.container}>
@@ -160,7 +170,7 @@ export default defineComponent({
 
           <div class={styles.contentWrap}>
             <div class={styles.content}>
-              <Form onSubmit={() => handleSubmit()}>
+              <Form ref={formRef}>
                 <CellGroup class={styles.group}>
                   <img src={icon_school} class={styles.icon} />
                   <Field
@@ -192,6 +202,7 @@ export default defineComponent({
                   <Field
                     isLink
                     border
+                    name="cityName"
                     label="所属城市"
                     placeholder="请选择"
                     readonly
@@ -199,7 +210,7 @@ export default defineComponent({
                     v-model={data.cityName}
                     onClick={() => {
                       if (browserInfo.ios && data.inputFouce < 2) {
-                        data.inputFouce++
+                        data.inputFouce++;
                         setTimeout(() => {
                           data.showArea = true;
                         }, 700);
@@ -458,7 +469,11 @@ export default defineComponent({
                   </div>
                 </CellGroup>
 
-                <Button class={styles.submit} round block native-type="submit">
+                <Button
+                  class={styles.submit}
+                  round
+                  block
+                  onClick={() => handleSubmit()}>
                   <img class={styles.submitIcon} src={icon_submit} />
                 </Button>
               </Form>

src/views/teaher-register/index.tsx

@@ -185,7 +185,7 @@ export default defineComponent({
 
         <div class={styles.contentWrap}>
           <div class={styles.content}>
-            <Form onSubmit={() => handleSubmit()}>
+            <Form>
               <CellGroup class={styles.group} border={false}>
                 <Field
                   border={false}
@@ -270,7 +270,7 @@ export default defineComponent({
                   </Checkbox>
                 </div> */}
                 <div class={styles.submit}>
-                  <Button block native-type="submit">
+                  <Button block onClick={() => handleSubmit()}>
                     注册
                   </Button>
                 </div>