提交 920342ce 编写于 作者: chendeli's avatar chendeli

add

上级 5e3a543e
...@@ -107,6 +107,8 @@ export default { ...@@ -107,6 +107,8 @@ export default {
labelId:item.id, labelId:item.id,
labelvalue:item.name, labelvalue:item.name,
}) })
this.$emit("setRefrshParm",{isclick:true})
let itemData={ let itemData={
"title":item.name, "title":item.name,
"imageUrl":"", "imageUrl":"",
......
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
if(parm == 'list'){ if(parm == 'list'){
rocNative.gotoNewWebActivity({ rocNative.gotoNewWebActivity({
pageUrl: 'https://test1-phome.yunqueyi.com/appl/#/teachers?userToken='+_this.userToken pageUrl: jumpWebPageUrl+'teachers?userToken='+_this.userToken
}) })
}else{ }else{
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<span class="pathologic-icon"> <span class="pathologic-icon">
<img :src="item.imageUrl"/> <img :src="item.imageUrl"/>
</span> </span>
<span class="pathologic-txt fs14">{{item.name}}</span> <!-- <span class="pathologic-txt fs14">{{item.name}}</span> -->
</div> </div>
<div class="clear"></div> <div class="clear"></div>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<YqyFiveMinutes :parmData="fiveList" v-if="fiveList.length>0"/> <YqyFiveMinutes :parmData="fiveList" v-if="fiveList.length>0"/>
<!--为你推荐--> <!--为你推荐-->
<YqyHomeAdjust :isFixed="isFixed" :statusBarHeight="statusBarHeight" :parmData="adjustList" v-if="adjustList.length>0" :userToken="userToken"/> <YqyHomeAdjust :isFixed="isFixed" :statusBarHeight="statusBarHeight" :parmData="adjustList" v-if="adjustList.length>0" :userToken="userToken" v-on:setRefrshParm="getRefrshParm"/>
<!--返回顶部--> <!--返回顶部-->
<BackTop v-if="isShowBackTop"/> <BackTop v-if="isShowBackTop"/>
...@@ -136,6 +136,7 @@ export default { ...@@ -136,6 +136,7 @@ export default {
isHeightFromApp:false, isHeightFromApp:false,
isFirstPull:true, isFirstPull:true,
updateStr:'', updateStr:'',
isRefreshFromBack:false,
} }
}, },
components:{ components:{
...@@ -156,16 +157,29 @@ export default { ...@@ -156,16 +157,29 @@ export default {
}, },
created () { created () {
let _this = this; let _this = this;
_this.getUserInfo();
window.__nativeCallMsg = function(params){ window.__nativeCallMsg = function(params){
_this.msgCount = params.msgNum || ''; _this.msgCount = params.msgNum || '';
} }
window.__refresh = function(params){ window.__refresh = function(params){
alert("__refresh")
// _this.fiveTimePull(); //返回
// _this.initByToken() if(_this.isRefreshFromBack){
// _this.getStatusHight(); //alert(_this.userToken);
_this.getUserInfo(); // _this.adjustList = [];
// _this.newsDatalist = [];
_this.getAdjustData(_this.userToken);
_this.getNewsData(_this.userToken);
}
//第一次进来及时
if(_this.isShowEvluat && !_this.isRefreshFromBack){
_this.isIntStyle = 'font-style pull-down';
_this.fiveTimePull();
}
} }
window.__getStatusBarHeight = function(parm){ window.__getStatusBarHeight = function(parm){
...@@ -192,9 +206,6 @@ export default { ...@@ -192,9 +206,6 @@ export default {
_this.initByToken(parm.userToken); _this.initByToken(parm.userToken);
_this.getSwiper(_this.appVersion,_this.systemType,parm.userToken);
} }
_this.initAll() _this.initAll()
// _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B'; // _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
...@@ -211,8 +222,7 @@ export default { ...@@ -211,8 +222,7 @@ export default {
}, },
mounted(){ mounted(){
//console.log(this.isShowEvluat);
//this.getSwiper();
this.wrapperHeight =document.documentElement.clientHeight - this.$refs.wrapper.getBoundingClientRect().top; this.wrapperHeight =document.documentElement.clientHeight - this.$refs.wrapper.getBoundingClientRect().top;
}, },
...@@ -237,6 +247,10 @@ export default { ...@@ -237,6 +247,10 @@ export default {
}, },
methods:{ methods:{
getRefrshParm(obj){
this.isRefreshFromBack = obj.isclick;
},
//轮播图开始滚动 //轮播图开始滚动
swiperFun(){ swiperFun(){
...@@ -343,11 +357,7 @@ export default { ...@@ -343,11 +357,7 @@ export default {
}else{ }else{
_this.isShowEvluat = _this.evaluctObj.showFlag; _this.isShowEvluat = _this.evaluctObj.showFlag;
if(_this.isShowEvluat){
_this.isIntStyle = 'font-style pull-down';
_this.fiveTimePull();
}
} }
...@@ -637,7 +647,7 @@ export default { ...@@ -637,7 +647,7 @@ export default {
_this.isIntStyle = 'font-style pull-up'; _this.isIntStyle = 'font-style pull-up';
_this.isShowEvluat = false; _this.isShowEvluat = false;
clearInterval(setTimer) clearInterval(setTimer)
},5000); },60000);
}, },
...@@ -655,10 +665,8 @@ export default { ...@@ -655,10 +665,8 @@ export default {
}, },
//获取轮播图数据 //获取轮播图数据
getSwiper(appVersion,systemType,userToken){ getSwiper(){
// let version = '3.7.3',
// sys = 3;
// token = '364ED1F1C8064CEBABF745CFFFDE18CF'
let _this = this, let _this = this,
para = { para = {
category:1, category:1,
...@@ -668,24 +676,7 @@ export default { ...@@ -668,24 +676,7 @@ export default {
setEntry: 'headers' setEntry: 'headers'
} }
} }
// para = {
// version:appVersion,
// systemType:systemType,
// token:userToken,
// data:{
// setEntry: 'headers'
// }
// }
// para = {
// version:version,
// systemType:sys,
// token:_this.token,
// //setEntry: 'headers',
// data:{
// setEntry: 'headers'
// }
// }
this.GET('/contents/HomeColumn/Information', para).then(res => { this.GET('/contents/HomeColumn/Information', para).then(res => {
if(res.code == '000000'){ if(res.code == '000000'){
_this.listSwiper = res.data.iconColumnInformationModels || [] _this.listSwiper = res.data.iconColumnInformationModels || []
...@@ -905,15 +896,15 @@ export default { ...@@ -905,15 +896,15 @@ export default {
box-shadow: 0 px2rem(2px) px2rem(6px) RGBA(42, 94, 161, 0.15); box-shadow: 0 px2rem(2px) px2rem(6px) RGBA(42, 94, 161, 0.15);
border-radius: px2rem(3px); border-radius: px2rem(3px);
background: #fff; background: #fff;
padding: px2rem(12px) 0 px2rem(12px) 0; /* padding: px2rem(12px) 0 px2rem(12px) 0;*/
margin-right: 4%; margin-right: 4%;
text-align: center; text-align: center;
.pathologic-icon{ .pathologic-icon{
height: px2rem(20px); /* height: px2rem(20px);*/
img{ img{
width: px2rem(20px); width: 100%;
height: px2rem(20px); height: 100%;
vertical-align: middle; vertical-align: middle;
display: inline-block; display: inline-block;
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册