提交暂存

liu951104 · Sep 9, 2017 · 364915b · 364915b
1 parent 9956826
commit 364915b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "vue": "^2.3.3",
     "vue-masonry": "^0.10.3",
     "vue-router": "^2.3.1",
+    "vue-scroll-behavior": "^0.1.6",
     "vuex": "^2.3.1"
   },
   "devDependencies": {

diff --git a/src/components/page/onelist.vue b/src/components/page/onelist.vue
@@ -13,7 +13,7 @@
 	  <scroll-more :scroller="scroller" :loading="moreLoading" @load="loadMore" />
     <!-- 加载中 -->
     <loading :loading="loading" />
-    <show-btn  @btnShow="getBool" :showImg="bool"></show-btn>
+    <!-- <show-btn  @btnShow="getBool" :showImg="bool"></show-btn> -->
   </div>
 </template>
 

diff --git a/src/main.js b/src/main.js
@@ -4,8 +4,10 @@ import Vue from 'vue'
 import App from './App'
 import Vuex from 'vuex'
 import axios from 'axios'
-import VueRouter from 'vue-router'
+// import VueRouter from 'vue-router'
 import router from './router'
+import vueScrollBehavior from 'vue-scroll-behavior'
+Vue.use(vueScrollBehavior, { router: router })
 
 import loading from './components/common/loading'
 import scrollMore from './components/common/scrollMore'
@@ -22,7 +24,7 @@ import moment from 'moment';
 Object.defineProperty(Vue.prototype, '$moment', { value: moment });
 
 Vue.use( Vuex )
-Vue.use( VueRouter )
+// Vue.use( VueRouter )
 Vue.prototype.$http = axios
 Vue.config.productionTip = false