Merge branch 'master' of http://192.168.3.207:10080/jianyu/jy-docs

# Conflicts:
#	jydocs-mobile/src/views/details/details.vue

jydocs-pc/src/components/recommend.vue

@@ -1,5 +1,6 @@
 <template>
-<div class="r-rec" id="recTop" :class="{'rec-active': fixedRec}">
+<!-- <div class="r-rec" id="recTop" :class="{'rec-active': fixedRec}"> -->
+<div class="r-rec" id="recTop">
     <h3>相关推荐</h3>
     <div class="docs" v-for="item in recomes" :key="item.docId">
         <div class="imgs" @click="detailClick(item.docId)">
@@ -75,6 +76,7 @@ export default {
 .rec-active {
   position: fixed;
   top: 0;
+  z-index: 9;
 }
 .r-rec {
     width: 264px;