提交 c43378b8 编写于 作者: 杨广俊's avatar 杨广俊

cancel

上级 58572dd0
import App from '../App' import App from '../App'
const index = r => require.ensure([], () => r(require('../views/index')), 'index')
const search = r => require.ensure([], () => r(require('../views/search-index')), 'search') const search = r => require.ensure([], () => r(require('../views/search-index')), 'search')
const result = r => require.ensure([], () => r(require('../views/result')), 'result') const result = r => require.ensure([], () => r(require('../views/result')), 'result')
const details = r => require.ensure([], () => r(require('../views/teacher-details')), 'details') const details = r => require.ensure([], () => r(require('../views/teacher-details')), 'details')
...@@ -15,7 +14,7 @@ export default [{ ...@@ -15,7 +14,7 @@ export default [{
}, },
{ {
path: '/index', path: '/index',
component: index component: search
}, },
{ {
path: '/search', path: '/search',
......
...@@ -159,22 +159,14 @@ export default { ...@@ -159,22 +159,14 @@ export default {
}, },
watch: { watch: {
searchText(val){ searchText(val){
console.log(val)
this.searchTextSub = val this.searchTextSub = val
} }
// selected(val) {
// this.showIndex(val)
// // this.searchAll(this.searchText, '1', 'contentAppModels', 'contentAppModelsAll')
// }
}, },
created(){ created(){
this.searchText = this.$route.query.searchText || '' this.searchText = this.$route.query.searchText || ''
// this.searchText = escape(this.$route.query.searchText || '')
console.log(this.searchText)
let _this = this; let _this = this;
window.__getUserInfo = function(params){ window.__getUserInfo = function(params){
_this.token = params.userToken _this.token = params.userToken
// _this.SET_USER_INFO(params)
_this.search() _this.search()
_this.getAdjustData() _this.getAdjustData()
} }
...@@ -338,14 +330,11 @@ export default { ...@@ -338,14 +330,11 @@ export default {
let navConWrapDom = document.querySelector('#navbar-container-wrapper') let navConWrapDom = document.querySelector('#navbar-container-wrapper')
let navConWrapDomOT = document.querySelector('#navbar-container-wrapper').offsetParent.offsetTop; let navConWrapDomOT = document.querySelector('#navbar-container-wrapper').offsetParent.offsetTop;
let scrollTop = document.body.scrollTop || document.documentElement.scrollTop; let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
console.log('this' ,this, scrollTop > 50) if(scrollTop > 5){
if(scrollTop > 2){
this.isShowTop = true this.isShowTop = true
} else { } else {
this.isShowTop = false this.isShowTop = false
} }
console.log(navConWrapDomOT)
console.log(scrollTop)
}, },
backTop() { backTop() {
this.isShowTop = false this.isShowTop = false
......
...@@ -57,60 +57,19 @@ export default { ...@@ -57,60 +57,19 @@ export default {
statusBarHeight: 'statusBarHeight' statusBarHeight: 'statusBarHeight'
}) })
}, },
watch: {
statusBarHeight(val) {
alert('val: ' + JSON.stringify(val))
}
},
created() { created() {
let _self = this; let _self = this;
window.__getUserInfo_S = function(params){ window.__getUserInfo_S = function(params){
// alert(JSON.stringify(params))
_self.token = params.userToken _self.token = params.userToken
// _self.SET_USER_INFO(params)
_self.getData() _self.getData()
} }
window.__getStatusBarHeight = function (param) { window.__getStatusBarHeight = function (param) {
// alert('__getStatusBarHeight: ' + JSON.stringify(param))
_self.setStatusBarHeight(param) _self.setStatusBarHeight(param)
// if (window.__isAndroid) {
// _this.popHeight = parseInt(parm.statusBarHeight) / 2
// } else {
// _this.popHeight = parm.statusBarHeight
// }
// _this.ptop = _this.popHeight + 'px';
// _this.menuptop = _this.popHeight + 36 + 'px'
} }
this.getStatusBarHeight()
}, },
mounted(){ mounted(){
// window.__refresh = function(){
// _self.getUserInfo()
// }
// window.__getStatusBarHeight = function(params){
// _self.SET_NAVBAR_HEIGHT(params)
// }
// window.__getStatusBarHeight = function(parm){
// //lert(parm.statusBarHeight)
// if(window.__isAndroid){
// _this.popHeight = parseInt(parm.statusBarHeight)/2.5
// }else{
// _this.popHeight = parm.statusBarHeight
// }
// _this.ptop = _this.popHeight+'px';
// _this.menuptop = _this.popHeight+'px'
// // alert(parm.statusBarHeight);
// }
// _self.getData()
// if(window.__isWeb) {
// _self.getData()
// }
this.getUserInfo() this.getUserInfo()
// this.isFirstTime() // this.getStatusBarHeight()
// _self.getStatusBarHeight()
}, },
methods: { methods: {
...mapActions({ ...mapActions({
...@@ -157,9 +116,6 @@ export default { ...@@ -157,9 +116,6 @@ export default {
let obj = { let obj = {
} }
console.log(item);
// let url = pageJumpUrl();
// console.log(url.pageListUrl);
let itemData = { let itemData = {
"imageUrl": "", "imageUrl": "",
"appModuleInfo": { "appModuleInfo": {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册