Merge remote-tracking branch 'origin/hqyDev' into feature-tianyong

src/page-instrument/api.ts

@@ -14,11 +14,8 @@ export const studentQueryUserInfo = async () => {
         instrumentId: "",
         phone:data.phone,
         clientType:"TEACHER",
-        username:"",
-        subjectNames:"",
-        avatar:"",
         id:data.id,
-        vipMember: true,
+        vipMember: true, // 管乐迷 会员现在在外面判断的 所以这里默认不开启会员验证
         gender:""
       }
       return res
@@ -36,12 +33,9 @@ export const studentQueryUserInfo = async () => {
       res.data = {
         instrumentId: "",
         phone:data.phone,
-        clientType:"STUDENT",
-        username:"",
-        subjectNames:"",
-        avatar:"",
+        clientType:"web",
         id:data.id,
-        vipMember: true,
+        vipMember: true, // 管乐迷 会员现在在外面判断的 所以这里默认不开启会员验证
         gender:""
       }
       return res
@@ -50,14 +44,11 @@ export const studentQueryUserInfo = async () => {
       const res = await request.get(`/student/queryUserInfo`);
       const data = res.data.student
       res.data = {
-        instrumentId: "",
+        instrumentId: res.data.instrumentId,
         phone:data.phone,
         clientType:"STUDENT",
-        username:"",
-        subjectNames:"",
-        avatar:"",
         id:data.id,
-        vipMember: true,
+        vipMember: true, // 管乐迷 会员现在在外面判断的 所以这里默认不开启会员验证
         gender:""
       }
       return res

src/page-instrument/header-top/index.tsx

@@ -491,29 +491,7 @@ export default defineComponent({
         display: true,
       };
     });
-
-    const isAllBtns = computed(() => {
-      const flag = converBtn.value.display && speedBtn.value.display && selectBtn.value.display && originBtn.value.display && toggleBtn.value.display && showGuide.value;
-      return flag;
-    });
-
-    const isAllBtnsStudent = computed(() => {
-      const flag = converBtn.value.display && speedBtn.value.display && selectBtn.value.display && originBtn.value.display && toggleBtn.value.display && showStudentGuide.value;
-
-      return flag;
-    });
-
-    const showGuideIndex = computed(() => {
-      // 从课堂乐器学生端课件预览默认不显示会员
-      if (storeData.user.vipMember || state.paymentType === "FREE" || query.showCourseMember === "true") {
-        // 学生端
-        return true;
-      } else {
-        // vip
-        return false;
-      }
-    });
-
+    
     const browInfo = browser();
     /** 返回 */
     const handleBack = () => {

src/page-instrument/header-top/modeView.tsx

@@ -26,8 +26,6 @@ export default defineComponent({
   setup() {
     const query = getQuery();
     const data = reactive({
-      showPC: false,
-      showStudent: false,
       showVip: false,
     });
     // const modeImgDom1 = ref();
@@ -36,15 +34,12 @@ export default defineComponent({
     const openGuid = () => {
       // 加载后 判断 端口号 加载对应的引导
       if (storeData.platformType !== "STUDENT" || storeData.user.clientType !== "STUDENT") {
-        // PC
-        data.showPC = true;
       } else {
         // 从课堂乐器学生端课件预览默认不显示会员
         if (storeData.user.vipMember || state.paymentType === "FREE" || query.showCourseMember === "true") {
-          // 学生端
-          data.showStudent = true;
+
         } else {
-          // vip
+          // 不是vip
           data.showVip = true;
           state.isVip = true;
         }