修改样式

src/components/select-courseware-member/index.tsx

@@ -10,9 +10,10 @@ export default defineComponent({
   emits: ['close', 'select'],
   setup(props, { emit }) {
     const close = () => {
-      postMessage({
-        api: 'goBack'
-      });
+      // postMessage({
+      //   api: 'goBack'
+      // });
+      emit('close');
     };
 
     onMounted(() => {
@@ -52,6 +53,7 @@ export default defineComponent({
                     orientation: 1
                   }
                 });
+                close();
               }}
             />
             <div onClick={close}>暂不领取</div>

src/components/the-vip/index.module.less

@@ -1,7 +1,7 @@
 .container {
   position: relative;
   width: 278px;
-  height: 250px;
+  height: 256px;
   background: url('./icon_bg.png') no-repeat;
   background-size: 100%;
   display: flex;
@@ -25,7 +25,7 @@
 
 .content {
   position: relative;
-  padding: 33px 13px 20px 13px;
+  padding: 60px 13px 20px 13px;
   font-size: 15px;
   font-weight: 400;
   color: #333333;

src/components/the-vip/index.tsx

@@ -16,7 +16,7 @@ export default defineComponent({
           src={icon_close}
           onClick={() => emit('close')}
         />
-        <img class={styles.title} src={icon_title} />
+        {/* <img class={styles.title} src={icon_title} /> */}
         <div class={styles.content}>
           您还未领取<span style={{ color: '#FF5A56' }}>“乐器AI学练工具”</span>
           哦，如需继续使用，请领取～

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

@@ -17,13 +17,15 @@ import { showToast } from 'vant';
 import queryString from 'query-string';
 import CoursewareDetail from '@/custom-plugins/guide-page/courseware-detail';
 import { usePageVisibility } from '@vant/use';
-import { state } from '@/state';
+import { setLogin, state } from '@/state';
 import TheNoticeBar from '@/components/the-noticeBar';
 import {
   api_lessonDetailCourseware,
   api_classDetailCourseware
 } from '../../api';
 import SelectCoursewarePop from '@/components/select-courseware-pop';
+import SelectCoursewareMember from '@/components/select-courseware-member';
+import request from '@/helpers/request';
 
 export default defineComponent({
   name: 'the-book',
@@ -51,6 +53,7 @@ export default defineComponent({
   },
   emits: ['close'],
   setup(props, { emit }) {
+    const pageVisibility = usePageVisibility();
     const router = useRouter();
     console.log(state.user.data.phone);
     const lastTimeKey = 'lastTime' + (state?.user?.data?.phone ?? '');
@@ -66,6 +69,7 @@ export default defineComponent({
       coursewareList: [] as any
     });
     const showSelectCourseware = ref(false);
+    const showMember = ref(false);
     const showGuide = ref(false);
     const isend = ref(false);
     const step = ref(0);
@@ -284,6 +288,18 @@ export default defineComponent({
         }
       }
     );
+
+    watch(
+      () => pageVisibility.value,
+      async (val: any) => {
+        if (val === 'visible') {
+          const userCash = await request.get('/edu-app/user/getUserInfo', {
+            initRequest: true // 初始化接口
+          });
+          setLogin(userCash.data);
+        }
+      }
+    );
     // 检测有几个课件
     const checkCourseware = async (item: any) => {
       if (item.id) {
@@ -293,6 +309,19 @@ export default defineComponent({
         }
 
         if (item.coursewareNum) {
+          // needVipLock
+          const schoolInfos = state.user.data?.schoolInfos;
+          const schoolLock =
+            schoolInfos && schoolInfos.length > 0
+              ? schoolInfos[0].needVipLock
+              : true;
+          if (!state?.user?.data.vipMember && schoolLock) {
+            showMember.value = true;
+            return;
+          } else {
+            showMember.value = false;
+          }
+
           try {
             const res =
               props.tab == 'all' || props.tab == 'favorite'
@@ -496,6 +525,13 @@ export default defineComponent({
             }}
             onSelect={item => handleOpenPlay(item)}></SelectCoursewarePop>
         )}
+
+        {showMember.value && (
+          <SelectCoursewareMember
+            onClose={() => {
+              showMember.value = false;
+            }}></SelectCoursewareMember>
+        )}
       </div>
     );
   }

src/views/courseware-play/component/audio-item/index.tsx

@@ -2,14 +2,14 @@ import { defineComponent, nextTick, reactive, toRefs, watch } from 'vue';
 import { ref } from 'vue';
 import styles from './index.module.less';
 
-import iconLoop from '../../image/icon-loop.svg';
-import iconLoopActive from '../../image/icon-loop-active.svg';
+import iconLoop from '../../image/icon-loop.png';
+import iconLoopActive from '../../image/icon-loop-active.png';
 import iconplay from '../../image/icon-play.png';
 import iconpause from '../../image/icon-pause.png';
 import { NSlider } from 'naive-ui';
 import Vudio from 'vudio.js';
 import { getSecondRPM } from '@/helpers/utils';
-import { Slider } from 'vant';
+import { Slider, showToast } from 'vant';
 import tickMp3 from '../../image/tick.mp3';
 
 export default defineComponent({
@@ -294,7 +294,18 @@ export default defineComponent({
             </div>
             <div
               class={styles.actionBtn}
-              onClick={() => (data.loop = !data.loop)}>
+              onClick={() => {
+                data.loop = !data.loop;
+                if (data.loop) {
+                  setTimeout(() => {
+                    showToast('已打开循环播放');
+                  }, 60);
+                } else {
+                  setTimeout(() => {
+                    showToast('已关闭循环播放');
+                  }, 60);
+                }
+              }}>
               <img src={data.loop ? iconLoopActive : iconLoop} />
             </div>
           </div>

src/views/courseware-play/component/video-item/index.tsx

@@ -11,8 +11,8 @@ import styles from './index.module.less';
 
 import TCPlayer from 'tcplayer.js';
 import 'tcplayer.js/dist/tcplayer.min.css';
-import iconLoop from '../../image/icon-loop.svg';
-import iconLoopActive from '../../image/icon-loop-active.svg';
+import iconLoop from '../../image/icon-loop.png';
+import iconLoopActive from '../../image/icon-loop-active.png';
 import iconplay from '../../image/icon-play.svg';
 import iconpause from '../../image/icon-pause.svg';
 import iconSpeed from '../../image/icon-speed.png';

src/views/courseware-play/index.tsx

@@ -65,7 +65,7 @@ export default defineComponent({
     const pageVisibility = usePageVisibility();
     const lastTimeKey = 'lastTime' + (state?.user?.data?.phone ?? '');
     const showSelectCourseware = ref(false);
-    const showMember = ref(false);
+    // const showMember = ref(false);
     const debounceSkip = ref(false);
     /** 设置播放容器 16:9 */
     const parentContainer = reactive({
@@ -320,9 +320,7 @@ export default defineComponent({
           ...m,
           iframeRef: null,
           videoEle: null,
-          autoPlay: showMember.value
-            ? false
-            : data.currentCourse.autoPlay || false, //加载完成是否自动播放
+          autoPlay: data.currentCourse.autoPlay || false, //加载完成是否自动播放
           isprepare: false, // 视频是否加载完成
           isRender: false // 是否渲染了
         };
@@ -356,18 +354,6 @@ export default defineComponent({
     };
 
     onMounted(() => {
-      // needVipLock
-      const schoolInfos = state.user.data?.schoolInfos;
-      const schoolLock =
-        schoolInfos && schoolInfos.length > 0
-          ? schoolInfos[0].needVipLock
-          : true;
-      if (!state?.user?.data.vipMember && schoolLock) {
-        showMember.value = true;
-      } else {
-        showMember.value = false;
-      }
-
       postMessage({
         api: 'courseLoading',
         content: {
@@ -1003,31 +989,6 @@ export default defineComponent({
       }
     };
 
-    watch(
-      () => pageVisibility.value,
-      async (val: any) => {
-        console.log(val, 'pageVisibility.value -----');
-        if (val === 'visible') {
-          const userCash = await request.get('/edu-app/user/getUserInfo', {
-            initRequest: true // 初始化接口
-          });
-          setLogin(userCash.data);
-
-          console.log(userCash, 'userCash');
-          const schoolInfos = userCash.data?.schoolInfos;
-          const schoolLock =
-            schoolInfos && schoolInfos.length > 0
-              ? schoolInfos[0].needVipLock
-              : true;
-          if (!state?.user?.data.vipMember && schoolLock) {
-            showMember.value = true;
-          } else {
-            showMember.value = false;
-          }
-        }
-      }
-    );
-
     return () => (
       <div id="playContent" class={styles.playContent}>
         <div
@@ -1386,12 +1347,12 @@ export default defineComponent({
             }}
             onSelect={item => loadNewCourseware(item)}></SelectCoursewarePop>
         )}
-        {showMember.value && (
+        {/* {showMember.value && (
           <SelectCoursewareMember
             onClose={() => {
               showSelectCourseware.value = false;
             }}></SelectCoursewareMember>
-        )}
+        )} */}
       </div>
     );
   }

src/views/student-register/index.module.less

@@ -706,4 +706,12 @@
       }
     }
   }
+}
+
+.selectStudentPopup {
+  :global {
+    .van-popup__close-icon {
+      color: #767C7F;
+    }
+  }
 }

src/views/student-register/index.tsx

@@ -2008,7 +2008,8 @@ export default defineComponent({
           round
           position="bottom"
           safeAreaInsetBottom
-          closeable>
+          closeable
+          class={styles.selectStudentPopup}>
           <SelectStudent
             studentItem={forms.studentItem}
             list={forms.studentList}

src/views/student-register/register-member/index.module.less

@@ -371,4 +371,12 @@
   text-align: center;
   font-size: 14px;
   color: #A0D0FF;
+}
+
+.selectStudentPopup {
+  :global {
+    .van-popup__close-icon {
+      color: #767C7F;
+    }
+  }
 }

src/views/student-register/register-member/index.tsx

@@ -848,7 +848,8 @@ export default defineComponent({
           round
           position="bottom"
           safeAreaInsetBottom
-          closeable>
+          closeable
+          class={styles.selectStudentPopup}>
           <SelectStudent
             studentItem={forms.studentItem}
             list={forms.studentList}

src/views/student-register/register-new/index.module.less

@@ -404,4 +404,12 @@
   text-align: center;
   font-size: 14px;
   color: #A0D0FF;
+}
+
+.selectStudentPopup {
+  :global {
+    .van-popup__close-icon {
+      color: #767C7F;
+    }
+  }
 }

src/views/student-register/register-new/index.tsx

@@ -909,7 +909,8 @@ export default defineComponent({
           round
           position="bottom"
           safeAreaInsetBottom
-          closeable>
+          closeable
+          class={styles.selectStudentPopup}>
           <SelectStudent
             studentItem={forms.studentItem}
             list={forms.studentList}

vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [