Selaa lähdekoodia

Merge branch 'iteration-create'

liushengqiang 1 vuosi sitten
vanhempi
commit
da6336b4ff

+ 3 - 2
src/views/information/index.tsx

@@ -7,12 +7,13 @@ import { state } from '@/state';
 import dayjs from 'dayjs';
 import { Cell, CellGroup, List, Image } from 'vant';
 import { defineComponent, onMounted, reactive } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import styles from './help-center/index.module.less';
 
 export default defineComponent({
   name: 'help-center',
   setup() {
+    const route = useRoute()
     const router = useRouter();
     const form = reactive({
       isClick: false,
@@ -92,7 +93,7 @@ export default defineComponent({
           !form.listState.dataShow && 'emptyRootContainer'
         ]}>
         <OSticky position="top">
-          <OHeader border={false} />
+          <OHeader border={false} isBack={route.query.platformType != 'ANALYSIS'} />
           <OSearch onSearch={onSearch} />
         </OSticky>
 

+ 2 - 0
src/views/knowledge-library/examination-mode/index.tsx

@@ -239,6 +239,8 @@ export default defineComponent({
       if (state.visiableInfo.operationType === 'BACK') {
         if (status) {
           state.visiableInfo.show = false;
+          window.history.pushState(null, '', document.URL);
+          window.addEventListener('popstate', onBack, false);
           return;
         }
         try {

+ 7 - 2
src/views/knowledge-library/index.tsx

@@ -3,7 +3,7 @@ import MSticky from '@/components/m-sticky';
 import { defineComponent, onMounted, reactive } from 'vue';
 import styles from './index.module.less';
 import { useRoute, useRouter } from 'vue-router';
-import { Button, Collapse, CollapseItem, Image } from 'vant';
+import { Button, Collapse, CollapseItem, Image, showToast } from 'vant';
 import request from '@/helpers/request';
 import library1 from './images/library-1.png';
 import library2 from './images/library-2.png';
@@ -65,7 +65,12 @@ export default defineComponent({
             }
           }
         );
-        if (!data) return;
+        if (!data) {
+          setTimeout(() => {
+            showToast('暂无题目');
+          }, 100);
+          return;
+        }
 
         if (type === 'TEST') {
           // 模拟测试

+ 6 - 0
src/views/knowledge-library/unit-detail.tsx

@@ -7,6 +7,7 @@ import request from '@/helpers/request';
 import { useEventListener, useWindowScroll } from '@vueuse/core';
 import iconExamQuestion from './images/icon-exam-question.png';
 import MEmpty from '@/components/m-empty';
+import { showToast } from 'vant';
 
 export default defineComponent({
   name: 'unit-detail',
@@ -50,6 +51,11 @@ export default defineComponent({
             path: '/practice-mode',
             query: { lessonCoursewareId: route.query.detailId }
           });
+        } else {
+          setTimeout(() => {
+            showToast('暂无题目');
+          }, 100);
+          return;
         }
       } catch {
         //