Преглед на файлове

增加从详情的返回到全部列表页面

秦鹏 преди 3 години
родител
ревизия
2f4abc6409

+ 12 - 2
src/components/teacher-dev/HeaderOne.vue

@@ -4,7 +4,13 @@
       <span class="befor" @click="backHome">
         <img src="../../assets/teacherdev/Frame3.png" alt="" />
       </span>
-      <span @click="backHome">
+      <template v-if="allList">
+        <span>
+          <img src="../../assets/teacherdev/Frame2759.png" alt="" />
+        </span>
+        <span class="text" @click="back">全部列表</span>
+      </template>
+      <span>
         <img src="../../assets/teacherdev/Frame2759.png" alt="" />
       </span>
       <span class="text">{{ text }}</span>
@@ -33,11 +39,12 @@
 export default {
   //import引入的组件需要注入到对象中才能使用
   components: {},
-  props: ["type", "text", "changeKeycode", "keycode"],
+  props: ["type", "text", "changeKeycode", "keycode","allList"],
   data() {
     //这里存放数据
     return {
       SeekName: "",
+      AllList: false,
     };
   },
   //计算属性 类似于data概念
@@ -49,6 +56,9 @@ export default {
     backHome() {
       this.$router.push("/");
     },
+    back() {
+      this.$router.back();
+    },
     // 前往搜索结果
     gotoSeekResult() {
       if (this.SeekName != "") {

+ 2 - 3
src/components/teacher-dev/Teaching.vue

@@ -28,9 +28,7 @@
           alt=""
         ></el-image> -->
         <p class="one_name">
-          {{
-            item.name
-          }}
+          {{ item.name }}
         </p>
         <p class="price">
@@ -63,6 +61,7 @@ export default {
         path: "/Preview",
         query: {
           id: item.id,
+          allList: this.type ? "allList" : null,
         },
       });
     },

+ 3 - 1
src/components/teacher-dev/Textbook.vue

@@ -39,7 +39,7 @@
 
 <script>
 export default {
-  props: ["classList"],
+  props: ["classList", "type"],
   data() {
     return {};
   },
@@ -109,6 +109,8 @@ export default {
       }
     },
   },
+  created(){
+  }
 };
 </script>
 

+ 79 - 79
src/router/index.js

@@ -6,96 +6,96 @@ import { Loading } from 'element-ui';
 import { getToken } from '@/utils/auth' // get token from cookie
 
 const routes = [{
-  path: '/EnterSys',
-  // component: Index,
-  beforeEnter: (to, from, next) => {
-    let loadingInstance = Loading.service({
-      text: '跳转中...'
-    });
-    let token = getToken();
-    if (token) {
-      if (JSON.parse(token).popedom_code_list.indexOf(2000006) != -1) {
-        next("/teacherdevEntering");
-        loadingInstance.close()
-      } else {
-        next({ path: "/" });
-        loadingInstance.close()
-      }
+        path: '/EnterSys',
+        // component: Index,
+        beforeEnter: (to, from, next) => {
+            let loadingInstance = Loading.service({
+                text: '跳转中...'
+            });
+            let token = getToken();
+            if (token) {
+                if (JSON.parse(token).popedom_code_list.indexOf(2000006) != -1) {
+                    next("/teacherdevEntering");
+                    loadingInstance.close()
+                } else {
+                    next({ path: "/" });
+                    loadingInstance.close()
+                }
+            }
+        }
+    },
+    {
+        path: '/GoodsDetail',
+        beforeEnter: (to, from, next) => {
+            let loadingInstance = Loading.service({
+                text: '跳转中...'
+            });
+            if (to.query.goods_type == 401) {
+                next({
+                    path: "/Preview",
+                    query: {
+                        id: to.query.goods_id,
+                    },
+                })
+                loadingInstance.close()
+            }
+        }
+    },
+    // 教研中心
+    {
+        path: '/',
+        name: 'Index',
+        component: Index
+    },
+    {
+        path: '/login',
+        name: 'login',
+        component: () =>
+            import ('../views/login.vue'),
+    },
+    {
+        path: '/Preview',
+        name: 'Preview',
+        component: () =>
+            import ('../views/teacher-dev/Preview.vue')
+    },
+    {
+        path: "/Viewmore",
+        name: 'Viewmore',
+        component: () =>
+            import ('../views/teacher-dev/Viewmore.vue')
+    },
+    {
+        path: '/teacherdevEntering',
+        name: 'teacherdevEntering',
+        component: () =>
+            import ('../views/teacher-devEntering/index.vue')
+    },
+    {
+        path: '/creadDocument',
+        name: 'creadDocument',
+        component: () =>
+            import ('../views/teacher-devEntering/creadDocument.vue')
+    },
+    {
+        path: '*',
+        redirect: '/404'
     }
-  }
-},
-{
-  path: '/GoodsDetail',
-  beforeEnter: (to, from, next) => {
-    let loadingInstance = Loading.service({
-      text: '跳转中...'
-    });
-    if (to.query.goods_type == 401) {
-      next({
-        path: "/Preview",
-        query: {
-          id: to.query.goods_id,
-        },
-      })
-      loadingInstance.close()
-    }
-  }
-},
-// 教研中心
-{
-  path: '/',
-  name: 'Index',
-  component: Index
-},
-{
-  path: '/login',
-  name: 'login',
-  component: () =>
-    import('../views/login.vue'),
-},
-{
-  path: '/Preview',
-  name: 'Preview',
-  component: () =>
-    import('../views/teacher-dev/Preview.vue')
-},
-{
-  path: "/Viewmore",
-  name: 'Viewmore',
-  component: () =>
-    import('../views/teacher-dev/Viewmore.vue')
-},
-{
-  path: '/teacherdevEntering',
-  name: 'teacherdevEntering',
-  component: () =>
-    import('../views/teacher-devEntering/index.vue')
-},
-{
-  path: '/creadDocument',
-  name: 'creadDocument',
-  component: () =>
-    import('../views/teacher-devEntering/creadDocument.vue')
-},
-{
-  path: '*',
-  redirect: '/404'
-}
 ]
 
 
 
 const router = new VueRouter({
-  // mode: 'history',
-  base: process.env.BASE_URL,
-  routes
+    // mode: 'history',
+    base: process.env.BASE_URL,
+    routes
 })
 
 //获取原型对象上的push函数
 const originalPush = VueRouter.prototype.push
-//修改原型对象中的push方法
+    //修改原型对象中的push方法
 VueRouter.prototype.push = function push(location) {
-  return originalPush.call(this, location).catch(err => err)
+    return originalPush.call(this, location).catch(err => err)
 }
 
 export default router

+ 3 - 1
src/views/teacher-dev/Preview.vue

@@ -5,7 +5,7 @@
       <Header />
       <div class="shade"></div>
     </div>
-    <HeaderOne v-if="!Ispreview && data" :text="data.name" />
+    <HeaderOne v-if="!Ispreview && data" :text="data.name" :allList="allList" />
     <div class="main" v-if="data">
       <div class="flassify">
         <div class="text">
@@ -143,6 +143,7 @@ export default {
       PymentShow: false, //支付订单弹窗
       orderNumber: null, //订单号
       IsDownload: false, //是否可以下载
+      allList:null,
     };
   },
   computed: {},
@@ -330,6 +331,7 @@ export default {
   mounted() {
     this.materialId = this.$route.query.id;
     this.Ispreview = this.$route.query.type;
+    this.allList = this.$route.query.allList
     if (this.materialId) {
       this.getdetail();
       if (!this.Ispreview) {