Skip to content

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

Merge branch 'dev-app-home-1029'

上级 1570730b e0b358a5
隐藏空白字符变更
内嵌 并排
正在显示 包含 81 行增加 和 33 行删除
src/components/business-new/yqy-adjust.vue
浏览文件 @ 68ad37ba
......@@ -13,7 +13,7 @@
<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)">
<img :src="item.appIndexCourseUrl" class="pic-tec" />
<img :src="item.courseInfoUrl" class="pic-tec" />
<span class="course-tag">{{item.disName}}</span>
</div>
<p class="course-txt">
......@@ -73,6 +73,10 @@ export default {
type:Number,
default:0
},
adjustPageNo:{
type:Number,
default:1
},
userToken:{
type:String,
default:''
......@@ -85,6 +89,7 @@ export default {
mounted(){
this.list = this.parmData;
this.pageNo = this.adjustPageNo;
// if(window.__isAndroid){
// this.popHeight = this.statusBarHeight/2
......@@ -138,7 +143,7 @@ export default {
labelId:item.id,
labelValue :item.name,
})
this.pageNo = 1;
this.$emit("setRefrshParm",{isclick:true})
let itemData={
"title":item.name,
......@@ -177,10 +182,11 @@ export default {
loadMore(){
let _this = this;
// alert(_this.pageNo);
if(!_this.noMore){
_this.pageNo += 1;
_this.isLoading = true;
this.loading = true;
_this.loading = true;
//埋点
this.pageBurialPoin({
menuLevel:1,
......@@ -213,8 +219,6 @@ export default {
type:status,
courseId:id,
setEntry: 'headers',
token:_this.userToken,
setEntry: 'headers',
data:{
token:_this.userToken,
}
......@@ -228,7 +232,7 @@ export default {
}else{
//alert(res.message);
rocNative.showNativeToast({
message: res.message
message: '注册登陆后才能收藏哦'
})
}
})
......@@ -249,7 +253,7 @@ export default {
parm = {
pageNo:_this.pageNo,
pageSize:_this.pageSize,
token:_this.token,
token:_this.userToken,
setEntry: 'headers'
}
......@@ -263,17 +267,19 @@ export default {
_this.noMore = true;
_this.loading = true;
}else{
_this.list = [..._this.list ,...res.data];
_this.isLoading = true;
_this.noMore = false;
_this.loading = false;
}
if(type == 'loadMore'){
_this.list = [..._this.list ,...res.data];
// if(type == 'loadMore'){
// _this.list = [..._this.list ,...res.data];
}else{
_this.list = res.data || [];
}
// }
// else{
// _this.list = res.data || [];
// }
}
///_this.clientHeight = 'auto'
......@@ -448,6 +454,7 @@ export default {
.font-title{
font-size: px2rem(18px);
font-weight: bold;
color: #28344C
}
.title{
......
src/components/business-new/yqy-home-adv.vue
浏览文件 @ 68ad37ba
......@@ -211,9 +211,11 @@ export default {
}
.tea-itemname{
color: RGBA(102, 102, 102, 1);
padding-top: px2rem(5px);
margin-top: px2rem(4px);
font-size: px2rem(13px);
line-height: px2rem(19px);
height: px2rem(19px);
display: inline-block;
}
}
}
......
src/components/business-new/yqy-home-learn-evaluation.vue
浏览文件 @ 68ad37ba
......@@ -81,9 +81,42 @@ export default {
// 跳转到新的web界面
goToPage: function () {
let url =jumpEvaluatPage();
rocNative.gotoNewWebActivity({
pageUrl: url
let url = jumpEvaluatPage();
// rocNative.gotoNewWebActivity({
// pageUrl: url
// })
let itemData={
"title":"",
"imageUrl":"",
"appModuleInfo":{
"code":"M300",
"type":4,
"name":"wwww",
"paramFlag":1,
"paramList":[
{
"key":"pageUrl",
"value": url,
"type":4,
"seqNo":1
},{
"key":"showTitle",
"value": false,
"type":1,
"seqNo":2
},{
"key":"title",
"value": '',
"type":1,
"seqNo":3
}
]
}
};
rocNative.dispatchEventByModuleCode({
modeCode: itemData.appModuleInfo.code,
jsonString: itemData.appModuleInfo.paramList
})
this.pageBurialPoin({
menuLevel:1,
......
src/components/business-new/yqy-teacher-list.vue
浏览文件 @ 68ad37ba
......@@ -7,7 +7,7 @@
<div class="couse-list">
<div :class="index%2==1 ? 'course-item end-left' : 'course-item'" :key="index" v-for="(item,index) in parmData">
<div class="course-pic" @click="goToPage(item)">
<img :src="item.appIndexCourseUrl" class="pic-tec" />
<img :src="item.courseInfoUrl" class="pic-tec" />
<span class="course-tag">{{item.disName}}</span>
</div>
<p class="course-txt">
......@@ -129,7 +129,7 @@ export default {
}else{
//alert(res.message);
rocNative.showNativeToast({
message: res.message
message: '注册登陆后才能收藏哦'
})
}
})
......@@ -266,6 +266,7 @@ export default {
height: px2rem(18px);
margin: 0 0 px2rem(21px) 0;
font-weight: bold;
color:#28344C
}
......
src/utils/index.js
浏览文件 @ 68ad37ba
......@@ -236,19 +236,20 @@ export function jumpEvaluatPage(){
// const baseUrl = 'https://dev-sc.yunqueyi.com/'
// const apiUrl = 'https://dev-api.yunqueyi.com/'
// // test1地址
// 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/#/'
// uat地址
const baseUrl = 'https://uat-sc.yunqueyi.com/'
const apiUrl = 'https://uat-api.yunqueyi.com/'
const evaluatPageUrl = 'https://uat-phome.yunqueyi.com/gpr/#/home'
export const jumpWebPageUrl = 'https://uat-phome.yunqueyi.com/appl/#/'
// // pro地址
// pro地址
// const baseUrl = 'https://sc.yunqueyi.com/'
// const apiUrl = 'https://api.yunqueyi.com/'
// const evaluatPageUrl = 'https://phome.yunqueyi.com/gpr/#/home'
......
src/views/home/home-new.vue
浏览文件 @ 68ad37ba
......@@ -64,7 +64,7 @@
<YqyFiveMinutes :parmData="fiveList" v-if="fiveList.length>0"/>
<!--为你推荐-->
<YqyHomeAdjust :isFixed="isFixed" :statusBarHeight="statusBarHeight" :parmData="adjustList" v-if="adjustList.length>0" :userToken="userToken" v-on:setRefrshParm="getRefrshParm"/>
<YqyHomeAdjust :isFixed="isFixed" :statusBarHeight="statusBarHeight" :parmData="adjustList" v-if="adjustList.length>0" :userToken="userToken" v-on:setRefrshParm="getRefrshParm" :adjustPageNo="adjustPageNo"/>
<!--返回顶部-->
<BackTop v-if="isShowBackTop"/>
......@@ -144,7 +144,7 @@ export default {
isFailCatagory3:false,
isFailTeaches:false,
isFailFive:false,
adjustPageNo:1,
}
},
components:{
......@@ -184,6 +184,7 @@ export default {
window.__refresh = function(params){
_this.isShowEvluat = false;
_this.isIntStyle = '';
_this.adjustPageNo = 1;
//返回
if(_this.isRefreshFromBack){
......@@ -213,8 +214,8 @@ export default {
// alert("token之前");
window.__getUserInfo = function(parm){
// alert("__getUserInfo");
// alert(JSON.stringify(parm))
// alert(JSON.stringify(parm))
_this.systemType = parm.systemType;
_this.appVersion = parm.appVersion;
_this.token = parm.userToken;
......@@ -224,8 +225,10 @@ export default {
if(parm.userMobile != ''){
_this.getKeepData(parm.userToken);
}
_this.initByToken(parm.userToken);
}
......@@ -233,12 +236,12 @@ export default {
// _this.token = 'BE1D60CAE8F24649B4F72D47E964A58B';
// _this.token = '2AAB78CDCD664925969B296FCB2F01CF';
// _this.msgCount = '2'
// _this.isShowKeep = true;
// _this.isHeightFromApp = true;
// _this.getKeepData(_this.userToken);
// _this.initByToken(_this.token);
// _this.initByToken(_this.token);
// _this.getIconData(_this.token);
// _this.isIntStyle = 'font-style pull-down';
// _this.fiveTimePull();
......@@ -250,7 +253,7 @@ export default {
mounted(){
this.wrapperHeight =document.documentElement.clientHeight - this.$refs.wrapper.getBoundingClientRect().top;
// this.wrapperHeight =document.documentElement.clientHeight - this.$refs.wrapper.getBoundingClientRect().top;
window.addEventListener('scroll', this.scrollFun);
},
......@@ -318,7 +321,7 @@ export default {
var swiper = new Swiper('.swiper-container', {
speed: 600,
            loop: true,
            //loop: true,
            observer:true,
            observeParents:true,
            autoplayDisableOnInteraction : false,
......@@ -407,7 +410,7 @@ export default {
}
}
this.GET('contents/gp/v1/homepage', para).then(res => {
_this.GET('contents/gp/v1/homepage', para).then(res => {
if(res.code == '000000'){
// res.data = {
// avatarImageUrl: "https://test-file.yunqueyi.com/File/doctor_default.png",
......@@ -609,6 +612,7 @@ export default {
if(res.code === '000000'){
_this.adjustList = res.data || [];
_this.adjustPageNo = 1;
if(_this.adjustList.length>0){
_this.userToken = userToken
......@@ -743,7 +747,7 @@ export default {
_this.isShowEvluat = false;
///alert("0")
clearInterval(setTimer)
},5000);
},30000);
},
......@@ -773,7 +777,7 @@ export default {
}
}
this.GET('/contents/HomeColumn/Information', para).then(res => {
this.GET('contents/HomeColumn/Information', para).then(res => {
if(res.code == '000000'){
_this.listSwiper = res.data.iconColumnInformationModels || [];
......@@ -796,7 +800,7 @@ export default {
category: 1,
position:2,
setEntry: 'headers',
token:_this.token
// token:_this.token
}
this.GET('contents/HomeColumn/Information', para).then(res => {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或