Authored by 郭成尧

Merge branch 'feature/brand' into develop

1 <template> 1 <template>
2 - <div class="cate-tab-fixed">  
3 - <tab v-bind:page="page"></tab>  
4 - </div>  
5 <div class="cate-page" id='cate-page'> 2 <div class="cate-page" id='cate-page'>
6 <div class="cate-nav clearfix"> 3 <div class="cate-nav clearfix">
7 <ul> 4 <ul>
@@ -29,12 +26,6 @@ @@ -29,12 +26,6 @@
29 </div> 26 </div>
30 </template> 27 </template>
31 <style> 28 <style>
32 -.cate-tab-fixed {  
33 - position: fixed;  
34 - top: 0;  
35 - left: 0;  
36 -}  
37 -  
38 .cate-page { 29 .cate-page {
39 font-size: 36px; 30 font-size: 36px;
40 font-family: helvetica, Arial, "黑体"; 31 font-family: helvetica, Arial, "黑体";
1 <template> 1 <template>
2 - <tab v-bind:page="page"></tab>  
3 - <resources v-bind:content-code.sync="contentCode"></resources> 2 + <div class="tab-top-fixed">
  3 + <tab v-bind:page="page"></tab>
  4 + </div>
  5 + <div class="resources">
  6 + <resources v-bind:content-code.sync="contentCode"></resources>
  7 + </div>
4 </template> 8 </template>
  9 +<style>
  10 + .tab-top-fixed {
  11 + position: fixed;
  12 + top: 0;
  13 + left: 0;
  14 + width: 100%;
  15 + z-index: 99;
  16 + }
  17 +
  18 + .resources {
  19 + margin-top: 100px;
  20 + }
  21 +</style>
5 <script> 22 <script>
6 const contentCode = require('content-code'); 23 const contentCode = require('content-code');
7 const qs = require('yoho-qs'); 24 const qs = require('yoho-qs');