Merge branch 'master' of ssh://git.xingtongworld.com:10022/luyisha/jiaoyi_ybgcoins_web3

src/views/college/detail.vue

@@ -4,8 +4,8 @@
         <div class="row">
             <div class="col-12 my-4" v-if="article">
                 <el-breadcrumb separator-class="el-icon-arrow-right">
-                    <el-breadcrumb-item :to="{ path: '/college' }">{{$t('college.college')}}</el-breadcrumb-item>
-                    <el-breadcrumb-item :to="{ path: `/college/list/${cid}`}">{{article.category_name}}</el-breadcrumb-item>
+                    <el-breadcrumb-item :to="{ path: `/college/list/${cid}` }">{{$t('college.college')}}</el-breadcrumb-item>
+                    <el-breadcrumb-item :to="{ path: `/college/list/${cid}?cname=${article.category_name}`}">{{article.category_name}}</el-breadcrumb-item>
                     <el-breadcrumb-item :to="{path:`/college/detail/${cid}/${aid}`}">{{$t('college.article')}}</el-breadcrumb-item>
                 </el-breadcrumb>
                 <div class="title h2 mt-4">{{article.title}}</div>

src/views/college/list.vue

@@ -126,6 +126,9 @@ export default {
     created() {
         this.getArticleList();
         this.getCollegeLinks();
+        if (this.$route.query.cname != '' && this.$route.query.cname != null && this.$route.query.cname != undefined ) {
+            this.value = this.$route.query.cname;
+        }
     },
 };
 </script>