Skip to content

Commit

Permalink
nt
Browse files Browse the repository at this point in the history
  • Loading branch information
bailicangdu committed Jun 14, 2017
1 parent dc5321e commit 2d325bc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion src/frames/conversation/singlechat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
async clickSend(){
this.conversine.push({
"wxid":"xulianjie442154157",
"headurl":imgurl+'chen.jpg',
"headurl":imgurl+this.userInfo.avatar,
"sendobject":0,
"Messageblob":this.inputmessage,
});
Expand Down
9 changes: 0 additions & 9 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ const router = new VueRouter({
mode:'history', //路由模式
strict: process.env.NODE_ENV !== 'production',
scrollBehavior (to, from, savedPosition) {
alert(1)
if(savedPosition){
console.log(1)
return savedPosition
} else {
return {x:0,y:to.meta.savedPosition || 0}
Expand All @@ -34,13 +32,6 @@ router.beforeEach((to, from, next) => {
next()
})

router.beforeEach((to, from, next) => {
if(from.meta.keepAlive){
from.meta.savedPosition = document.body.scrollTop;
}
next()
})

new Vue({
router,
store,
Expand Down

0 comments on commit 2d325bc

Please sign in to comment.