Merge remote-tracking branch 'origin/master'

src/components/detail/NavDetail.vue

@@ -1,4 +1,6 @@
 <template>
+  <div class="wrapper">
+    <LeftSide :category="category"></LeftSide>
   <div class="DefinedPage" >
     <div class="LeftPart"  style="overflow: auto">
       <div class="JustBack" style="width:670px;display:flex; flex-direction: row; flex-wrap: nowrap;height:430px !important;">
@@ -129,7 +131,7 @@
     </div>
   </div>
 
-
+  </div>
 </template>
 <script>
 import HotRecomment from "@/components/detail/HotRecomment.vue";
@@ -139,13 +141,15 @@ import UserComment from "@/components/detail/UserComment.vue";
 import Vue from "vue";
 import * as echarts from 'echarts'
 import axios from "axios";
+import LeftSide from "@/components/home/LeftSide.vue";
 Vue.prototype.$echarts = echarts;
 export default {
   name:"NavDetail",
   // eslint-disable-next-line vue/no-unused-components
-  components: {HotRecomment,NewRecomment,RandomRecomment,UserComment},
+  components: {LeftSide, HotRecomment,NewRecomment,RandomRecomment,UserComment},
   data() {
     return {
+      category:[],
       visible: false,
     //返回数据：时间列表
       TimeList:[],
@@ -167,6 +171,7 @@ export default {
       this.initPage();
       this.GetNav(this.UrlId);
       this.initEchart();
+      this.getCategories();
 
   },
   created() {
@@ -176,6 +181,28 @@ export default {
 
   },
   methods: {
+    getCategories() {
+      let _this = this;
+      axios({
+        method: 'post',
+        url: '/api/UrlAndCate/disposeBookmarkExhibitedToJson',
+      }).then(function (res) {
+        // console.log(res);
+        if (res.data.data) {
+          _this.category = res.data.data;
+        } else {
+          return false;
+        }
+
+      }).catch((error) => {
+        Vue.prototype.$notify.error({
+          title: '错误',
+          message: error,
+          offset: 0
+        });
+      })
+    },
+
       // 时间转换：
       getFormatDate() {
         var that = this;