Skip to content

P
pica.cloud.web-admin-discuss
提交 dda24297 编写于 作者: gjyang's avatar gjyang
浏览文件
操作

Merge branch 'dev-app-home-1029' into Branch_tag-app

上级 85e0eacb 9228c7fe
隐藏空白字符变更
内嵌 并排
正在显示 包含 138 行增加 和 65 行删除
src/components/business-new/yqy-adjust.vue
浏览文件 @ dda24297
<template>
<div class="cource-teach" id="adjust-u">
<div :class="isFixed ? 'cource-header fixed' : 'cource-header'" :style="{height:menuHeight}">
<div class="font-title" :style="{paddingTop:ptop}">
{{title}}
<div :class="isFixed ? 'cource-header fixed' : 'cource-header'" :style="{height:menuptop}">
<div class="fixBox">
<div class="bgFill" :style="{height:ptop}"></div>
<div class="font-title">
{{title}}
</div>
</div>
</div>
<div>
<div class="couse-cont">
<div class="couse-list" v-infinite-scroll="loadMore" infinite-scroll-disabled="loading" infinite-scroll-distance="10" :style="'height:'+clientHeight">
<div :class="index%2==1 ? 'course-item end-left' : 'course-item'" :key="index" v-for="(item,index) in list">
<div class="course-pic" @click="goToPage(item)">
......@@ -57,8 +59,9 @@ export default {
clientHeight:'auto',
isShowLoading:true,
menuHeight:0,
ptop:0,
popHeight:0
ptop:20,
popHeight:27,
menuptop:45,
}
},
props:{
......@@ -82,21 +85,42 @@ export default {
mounted(){
this.list = this.parmData;
if(window.__isAndroid){
this.popHeight = this.statusBarHeight/2
}else{
this.popHeight = this.statusBarHeight
}
this.menuHeight = this.popHeight + 7 + 40 + "px";
this.ptop = this.popHeight + "px";
// if(window.__isAndroid){
// this.popHeight = this.statusBarHeight/2
// }else{
// this.popHeight = this.statusBarHeight
// }
// this.menuHeight = this.popHeight + 7 + 40 + "px";
// this.ptop = this.popHeight + "px";
// this.getData();
},
created(){
let _this = this;
window.__getStatusBarHeight = function(parm){
if(window.__isAndroid){
_this.popHeight = parm.statusBarHeight/2
}else{
_this.popHeight = parm.statusBarHeight
}
_this.ptop = _this.popHeight+7+'px';
_this.menuptop = _this.popHeight+7+36+'px'
// alert(parm.statusBarHeight+'kkkkk');
}
this.getStatusHight()
},
watch:{
},
components:{
// LOADING
},
methods: {
getStatusHight(){
rocNative.getStatusBarHeight({
__funcName: '__getStatusBarHeight'
......@@ -278,16 +302,28 @@ export default {
overflow: hidden;
}
.cource-teach{
.bgFill{
background: inherit;
height: px2rem(20px);
}
.cource-teach .cource-header,.couse-cont{
padding:0 px2rem(15px);
}
.couse-cont{
}
.fixBox{
}
.cource-header{
/* margin: 0 0 px2rem(11px) 0;*/
overflow: hidden;
/*height: px2rem(45px);*/
margin-bottom: px2rem(15px);
.font-title{
line-height: px2rem(40px);
/*height: px2rem(40px);*/
line-height: px2rem(36px);
height: px2rem(36px);
background: #fff;
}
}
......@@ -316,16 +352,23 @@ export default {
}
}
.fixed{
background: #fff;
.font-title{
.fixBox{
position: fixed;
top:0;
left: 0;
width: 100%;
background: #fff;
z-index: 112;
padding: 0 px2rem(15px);;
.font-title{
background: #fff;
padding:0 px2rem(15px);
}
}
.bgFill{
background: #ddd
}
}
.course-item{
float: left;
......@@ -404,7 +447,7 @@ export default {
.font-title{
font-size: px2rem(18px);
font-weight: bold;
}
.title{
font-size: px2rem(16px);
......
src/components/business-new/yqy-five-minutes.vue
浏览文件 @ dda24297
......@@ -6,7 +6,7 @@
更多<img src="../../images/right-throw.png" class="thorw-icon"/>
</div>
</div>
<div class="teacher-item" :key="index" v-for="(item,index) in list" @click="goToPage(item)">
<div :class="index>1 && (index+1 == list.length)?'teacher-item item-end' : 'teacher-item'" :key="index" v-for="(item,index) in list" @click="goToPage(item)">
<div class="teacher-itemimg">
<img :src="item.appImageUrl"/>
</div>
......@@ -72,7 +72,7 @@ export default {
},
mounted(){
console.log(this.parmData);
//console.log(this.parmData);
this.list = this.parmData;
},
methods: {
......@@ -217,8 +217,10 @@ export default {
}
.five-more{
border: 1px solid RGBA(169, 174, 183, 1);
border-radius: px2rem(9px);
padding: px2rem(3px) px2rem(5px) px2rem(2px) px2rem(6px);
border-radius: px2rem(16px);
height: px2rem(16px);
line-height: px2rem(16px);
padding: 0 px2rem(5px) 0 px2rem(6px);
vertical-align: middle;
}
.teacher-item{
......@@ -362,5 +364,8 @@ export default {
}
}
}
.item-end{
height: px2rem(60px);
}
}
</style>
src/components/business-new/yqy-home-header.vue
浏览文件 @ dda24297
......@@ -6,7 +6,7 @@
<img v-if="searchFix" class="search-img" src='../../images/search-grey.png'>
<img v-else class="search-img" src='../../images/search-white.png'>
</div> -->
<div class="bgFill"></div>
<div class="bgFill" :style="{height:ptop}"></div>
<div class="fixBox">
<div class="header-right" @click="goToPage">
<img v-if="searchFix" class="info" src='../../images/msg2.png'>
......@@ -49,23 +49,33 @@ export default {
default:false,
}
},
watch:{
// searchFix:function(n){
// if(n){
// alert(this.searchFix)
// }
// }
},
created(){
let _this = this;
window.__getStatusBarHeight = function(parm){
if(window.__isAndroid){
_this.popHeight = parm.statusBarHeight/2
}else{
_this.popHeight = parm.statusBarHeight
}
_this.ptop = _this.popHeight+7+'px';
_this.menuptop = _this.popHeight+7+'px'
// alert(parm.statusBarHeight);
}
this.getStatusHight()
},
mounted(){
// this.getStatusHight();
// if(window.__isAndroid){
// this.popHeight = this.statusBarHeight/2
......@@ -144,7 +154,7 @@ html,body{
}
}
.bgFill{
background: #ddd;
background: inherit;
height: 20px;
}
.fs30{
......@@ -179,6 +189,9 @@ html,body{
padding-top: px2rem(7px)
}
.bgFill{
background: #ddd;
}
.search-transparent::-webkit-input-placeholder{
color:#666;
}
......
src/utils/index.js
浏览文件 @ dda24297
......@@ -237,10 +237,10 @@ export function jumpEvaluatPage(){
// const apiUrl = 'https://dev-api.yunqueyi.com/'
// test1地址
// const baseUrl = 'https://test1-sc.yunqueyi.com/'
// const apiUrl = 'https://test1-api.yunqueyi.com/'
// const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'
// export const jumpWebPageUrl = 'https://test1-phome.yunqueyi.com/appl/#/'
const baseUrl = 'https://test1-sc.yunqueyi.com/'
const apiUrl = 'https://test1-api.yunqueyi.com/'
const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'
export const jumpWebPageUrl = 'https://test1-phome.yunqueyi.com/appl/#/'
......
src/views/home/home-new.vue
浏览文件 @ dda24297
......@@ -130,7 +130,7 @@ export default {
msgCount:'',
userToken:'',
searchFix:false,
statusBarHeight:20,
statusBarHeight:0,
userMobile:'',
userToken:'',
isHeightFromApp:false,
......@@ -158,6 +158,7 @@ export default {
},
created () {
let _this = this;
_this.initAll()
_this.getUserInfo();
window.__nativeCallMsg = function(params){
......@@ -175,7 +176,8 @@ export default {
window.__refresh = function(params){
//__getToken()
// alert('__refresh');
//alert(JSON.stringify(params))
//返回
if(_this.isRefreshFromBack){
......@@ -188,23 +190,28 @@ export default {
_this.isIntStyle = 'font-style pull-down';
_this.fiveTimePull();
} else {
//alert("000")
_this.isIntStyle = '';
_this.isShowEvluat = false;
_this.getUserInfo();
}
}
window.__getStatusBarHeight = function(parm){
_this.statusBarHeight = parm.statusBarHeight;
_this.isHeightFromApp = true;
// alert(parm.statusBarHeight);
// window.__getStatusBarHeight = function(parm){
// alert(JSON.stringify(parm))
// _this.statusBarHeight = parm.statusBarHeight;
// _this.isHeightFromApp = true;
// // alert(parm.statusBarHeight);
}
// }
// alert("token之前");
window.__getUserInfo = function(parm){
// alert("token:"+parm.userToken);
// alert("__getUserInfo");
// alert(JSON.stringify(parm))
_this.systemType = parm.systemType;
_this.appVersion = parm.appVersion;
_this.token = parm.userToken;
......@@ -218,19 +225,20 @@ export default {
_this.initByToken(parm.userToken);
}
_this.getStatusHight();
_this.initAll()
//_this.getStatusHight();
// _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
// _this.msgCount = '2'
// _this.isShowKeep = true;
// _this.isHeightFromApp = true;
// _this.getKeepData(_this.userToken);
// _this.initByToken(_this.token);
// _this.getIconData(_this.token);
// _this.isIntStyle = 'font-style pull-down';
// _this.fiveTimePull();
// _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
// _this.msgCount = '2'
// _this.isShowKeep = true;
// _this.isHeightFromApp = true;
// _this.getKeepData(_this.userToken);
// _this.initByToken(_this.token);
// _this.getIconData(_this.token);
// _this.isIntStyle = 'font-style pull-down';
// _this.fiveTimePull();
//_this.getUserInfo();
......@@ -240,6 +248,7 @@ export default {
mounted(){
this.wrapperHeight =document.documentElement.clientHeight - this.$refs.wrapper.getBoundingClientRect().top;
window.addEventListener('scroll', this.scrollFun);
},
beforeDestroyed(){
......@@ -304,7 +313,7 @@ export default {
this.getAdjustData(userToken);
this.getNewsData(userToken);
this.getEvaluctData(userToken);
window.addEventListener('scroll', this.scrollFun);
},
initAll(){
......@@ -670,7 +679,7 @@ export default {
}
var searchBox = document.querySelector('#search-top').offsetParent.offsetTop;
//console.log(newCourseTop);
//console.log(searchBox);
if(scrollTop +clientHeight/2 >= newCourseTop){
//alert('scrollTop:'+scrollTop+'newCourseTop:'+newCourseTop);
//this.showNewCorse = false;
......@@ -678,12 +687,7 @@ export default {
}else{
this.isShowBackTop = false;
}
if(scrollTop > searchBox){
///console.log(scrollTop,searchBox);
this.searchFix = true;
}else{
this.searchFix = false;
}
if(scrollTop+30 >= adjustTop){
this.isFixed = true;
this.searchFix = false;
......@@ -691,6 +695,14 @@ export default {
this.isFixed = false;
}
if(scrollTop > searchBox){
//alert("000");
///console.log(scrollTop,searchBox);
this.searchFix = true;
}else{
this.searchFix = false;
}
},
//五秒之后收起
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或