lex 8 months ago
parent
commit
8f7d4374d0

+ 2 - 0
src/helpers/utils.ts

@@ -7,6 +7,7 @@ import qs from 'query-string';
 export const browser = () => {
   const u = navigator.userAgent;
   //   app = navigator.appVersion;
+  // DAYAAPPI DAYAAPPTEACHER
   return {
     trident: u.indexOf('Trident') > -1, //IE内核
     presto: u.indexOf('Presto') > -1, //opera内核
@@ -21,6 +22,7 @@ export const browser = () => {
       u.indexOf('DAYAAPPI') > -1 ||
       u.indexOf('DAYAAPPA') > -1 ||
       u.indexOf('Adr') > -1,
+    isTeacher: u.indexOf('DAYAAPPTEACHER') > -1,
     iPad: u.indexOf('iPad') > -1, //是否iPad
     webApp: u.indexOf('Safari') == -1, //是否web应该程序,没有头部与底部
     weixin: u.indexOf('MicroMessenger') > -1, //是否微信 (2015-01-22新增)

+ 4 - 3
src/main.ts

@@ -8,7 +8,7 @@ import './component-ui/index.less';
 import './styles/index.less';
 import router from '@/router';
 import { promisefiyPostMessage, postMessage } from './helpers/native-message';
-import { setAuth } from './helpers/utils';
+import { browser, setAuth } from './helpers/utils';
 import { state } from './state';
 
 // 获取token
@@ -34,12 +34,13 @@ postMessage({ api: 'getNavHeight' }, (res: any) => {
 
 const url = window.location.href;
 const urlIsTeacher =
-  /gym.lexiaoya.cn\/lessonPlayTeacher/.test(url) || /test.gym.lexiaoya.cn\/lessonPlayTeacher/.test(url) || /192.168.3.220/.test(url)
+  /mteaonline.dayaedu.com/.test(url) || /mteatest.dayaedu.com/.test(url) || /gym.lexiaoya.cn\/lessonPlayTeacher/.test(url) || /test.gym.lexiaoya.cn\/lessonPlayTeacher/.test(url)
     ? true
     : false;
 // const paymentType = (window as any).paymentType; // 浏览器设置
+
 // 判断是哪个环境
-if (urlIsTeacher) {
+if (urlIsTeacher || browser().isTeacher) {
   state.platformType = 'TEACHER';
   state.platformApi = '/api-teacher';
 } else {

+ 9 - 3
src/views/choise-homework/classroom-detail/index.tsx

@@ -1,6 +1,6 @@
 import request from '@/helpers/request';
 import { state } from '@/state';
-import { Button, Cell, Collapse, CollapseItem, Popup } from 'vant';
+import { Button, Cell, Collapse, CollapseItem, Popup, showToast } from 'vant';
 import { defineComponent, onMounted, reactive, TransitionGroup } from 'vue';
 import styles from './index.module.less';
 import { useRoute, useRouter } from 'vue-router';
@@ -23,8 +23,8 @@ export default defineComponent({
   name: 'courseList',
   setup() {
     const route = useRoute();
-    const router = useRouter();
-    const browserInfo = browser();
+    // const router = useRouter();
+    // const browserInfo = browser();
     const data = reactive({
       titleOpacity: 0,
       catchStatus: false,
@@ -343,6 +343,12 @@ export default defineComponent({
               color="linear-gradient( 132deg, #60DBC7 0%, #01C1B5 100%)"
               onClick={() => {
                 const ids = getKnowledgeMaterialIds(data.list);
+                if (state.max !== -1) {
+                  if (ids.length > state.max) {
+                    showToast(`练习组还可以添加${state.max}练习`);
+                    return;
+                  }
+                }
 
                 const body = {
                   api: 'onCoursewareSelectResult',

+ 1 - 1
src/views/choise-homework/music-list/index.tsx

@@ -355,7 +355,7 @@ export default defineComponent({
 
       this.selectedPartName = partNames[0];
 
-      // this.openDetail();
+      this.openDetail();
     },
     onSelectedPartName(part: number) {
       this.selectedPartIndex = part;

+ 8 - 3
src/views/exercise-after-class/index.tsx

@@ -96,11 +96,16 @@ export default defineComponent({
     // 获取课后练习记录
     const getTrainingRecord = async () => {
       try {
+        // ?${query.courseScheduleId}?userId=${state.user?.data?.id}
         const res: any = await request.post(
           state.platformApi +
-            `/studentLessonTraining/trainingRecord/${query.courseScheduleId}?userId=${state.user?.data?.id}`,
+            `/studentCourseHomework/findStudentHomeworkCourseware`,
           {
-            hideLoading: true
+            hideLoading: true,
+            data: {
+              courseScheduleId: query.courseScheduleId,
+              type: query.type
+            }
           }
         );
         data.expireTimeFlag = res.data?.expireTimeFlag || false;
@@ -229,7 +234,7 @@ export default defineComponent({
       };
       try {
         await request.post(
-          state.platformApi + '/studentLessonTraining/lessonTrainingRecord',
+          state.platformApi + '/studentCourseHomework/addStudentHomeworkRecord',
           {
             data: body,
             hideLoading: true

+ 1 - 1
vite.config.ts

@@ -14,7 +14,7 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-const proxyUrl = 'https://test.gym.lexiaoya.cn';
+const proxyUrl = 'https://dev.gym.lexiaoya.cn';
 export default defineConfig({
   base: './',
   plugins: [