Merge branch '2023-8-23_上线' into online

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

@@ -16,6 +16,7 @@ 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';
 export default defineComponent({
   name: 'the-book',
   props: {
@@ -39,14 +40,15 @@ export default defineComponent({
   emits: ['close'],
   setup(props, { emit }) {
     const router = useRouter();
-
+    console.log(state.user.data.phone)
+    const lastTimeKey = 'lastTime' + (state?.user?.data?.phone ?? '');
     const data = reactive({
       show: false,
       width: 0,
       height: 0,
       transform: '',
       list: [] as any[][],
-      lastTime: localStorage.getItem('lastTime')
+      lastTime: localStorage.getItem(lastTimeKey)
     });
     const showGuide = ref(false);
     const handleCreate = (key: string, url: string) => {
@@ -147,7 +149,7 @@ export default defineComponent({
     onMounted(async () => {
       await init();
       listenerMessage('webViewOnResume', () => {
-        data.lastTime = localStorage.getItem('lastTime');
+        data.lastTime = localStorage.getItem(lastTimeKey);
       });
     });
     const getList = () => {
@@ -199,7 +201,7 @@ export default defineComponent({
           showToast('暂无资源');
           return;
         }
-        localStorage.setItem('lastTime', item.id);
+        localStorage.setItem(lastTimeKey, item.id);
         const query = queryString.stringify({
           id: item.id,
           name: item.name,

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

@@ -11,6 +11,7 @@ import { storage } from '@/helpers/storage';
 import { ACCESS_TOKEN } from '@/store/mutation-types';
 import TheVip from '@/components/the-vip';
 import { state } from '@/state';
+import request from '@/helpers/request';
 
 export default defineComponent({
   name: 'musicScore',
@@ -77,7 +78,8 @@ export default defineComponent({
       query: {
         id: props.music.content,
         modelType: 'practise',
-        Authorization: Authorization
+        Authorization: Authorization,
+        showGuide: true
       }
     });
     const checkView = () => {
@@ -116,7 +118,8 @@ export default defineComponent({
         url: origin + '/instrument',
         query: {
           id: props.music.content,
-          Authorization: Authorization
+          Authorization: Authorization,
+          showGuide: true
         }
       });
       postMessage(
@@ -138,8 +141,19 @@ export default defineComponent({
         }
       );
     };
+    const getUserInfo = async () => {
+      const res = await request.get('/edu-app/user/getUserInfo', {
+        initRequest: true, // 初始化接口
+        requestType: 'form',
+        hideLoading: true
+      });
+      if (res?.code === 200) {
+        state.user.data.vipMember = res.data.vipMember
+      }
+    };
     listenerMessage('webViewOnResume', () => {
       isLoading.value = false;
+      getUserInfo();
     });
 
     return () => (

src/views/courseware-play/index.tsx

@@ -337,10 +337,11 @@ export default defineComponent({
     };
     return () => (
       <div id="playContent" class={styles.playContent}>
-        <div onClick={() => setModelOpen()}>
+        <div>
           <div
             class={styles.coursewarePlay}
-            style={{ width: parentContainer.width }}>
+            style={{ width: parentContainer.width }}
+            onClick={() => setModelOpen()}>
             <div class={styles.wraps}>
               {data.itemList.map((m: any, mIndex: number) => {
                 const isRender =