Skip to content

W
wechatapp.shangjiadao.com
Commit c8f3b39a authored by lvtz's avatar lvtz
Browse files
Options

fix onlinecourse

parent e4be7ecf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 438 additions and 206 deletions
constants/api.js
View file @ c8f3b39a
...@@ -209,6 +209,7 @@ const apis = { ...@@ -209,6 +209,7 @@ const apis = {
websitelikes: `${api}student/website/likes`, //点赞 websitelikes: `${api}student/website/likes`, //点赞
websitecomments: `${api}student/website/comments`, //评论和回复 websitecomments: `${api}student/website/comments`, //评论和回复
websitecommentslist: `${api}student/website/comments`, //获取评论列表 websitecommentslist: `${api}student/website/comments`, //获取评论列表
websitecommentsnew: `${api}student/website/new_comments`, //评论和回复 新
websiteintros: `${api}common/website/intros`, //学校介绍列表 websiteintros: `${api}common/website/intros`, //学校介绍列表
dataconsumer: `${api}common/data/consumer`, //c端数据埋点 dataconsumer: `${api}common/data/consumer`, //c端数据埋点
websitehome: `${api}common/website/home`, //获取微官网基本数据 websitehome: `${api}common/website/home`, //获取微官网基本数据
...@@ -219,7 +220,8 @@ const apis = { ...@@ -219,7 +220,8 @@ const apis = {
newslist: `${api}common/news`, //C端-机构新鲜事列表创 待删 newslist: `${api}common/news`, //C端-机构新鲜事列表创 待删
newsdetail: `${api}student/news/detail`, //C端-机构新鲜详情 newsdetail: `${api}student/news/detail`, //C端-机构新鲜详情
teacherlist: `${api}common/website/teachers`,//名师列表 teacherlist: `${api}common/website/teachers`,//名师列表
onlinecourseslist: `${api}common/website/online_courses`, //C端-在线课列表 onlinecoursesApi: `${api}student/online_courses`, //C端-在线课列表
onlinecourseslist: `${api}common/website/online_courses`, //C端-在线课列表 首页推荐
onlinecoursesdetail: `${api}student/online_courses/detail`, //C端-在线课列表详情 onlinecoursesdetail: `${api}student/online_courses/detail`, //C端-在线课列表详情
onlinesubcourses: `${api}student/online_courses/sub_courses`, //C端-线上课专栏对应的单课列表 onlinesubcourses: `${api}student/online_courses/sub_courses`, //C端-线上课专栏对应的单课列表
onlinecoursesverifypwd: `${api}student/online_courses/verify_pwd`, //C端-线上课堂验证密码接口 onlinecoursesverifypwd: `${api}student/online_courses/verify_pwd`, //C端-线上课堂验证密码接口
......
service/customer/websiteindex.js
View file @ c8f3b39a
...@@ -37,6 +37,14 @@ function websitecommentslist (data) { ...@@ -37,6 +37,14 @@ function websitecommentslist (data) {
errorresolve: 1, errorresolve: 1,
}) })
} }
function websitecommentslistNew (data) {
return wxRequest({
url: apis.customer.websiteindex.websitecommentsnew,
data,
method: 'GET',
errorresolve: 1,
})
}
function websiteintros (data) { function websiteintros (data) {
return wxRequest({ return wxRequest({
url: apis.customer.websiteindex.websiteintros, url: apis.customer.websiteindex.websiteintros,
...@@ -141,6 +149,14 @@ function adslistGet (data) { ...@@ -141,6 +149,14 @@ function adslistGet (data) {
notExactly: true notExactly: true
}) })
} }
function webonlinecourseslistGet (data) {
return wxRequest({
url: apis.customer.websiteindex.onlinecoursesApi,
data,
method: 'GET',
errorresolve: 1,
})
}
function onlinecourseslistGet (data) { function onlinecourseslistGet (data) {
return wxRequest({ return wxRequest({
url: apis.customer.websiteindex.onlinecourseslist, url: apis.customer.websiteindex.onlinecourseslist,
...@@ -195,7 +211,8 @@ export { ...@@ -195,7 +211,8 @@ export {
bulletscreens, bulletscreens,
websitelikes, websitelikes,
websitecomments, websitecomments,
websitecommentslist, websitecommentslist,
websitecommentslistNew,
websiteintros, websiteintros,
dataconsumer, dataconsumer,
websitehome, websitehome,
...@@ -207,6 +224,7 @@ export { ...@@ -207,6 +224,7 @@ export {
teacherDetailGet, teacherDetailGet,
adslistGet, adslistGet,
newsdetailGet, newsdetailGet,
webonlinecourseslistGet,
onlinecourseslistGet, onlinecourseslistGet,
onlinecoursesdetailGet, onlinecoursesdetailGet,
onlinesubcoursesGet, onlinesubcoursesGet,
......
src/pages/websiteindex/index.js
View file @ c8f3b39a
...@@ -483,7 +483,7 @@ Page({ ...@@ -483,7 +483,7 @@ Page({
case 'moment': case 'moment':
url = `/src/pages/websiteindex/momentlist?sid=${this.data.sid}`; url = `/src/pages/websiteindex/momentlist?sid=${this.data.sid}`;
break; break;
case '': case 'subjectlist':
url = `/src/pages/websiteindex/subjectlist?sid=${this.data.sid}`; url = `/src/pages/websiteindex/subjectlist?sid=${this.data.sid}`;
break; break;
case 'fresh': case 'fresh':
...@@ -600,6 +600,8 @@ Page({ ...@@ -600,6 +600,8 @@ Page({
// 线上课 // 线上课
onlineCoursesListGet() { onlineCoursesListGet() {
onlinecourseslistGet({ onlinecourseslistGet({
page: 1,
perPage: 4,
school_id: this.data.sid school_id: this.data.sid
}).then((res) => { }).then((res) => {
const { const {
...@@ -608,7 +610,7 @@ Page({ ...@@ -608,7 +610,7 @@ Page({
} = res; } = res;
if (code == 200) { if (code == 200) {
this.setData({ this.setData({
onlineCoursesList: data.list.slice(0, 4) onlineCoursesList: data.list
}) })
} }
}) })
...@@ -1329,11 +1331,11 @@ Page({ ...@@ -1329,11 +1331,11 @@ Page({
} = e.currentTarget.dataset; } = e.currentTarget.dataset;
if (item.type == 2) { if (item.type == 2) {
wx.navigateTo({ wx.navigateTo({
url: `/src/pages/websiteindex/onlineclassroomindex?sid=${this.data.sid}&onlineCourseId=${item.id}`, url: `/src/pages/websiteindex/onlineclassroomindex?sid=${this.data.sid}&onlineCourseId=${item.online_course_id}`,
}) })
} else { } else {
wx.navigateTo({ wx.navigateTo({
url: `/src/pages/websiteindex/onlineclassroomplay?sid=${this.data.sid}&onlineCourseId=${item.id}`, url: `/src/pages/websiteindex/onlineclassroomplay?sid=${this.data.sid}&onlineCourseId=${item.online_course_id}`,
}) })
} }
}, },
......
src/pages/websiteindex/index.wxml
View file @ c8f3b39a
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<view class="section-wrap section-ad" wx:if="{{adsTotal>0}}"> <view class="section-wrap section-ad" wx:if="{{adsTotal>0}}">
<swiper indicator-dots="{{false}}" autoplay="{{true}}" circular="{{true}}" style="height:180rpx;"> <swiper indicator-dots="{{false}}" autoplay="{{true}}" circular="{{true}}" style="height:180rpx;">
<swiper-item wx:for="{{adsList}}" wx:key="index"> <swiper-item wx:for="{{adsList}}" wx:key="index">
<image class="cover" src="http://shangjiadao.oss-cn-hangzhou.aliyuncs.com/qingxiao/biz/image/common/defaultCourseImg.png" mode="aspectFill"/> <image class="cover" src="{{filter.imagify(item.cover)}}" mode="aspectFill"/>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
<view class="content-box"> <view class="content-box">
<view class="online-item" bindtap="goOnlineClass" data-item="{{item}}" wx:for="{{onlineCoursesList}}" wx:key="index"> <view class="online-item" bindtap="goOnlineClass" data-item="{{item}}" wx:for="{{onlineCoursesList}}" wx:key="index">
<view class="cover-box"> <view class="cover-box">
<image class="cover" src="{{filter.imagify(item.cover, 'image/resize,w_600/format,jpg')}}" mode="aspectFill" wx:if="{{item.cover}}" /> <image class="cover" src="{{filter.imagify(item.online_course.cover, 'image/resize,w_600/format,jpg')}}" mode="aspectFill" wx:if="{{item.online_course.cover}}" />
<image class="cover" src="{{filter.imagify('qingxiao/biz/image/course/courseDefaultImg.png')}}" mode="aspectFill" wx:else/> <image class="cover" src="{{filter.imagify('qingxiao/biz/image/course/courseDefaultImg.png')}}" mode="aspectFill" wx:else/>
<view class="count-box"> <view class="count-box">
<image class="icon" src="{{localImageRoot}}2c/websiteindex/icon_eye.png?{{imageVersion}}"/>{{item.online_course.study_count}}人已学习 <image class="icon" src="{{localImageRoot}}2c/websiteindex/icon_eye.png?{{imageVersion}}"/>{{item.online_course.study_count}}人已学习
......
src/pages/websiteindex/index.wxss
View file @ c8f3b39a
...@@ -921,6 +921,7 @@ page{ ...@@ -921,6 +921,7 @@ page{
} }
.online-classroom .content-box .online-item .cover-box .cover{ .online-classroom .content-box .online-item .cover-box .cover{
width: 100%; width: 100%;
height: 100%;
} }
.online-classroom .content-box .online-item .cover-box .count-box{ .online-classroom .content-box .online-item .cover-box .count-box{
width: 100%; width: 100%;
...@@ -1072,4 +1073,5 @@ page{ ...@@ -1072,4 +1073,5 @@ page{
} }
.section-ad .cover{ .section-ad .cover{
width: 100%; width: 100%;
height: 100%;
} }
\ No newline at end of file
src/pages/websiteindex/onlineclassroomindex.js
View file @ c8f3b39a
...@@ -263,6 +263,7 @@ Page({ ...@@ -263,6 +263,7 @@ Page({
}).then((res)=>{ }).then((res)=>{
const {code, data} = res; const {code, data} = res;
if(code == 200){ if(code == 200){
data.tags = data.tags ? JSON.parse(data.tags) : '';
this.setData({ this.setData({
websitehome: data websitehome: data
}) })
......
src/pages/websiteindex/onlineclassroomindex.wxml
View file @ c8f3b39a
...@@ -13,15 +13,35 @@ ...@@ -13,15 +13,35 @@
</view> </view>
<view class="title-box"> <view class="title-box">
<view class="title">{{coursesDetail.title}}</view> <view class="title">{{coursesDetail.title}}</view>
<view class="subtitle">{{coursesDetail.remark}}</view> <view class="subtitle" wx:if="{{coursesDetail.remark}}">{{coursesDetail.remark}}</view>
</view> </view>
<view class="phase-count"> <image class="" src="{{imageRoot}}2c/websiteindex/bookicon.png?{{imageVersion}}" /> 已更新{{coursesDetail.sub_courses_count}}期</view> <view class="learncountbox">
<view class="left">
<view class="studentboxavatarbox">
<block wx:for="{{coursesDetail.visitors}}" wx:key="index">
<image class="studentboxavatar" src="{{filter.imagify(item.visitor_student.avatar)}}" wx:if="{{item.visitor_student.avatar}}"></image>
<image class="studentboxavatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
</block>
<image class="studentboxavatar" src="{{imageRoot}}2c/onlineclass/moreicon.png?{{imageVersion}}"></image>
<text class="learncount">{{coursesDetail.study_count + coursesDetail.real_study_count}}人已学习</text>
</view>
<view class="coursecount">
<image class="newicon" src="{{imageRoot}}2c/onlineclass/newicon.png?{{imageVersion}}"></image>
<view class="coursecounttext">已更新{{coursesDetail.sub_courses_count}}期</view>
</view>
</view>
<!-- <image class="shareicon" bindtap="ShowShareDailog" src="{{imageRoot}}2c/onlineclass/shareicon.png?{{imageVersion}}"></image> -->
</view>
<!-- <view class="phase-count">
<image class="" src="{{imageRoot}}2c/onlineclass/newicon.png?{{imageVersion}}"/>已更新{{coursesDetail.sub_courses_count}}期
</view> -->
</view> </view>
<view class="line-16"></view> <view class="line-16"></view>
<view class="content-box"> <view class="content-box">
<tab bind:onChange="tabChange" currentIndex="{{curTabIndex}}" floatTab="{{floatTab}}"> <tab bind:onChange="tabChange" currentIndex="{{curTabIndex}}" floatTab="{{floatTab}}">
<view slot="tab-left"> <view slot="tab-left">
<view class="tab-item {{curTabIndex == 0 ? 'act-tab' : ''}}" data-index="{{0}}">简介</view> <view class="tab-item tab-itemSet {{curTabIndex == 0 ? 'act-tab' : ''}}" data-index="{{0}}">简介</view>
</view> </view>
<view slot="tab-right"> <view slot="tab-right">
<view class="tab-item {{curTabIndex == 1 ? 'act-tab' : ''}}" data-index="{{1}}">目录 <view class="tab-item {{curTabIndex == 1 ? 'act-tab' : ''}}" data-index="{{1}}">目录
...@@ -69,12 +89,14 @@ ...@@ -69,12 +89,14 @@
<view class="logo-box"> <view class="logo-box">
<image class="logo" src="{{filter.imagify(websitehome.school.logo, 'image/resize,w_160/format,jpg')}}" /> <image class="logo" src="{{filter.imagify(websitehome.school.logo, 'image/resize,w_160/format,jpg')}}" />
</view> </view>
<view class="business-name"> <view class="business-name">
<view class="title">{{websitehome.title}}</view> <view class="title">{{websitehome.title}}</view>
<view class="man-count">{{websitehome.recommend_count || 1000}}人<text class="" selectable="false" space="false" decode="false">推荐</text></view> <view class="info-num-box" wx:if="{{websitehome.tags.length>0}}">
</view> <view class="num-item" wx:for="{{websitehome.tags}}" wx:key="index">{{item}}</view>
</view>
</view>
</view> </view>
<view class="in-btn" >进店</view> <view class="in-btn">查看</view>
</view> </view>
</view> </view>
<view slot="tcontent-right" class="swiper-wrapper"> <view slot="tcontent-right" class="swiper-wrapper">
...@@ -179,7 +201,7 @@ ...@@ -179,7 +201,7 @@
<view class="man-count">{{websitehome.recommend_count || 1000}}人<text class="" selectable="false" space="false" decode="false">推荐</text></view> <view class="man-count">{{websitehome.recommend_count || 1000}}人<text class="" selectable="false" space="false" decode="false">推荐</text></view>
</view> </view>
</view> </view>
<view class="in-btn" >进店</view> <view class="in-btn" >查看</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
......
src/pages/websiteindex/onlineclassroomindex.wxss
View file @ c8f3b39a
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.container{ .container{
position: relative; position: relative;
/* min-height: 100vh; */ /* min-height: 100vh; */
/* padding-bottom: 40rpx; */ padding-bottom: 120rpx;
} }
.top-box{ .top-box{
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
z-index: 2; z-index: 2;
} }
.top-box .title-box{ .top-box .title-box{
padding: 24rpx 24rpx 0 24rpx; padding: 28rpx 24rpx 20rpx 24rpx;
/* border-bottom: 2rpx solid rgba(247,247,249,1); */ /* border-bottom: 2rpx solid rgba(247,247,249,1); */
} }
.top-box .title-box .title{ .top-box .title-box .title{
...@@ -109,36 +109,88 @@ ...@@ -109,36 +109,88 @@
font-family:PingFangSC-Medium,PingFang SC; font-family:PingFangSC-Medium,PingFang SC;
font-weight:700; font-weight:700;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
line-height:1; line-height:48rpx;
padding-bottom: 10rpx;
word-break: break-all; word-break: break-all;
} }
.top-box .title-box .subtitle{ .top-box .title-box .subtitle{
font-size:24rpx; font-size: 22rpx;
font-family:PingFangSC-Light,PingFang SC; font-family:PingFangSC-Light,PingFang SC;
font-weight:300; color:#999;
color:rgba(127,123,123,1); line-height: 34rpx;
line-height:1;
word-break: break-all; word-break: break-all;
padding-top: 20rpx;
}
.learncountbox {
padding: 0 24rpx 0 24rpx;
display: flex;
align-items: flex-start;
justify-content: space-between;
margin-bottom: 18rpx;
}
.learncountbox .shareicon {
width: 114rpx;
height: 114rpx;
display: block;
margin-top: -10rpx;
}
.divideline {
width: 702rpx;
margin: 0 auto;
border-bottom: 1px solid #EEEEEE;
}
.coursecount {
display: flex;
align-items: center;
}
.coursecount .newicon {
width: 24rpx;
height: 24rpx;
margin-right: 6rpx;
}
.coursecount .coursecounttext {
color: #666666;
font-size: 22rpx;
}
.studentboxavatarbox {
display: flex;
align-items: center;
margin-bottom: 20rpx;
}
.studentboxavatarbox .studentboxavatar {
display: block;
width: 48rpx;
height: 48rpx;
border-radius: 50%;
position: relative;
margin-left: -12rpx;
}
.studentboxavatarbox .studentboxavatar:first-child {
margin-left: 0;
}
.studentboxavatarbox .learncount {
padding-left: 13rpx;
color: #999999;
font-size: 22rpx;
} }
.top-box .phase-count{ .top-box .phase-count{
padding: 12rpx 24rpx 10rpx 24rpx; padding: 12rpx 24rpx 10rpx 24rpx;
font-size:20rpx; font-size:22rpx;
font-family:PingFangSC-Medium,PingFang SC; font-family:PingFangSC-Medium,PingFang SC;
font-weight:400; font-weight:400;
color:rgba(153,153,153,1); color:#666;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.top-box .phase-count image{ .top-box .phase-count image{
width: 20rpx; width: 24rpx;
height: 24rpx; height: 24rpx;
margin-right: 12rpx; margin-right: 8rpx;
} }
.line-16{ .line-16{
width:100%; width: 702rpx;
height:2rpx; height:2rpx;
background: rgba(242,242,242,1); margin: 0 auto;
background: #eee;
} }
.content-box .tab-box{ .content-box .tab-box{
display: flex; display: flex;
...@@ -150,15 +202,23 @@ ...@@ -150,15 +202,23 @@
.content-box .tab-item{ .content-box .tab-item{
height: 96rpx; height: 96rpx;
flex: 1; flex: 1;
font-size:26rpx; font-size: 26rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:#999; color:#999;
/* text-align: center; */
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: relative;
}
.tab-itemSet::before{
content: '';
width: 1px;
height: 26rpx;
background:#ccc;
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
} }
.content-box .tab-item image{ .content-box .tab-item image{
width: 20rpx; width: 20rpx;
...@@ -167,9 +227,19 @@ ...@@ -167,9 +227,19 @@
margin-left: 4rpx; margin-left: 4rpx;
} }
.content-box .act-tab{ .content-box .act-tab{
color:rgba(249,187,0,1); color:#222;
font-weight: bold; font-weight: 600;
animation: fontWeight .2s forwards; }
.content-box .act-tab::after{
content: '';
width: 30rpx;
height: 6rpx;
background: #FEA917;
border-radius: 3rpx;
position: absolute;
left: 50%;
transform: translateX(-50%);
bottom: 20rpx;
} }
.content-box .tab-item .sort-dailog{ .content-box .tab-item .sort-dailog{
width: 190rpx; width: 190rpx;
...@@ -271,7 +341,7 @@ ...@@ -271,7 +341,7 @@
} }
.content-box .introduction{ .content-box .introduction{
/* height: calc(100vh - 328px); */ /* height: calc(100vh - 328px); */
padding: 36rpx 12rpx 36rpx 12rpx; padding: 0 24rpx 36rpx;
overflow: hidden; overflow: hidden;
} }
.content-box .introduction .img-box{ .content-box .introduction .img-box{
...@@ -356,13 +426,11 @@ ...@@ -356,13 +426,11 @@
z-index: 4; z-index: 4;
} }
.content-box .introduction .business-box{ .content-box .introduction .business-box{
margin-top: 24rpx; margin-top: 36rpx;
width:100%; width: 100%;
height:128rpx; padding: 21rpx 24rpx;
padding: 0 24rpx;
background:rgba(248,248,248,1); background:rgba(248,248,248,1);
border-radius:16rpx; border-radius: 20rpx;
border:2rpx solid rgba(240,240,240,1);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -375,44 +443,44 @@ ...@@ -375,44 +443,44 @@
margin-right: 16rpx; margin-right: 16rpx;
} }
.content-box .introduction .business-box .business-info .logo{ .content-box .introduction .business-box .business-info .logo{
width:92rpx; width: 88rpx;
height:92rpx; height: 88rpx;
border-radius: 50%; border-radius: 50%;
} }
.content-box .introduction .business-box .business-info .business-name .title{ .content-box .introduction .business-box .business-info .business-name .title{
font-size:28rpx; font-size: 26rpx;
font-family:PingFangSC-Medium,PingFang SC; font-weight: 600;
font-weight:700; color:#222;
color:rgba(51,51,51,1);
line-height: 1;
padding-bottom: 10rpx;
}
.content-box .introduction .business-box .business-info .business-name .man-count{
font-size:24rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
line-height: 1; line-height: 1;
color:rgba(153,153,153,1); max-width: 450rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.content-box .introduction .business-box .business-info .business-name .man-count text{ .content-box .introduction .business-box .business-info .business-name .info-num-box{
font-size:24rpx; display: flex;
font-family:PingFangSC-Regular,PingFang SC; flex-wrap: wrap;
font-weight:400; padding-top: 10rpx;
line-height: 1; }
color:#333333; .content-box .introduction .business-box .business-info .business-name .info-num-box .num-item{
font-size: 22rpx;
background: #eee;
line-height: 36rpx;
color: #999;
position: relative;
padding: 0 10rpx;
margin: 5rpx;
} }
.content-box .introduction .business-box .in-btn{ .content-box .introduction .business-box .in-btn{
width:176rpx; min-width: 96rpx;
height:68rpx; height: 44rpx;
background:rgba(249,187,0,1); background:#FEA917;
border-radius:36rpx; border-radius: 25rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size:32rpx; font-size: 22rpx;
font-family:PingFangSC-Medium,PingFang SC; color:#fff;
font-weight:500;
color:rgba(255,255,255,1);
} }
.content-box .catalog{ .content-box .catalog{
overflow: hidden; overflow: hidden;
......
src/pages/websiteindex/onlineclassroomlist.js
View file @ c8f3b39a
// src/pages/websiteindex/onlineclassroomlist.js // src/pages/websiteindex/onlineclassroomlist.js
import { import {
onlinecourseslistGet, webonlinecourseslistGet,
} from '../../../service/customer/websiteindex.js'; } from '../../../service/customer/websiteindex.js';
var app = getApp(); var app = getApp();
Page({ Page({
...@@ -105,18 +105,18 @@ Page({ ...@@ -105,18 +105,18 @@ Page({
this.getOnlineCoursesList('down') this.getOnlineCoursesList('down')
}) })
}, },
onlineCoursesListGet(){ // onlineCoursesListGet(){
onlinecourseslistGet({ // webonlinecourseslistGet({
school_id: this.data.sid // school_id: this.data.sid
}).then((res)=>{ // }).then((res)=>{
const { data, code} = res; // const { data, code} = res;
if(code == 200 ){ // if(code == 200 ){
this.setData({ // this.setData({
onlineCoursesList: data.list // onlineCoursesList: data.list
}) // })
} // }
}) // })
}, // },
getOnlineCoursesList(type) { getOnlineCoursesList(type) {
if (!this.data.hasmore) { if (!this.data.hasmore) {
return; return;
...@@ -127,7 +127,7 @@ Page({ ...@@ -127,7 +127,7 @@ Page({
this.setData({ this.setData({
listLoading: true listLoading: true
}) })
onlinecourseslistGet({ webonlinecourseslistGet({
page: this.data.page, page: this.data.page,
perPage: this.data.perPage, perPage: this.data.perPage,
school_id: this.data.sid, school_id: this.data.sid,
......
src/pages/websiteindex/onlineclassroomlist.wxml
View file @ c8f3b39a
...@@ -23,19 +23,24 @@ ...@@ -23,19 +23,24 @@
<block wx:for="{{infoList}}" wx:key="index"> <block wx:for="{{infoList}}" wx:key="index">
<view class="content-item" bindtap="goOnlineClass" data-item="{{item}}"> <view class="content-item" bindtap="goOnlineClass" data-item="{{item}}">
<view class="cover-box"> <view class="cover-box">
<image class="cover-img" src="{{filter.imagify(item.cover, 'image/resize,w_400/format,jpg')}}" mode="aspectFill" lazy-load="false" binderror="" bindload="" wx:if="{{item.cover}}" /> <image class="cover-img" src="{{filter.imagify(item.cover, 'image/resize,w_400/format,jpg')}}" mode="aspectFill" wx:if="{{item.cover}}" />
<image class="cover-img" src="{{filter.imagify('qingxiao/biz/image/course/courseDefaultImg.png')}}" mode="aspectFill" lazy-load="false" binderror="" bindload="" wx:else/> <image class="cover-img" src="{{filter.imagify('qingxiao/biz/image/course/courseDefaultImg.png')}}" mode="aspectFill" wx:else/>
<image class="classtypeicon" src="{{imageRoot}}2c/onlineclass/textimgicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /> <image class="classtypeicon" src="{{imageRoot}}2c/onlineclass/textimgicon.png?{{imageVersion}}" />
</view> </view>
<view class="info-box"> <view class="info-box">
<view class="title clearfix"> <view class="title clearfix">
<image class="classtypetag" src="{{imageRoot}}2c/onlineclass/text.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /> <image class="classtypetag" src="{{imageRoot}}2c/onlineclass/text.png?{{imageVersion}}" />
<text class="titletext">{{item.title}}</text> <text class="titletext">{{item.title}}</text>
</view> </view>
<view class="learnbox"> <view class="learnbox">
<image class="eyeicon" src="{{imageRoot}}2c/onlineclass/eyeicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /> <view class="learnitem">
<view class="learncount" hover-class="none" hover-stop-propagation="false"> <image class="eyeicon" src="{{imageRoot}}2c/onlineclass/eyeicon.png?{{imageVersion}}"/>{{item.study_count + item.real_study_count}}人已学习
223人已学习 </view>
<view class="learnitem" wx:if="{{item.type==1}}">
<image class="totalicon" src="{{localImageRoot}}2c/websiteindex/onlinecourse/icon_all.png?{{imageVersion}}"/>共1期
</view>
<view class="learnitem" wx:if="{{item.type==2}}">
<image class="totalicon" src="{{imageRoot}}2c/onlineclass/newicon.png?{{imageVersion}}"/>已更新{{item.sub_courses_count}}期
</view> </view>
</view> </view>
<!-- <view class="subtitle">{{item.remark}}</view> --> <!-- <view class="subtitle">{{item.remark}}</view> -->
......
src/pages/websiteindex/onlineclassroomlist.wxss
View file @ c8f3b39a
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
height:150rpx; height:150rpx;
border-radius:10rpx; border-radius:10rpx;
position: relative; position: relative;
margin-right: 32rpx; margin-right: 21rpx;
position: relative; position: relative;
} }
.online-classroom .content-box .content-item .cover-box .classtypeicon { .online-classroom .content-box .content-item .cover-box .classtypeicon {
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-direction: column; flex-direction: column;
padding: 10rpx 0;
} }
.online-classroom .content-box .content-item .info-box .title{ .online-classroom .content-box .content-item .info-box .title{
/* display: flex; */ /* display: flex; */
...@@ -192,6 +193,8 @@ ...@@ -192,6 +193,8 @@
display: inline-block; display: inline-block;
/* float: left; */ /* float: left; */
margin-right: 10rpx; margin-right: 10rpx;
position: relative;
top: 8rpx;
} }
.online-classroom .content-box .content-item .info-box .title .titletext{ .online-classroom .content-box .content-item .info-box .title .titletext{
font-size:26rpx; font-size:26rpx;
...@@ -207,16 +210,40 @@ ...@@ -207,16 +210,40 @@
.online-classroom .content-box .content-item .learnbox { .online-classroom .content-box .content-item .learnbox {
display: flex; display: flex;
align-items: center; align-items: center;
padding-bottom: 10rpx;
} }
.online-classroom .content-box .content-item .learnbox .eyeicon { .online-classroom .content-box .content-item .learnbox .learnitem{
display: flex;
align-items: center;
padding: 0 14rpx;
position: relative;
color: #999;
font-size: 22rpx;
}
.online-classroom .content-box .content-item .learnbox .learnitem:nth-child(1){
padding-left: 0;
}
.online-classroom .content-box .content-item .learnbox .learnitem::after{
content: '';
width: 1px;
height: 16rpx;
background: #999;
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 0;
}
.online-classroom .content-box .content-item .learnbox .learnitem:last-of-type::after{
display: none;
}
.online-classroom .content-box .content-item .learnbox .learnitem .eyeicon {
width: 24rpx; width: 24rpx;
height: 14rpx; height: 14rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.online-classroom .content-box .content-item .learnbox .learncount { .online-classroom .content-box .content-item .learnbox .learnitem .totalicon {
color: #999999; width: 24rpx;
font-size: 22rpx; height: 24rpx;
margin-right: 10rpx;
} }
.online-classroom .content-box .content-item .info-box .subtitle{ .online-classroom .content-box .content-item .info-box .subtitle{
font-size:22rpx; font-size:22rpx;
......
src/pages/websiteindex/onlineclassroomplay.js
View file @ c8f3b39a
...@@ -15,7 +15,9 @@ import { ...@@ -15,7 +15,9 @@ import {
onlinesubcoursesGet, onlinesubcoursesGet,
websitecomments, //评论提交 websitecomments, //评论提交
websitecommentslist, //评论列表 websitecommentslist, //评论列表
onlinecoursesverifypwd websitecommentslistNew,
onlinecoursesverifypwd,
websitelikes
} from '../../../service/customer/websiteindex.js'; } from '../../../service/customer/websiteindex.js';
import { import {
generateCustomerQrcode, generateCustomerQrcode,
...@@ -89,6 +91,7 @@ Page({ ...@@ -89,6 +91,7 @@ Page({
posterBoxShow: false, posterBoxShow: false,
qrcodeGenerating: false, qrcodeGenerating: false,
tab: 1, tab: 1,
likeSubmitting: false,
}, },
/** /**
...@@ -527,7 +530,7 @@ Page({ ...@@ -527,7 +530,7 @@ Page({
this.setData({ this.setData({
listLoading: true listLoading: true
}) })
websitecommentslist({ websitecommentslistNew({
page: this.data.page, page: this.data.page,
perPage: this.data.perPage, perPage: this.data.perPage,
source_type: 4, source_type: 4,
...@@ -1175,5 +1178,42 @@ audioStorage[value].isWaiting = true; ...@@ -1175,5 +1178,42 @@ audioStorage[value].isWaiting = true;
}) })
}) })
}, },
//评论点赞
fingureUp(e) {
let { act, id } = e.currentTarget.dataset;
if (this.data.likeSubmitting) {
return
}
this.setData({
likeSubmitting: true
})
let currentPlayItem = this.data.commentList.findIndex(item=>item.id==id);
let act_like = act?2:1;
let curNum = this.data.commentList[currentPlayItem].website_likes_count
websitelikes({
source_type: 5,//线上课堂
source_id: id,
act: act_like
}).then((res) => {
this.setData({
likeSubmitting: false
})
wx.hideLoading();
const {code,data} = res
if (code == 200) {
let addNum = 0;
addNum = act_like==2?-1:1;
this.setData({
[`commentList[${currentPlayItem}].has_like`]: !act,
[`commentList[${currentPlayItem}].website_likes_count`]: curNum+Number(addNum),
})
}
}).catch(() => {
wx.hideLoading();
this.setData({
likeSubmitting: false
})
})
}
}) })
\ No newline at end of file
src/pages/websiteindex/onlineclassroomplay.wxss
View file @ c8f3b39a
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
.top-box{ .top-box{
/* position: fixed; /* position: fixed;
width: 100%; width: 100%;
height: 392rpx; height: 100%;
left: 0; left: 0;
top: 0; top: 0;
z-index: 100; */ z-index: 100; */
} }
.media-box{ .media-box{
height:392rpx; height: 420rpx;
position: relative; position: relative;
background: #ccc; background: #ccc;
} }
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
line-height:1; line-height:1;
} }
.media-box .video-box{ .media-box .video-box{
height:392rpx; height:100%;
position: relative; position: relative;
} }
.media-box .banner-numbox{ .media-box .banner-numbox{
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
} }
.media-box .video-box video{ .media-box .video-box video{
width: 100%; width: 100%;
height:392rpx; height: 100%;
} }
.media-box .video-box .quickenplay-icon{ .media-box .video-box .quickenplay-icon{
...@@ -97,13 +97,17 @@ ...@@ -97,13 +97,17 @@
margin-top: -47rpx; margin-top: -47rpx;
z-index: 2; z-index: 2;
} }
.media-box .cover-box{
width: 100%;
height:100%;
}
.media-box .cover-box image{ .media-box .cover-box image{
width: 100%; width: 100%;
height:392rpx; height:100%;
} }
.media-box .audio-box{ .media-box .audio-box{
width: 100%; width: 100%;
height:392rpx; height: 100%;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -111,7 +115,7 @@ ...@@ -111,7 +115,7 @@
} }
.media-box .audio-box .cover-box{ .media-box .audio-box .cover-box{
width: 100%; width: 100%;
height:392rpx; height:100%;
position: absolute; position: absolute;
left: 0; left: 0;
top:0; top:0;
...@@ -126,11 +130,11 @@ ...@@ -126,11 +130,11 @@
} }
.media-box .image-box { .media-box .image-box {
width: 100%; width: 100%;
height:392rpx; height:100%;
} }
.media-box .image-box image { .media-box .image-box image {
width: 100%; width: 100%;
height:392rpx; height:100%;
} }
.media-box .play-progree-box { .media-box .play-progree-box {
width: 100%; width: 100%;
...@@ -205,19 +209,20 @@ ...@@ -205,19 +209,20 @@
font-size: 22rpx; font-size: 22rpx;
} }
.top-box .title-box .title{ .top-box .title-box .title{
font-size:26rpx; font-size:32rpx;
font-family:PingFangSC-Medium,PingFang SC; font-family:PingFangSC-Medium,PingFang SC;
font-weight:700; font-weight:700;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
line-height:1; line-height:1;
padding-bottom: 14rpx; padding-bottom: 14rpx;
line-height: 48rpx;
} }
.top-box .title-box .subtitle{ .top-box .title-box .subtitle{
font-size:24rpx; font-size:24rpx;
font-family:PingFangSC-Light,PingFang SC; font-family:PingFangSC-Light,PingFang SC;
font-weight:300; font-weight:300;
color:rgba(127,123,123,1); color:rgba(127,123,123,1);
line-height:1; line-height: 34rpx;
} }
.top-box .phase-count{ .top-box .phase-count{
padding: 24rpx 24rpx 10rpx 0; padding: 24rpx 24rpx 10rpx 0;
...@@ -267,7 +272,6 @@ ...@@ -267,7 +272,6 @@
} }
.content-box .tab-box{ .content-box .tab-box{
display: flex; display: flex;
padding: 26rpx 0;
position: relative; position: relative;
} }
.content-box .tab-box .tabactive { .content-box .tab-box .tabactive {
...@@ -277,11 +281,10 @@ ...@@ -277,11 +281,10 @@
background-color: #FEA917; background-color: #FEA917;
position: absolute; position: absolute;
left: 50%; left: 50%;
margin-left: -15rpx; transform: translateX(-50%);
bottom: -20rpx; bottom: 10rpx;
} }
.content-box .tab-box .tab-item{ .content-box .tab-box .tab-item{
position: relative;
flex: 1; flex: 1;
font-size:28rpx; font-size:28rpx;
font-family:PingFangSC-Medium,PingFang SC; font-family:PingFangSC-Medium,PingFang SC;
...@@ -289,9 +292,18 @@ ...@@ -289,9 +292,18 @@
color:rgba(102,102,102,1); color:rgba(102,102,102,1);
line-height:1; line-height:1;
text-align: center; text-align: center;
padding: 26rpx 0;
position: relative;
} }
.content-box .tab-box .tab-item:first-child { .content-box .tab-box .tab-item:first-child::after {
border-right: 1px solid #CCCCCC; content:'';
width: 1px;
height: 26rpx;
background: #ccc;
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
} }
.content-box .tab-box .tab-item image{ .content-box .tab-box .tab-item image{
width: 24rpx; width: 24rpx;
...@@ -302,8 +314,23 @@ ...@@ -302,8 +314,23 @@
.content-box .tab-box .act-tab{ .content-box .tab-box .act-tab{
color:rgba(249,187,0,1); color:rgba(249,187,0,1);
} }
.content-box .introduction{ .content-box .introduction{
padding: 36rpx 12rpx; padding: 0 24rpx 36rpx;
min-height: 300rpx;
position: relative;
}
.content-box .introduction .content-title{
display: flex;
align-items: center;
font-size: 32rpx;
color: #222;
line-height: 45rpx;
padding-top: 14rpx;
font-weight: 600;
}
.content-box .introduction .content-title .num{
color: #999;
padding-left: 20rpx;
} }
.content-box .introduction .audio-box{ .content-box .introduction .audio-box{
width:100%; width:100%;
...@@ -493,7 +520,7 @@ ...@@ -493,7 +520,7 @@
position: fixed; position: fixed;
bottom: 100rpx; bottom: 100rpx;
left: 66rpx; left: 66rpx;
z-index: 200; z-index: 1;
} }
.booking-box .text{ .booking-box .text{
font-size:36rpx; font-size:36rpx;
...@@ -675,9 +702,11 @@ ...@@ -675,9 +702,11 @@
padding: 0 18rpx 0 30rpx; padding: 0 18rpx 0 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
} }
.footer-innerbox .btn-item{ .footer-innerbox .btn-item{
text-align: center; text-align: center;
padding-left: 24rpx;
} }
.footer-innerbox .btn-item .btn-icon{ .footer-innerbox .btn-item .btn-icon{
width:40rpx; width:40rpx;
...@@ -690,8 +719,8 @@ ...@@ -690,8 +719,8 @@
padding-bottom: 6rpx; padding-bottom: 6rpx;
} }
.footer-innerbox .btn-item .catlog-icon{ .footer-innerbox .btn-item .catlog-icon{
width: 34rpx; width: 28rpx;
height: 40rpx; height: 34rpx;
} }
.footer-innerbox .btn-item .btn-title{ .footer-innerbox .btn-item .btn-title{
font-size:22rpx; font-size:22rpx;
...@@ -701,27 +730,22 @@ ...@@ -701,27 +730,22 @@
line-height: 1; line-height: 1;
} }
.footer-innerbox .impressions{ .footer-innerbox .impressions{
width:332rpx; flex: 1;
height:80rpx; height: 70rpx;
background:rgba(244,244,244,1); background:#F7F7F7;
border-radius:8rpx; border-radius: 35rpx;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 30rpx; padding: 0 30rpx;
margin: 0 30rpx 0 38rpx;
} }
.footer-innerbox .impressions .icon{ .footer-innerbox .impressions .icon{
width:40rpx; width: 30rpx;
height:40rpx; height: 30rpx;
border-radius: 50%; margin-right: 15rpx;
background:rgba(227,227,227,1);
margin-right: 20rpx;
} }
.footer-innerbox .impressions .text{ .footer-innerbox .impressions .text{
font-size:26rpx; font-size:26rpx;
font-family:PingFangSC-Regular,PingFang SC; color:#999;
font-weight:400;
color:rgba(153,153,153,1);
} }
.comment-show { .comment-show {
animation: commentfadeIn .2s forwards; animation: commentfadeIn .2s forwards;
...@@ -736,7 +760,7 @@ ...@@ -736,7 +760,7 @@
left: 0; left: 0;
bottom: -100vh; bottom: -100vh;
background: #fff; background: #fff;
height: calc(100vh - 392rpx); height: calc(100vh - 100%);
z-index: 21; z-index: 21;
} }
.comment-dailog .title-box{ .comment-dailog .title-box{
...@@ -792,9 +816,35 @@ ...@@ -792,9 +816,35 @@
/* height: calc(100vh - 660rpx); */ /* height: calc(100vh - 660rpx); */
} }
.comment-list .comment-item{ .comment-list .comment-item{
padding: 30rpx 22rpx 0 22rpx; padding: 30rpx 0;
/* display: flex; */ position: relative;
/* justify-content: space-between; */ }
.comment-list .comment-item::after{
content: '';
width: 100%;
height: 1px;
background: #eee;
position: absolute;
left: 0;
bottom: 0;
}
.comment-list .comment-item:last-of-type::after{
display: none;
}
.comment-list .comment-item .like-box {
position: absolute;
right: 0;
top: 0;
padding: 30rpx 0 30rpx 30rpx;
font-size: 22rpx;
color: #999;
display: flex;
align-items: center;
}
.comment-list .comment-item .like-box .icon-like{
width: 24rpx;
height: 24rpx;
margin-right: 14rpx;
} }
.comment-list .comment-item .avatar-box{ .comment-list .comment-item .avatar-box{
/* width: 70rpx; /* width: 70rpx;
...@@ -840,12 +890,9 @@ ...@@ -840,12 +890,9 @@
margin-left: 10rpx; margin-left: 10rpx;
} }
.comment-list .comment-item .info-box .time{ .comment-list .comment-item .info-box .time{
font-size:22rpx; font-size: 22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(141,142,143,1);
line-height:1; line-height:1;
color: #999999; color: #999;
} }
.comment-list .comment-item .content-box{ .comment-list .comment-item .content-box{
font-size:26rpx; font-size:26rpx;
...@@ -940,45 +987,36 @@ ...@@ -940,45 +987,36 @@
bottom: 0; bottom: 0;
z-index: 2; z-index: 2;
background: #fff; background: #fff;
border-radius: 20rpx 20rpx 0 0;
overflow: hidden;
} }
.catlog-dailog .content .title-box{ .catlog-dailog .content .title-box{
width:100%; width:100%;
height:86rpx;
background:rgba(250,251,252,1);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 22rpx; padding: 30rpx 22rpx 0;
} }
.catlog-dailog .content .title-box .title{ .catlog-dailog .content .title-box .title{
font-size:28rpx; font-size: 32rpx;
font-family:PingFangSC-Regular,PingFang SC; font-family:PingFangSC-Regular,PingFang SC;
font-weight:400; font-weight:400;
color:rgba(51,51,51,1); color:#222;
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 45rpx;
} }
.catlog-dailog .content .title-box .title image{ .catlog-dailog .content .title-box .right{
width: 6rpx;
height: 28rpx;
margin-right: 20rpx;
}
.catlog-dailog .content .title-box .btn-box{
font-size:24rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(153,153,153,1);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center;
} }
.catlog-dailog .content .title-box .btn-box image{ .catlog-dailog .content .title-box .right .icon-close{
width: 14rpx; width: 36rpx;
height: 22rpx; height: 36rpx;
margin-left: 12rpx;
margin-top: 2rpx;
} }
.catlog-dailog .content .catlog-list{ .catlog-dailog .content .catlog-list{
padding-left: 20rpx; padding: 0 20rpx;
height: 50vh; height: 50vh;
padding-bottom: 120rpx; padding-bottom: 120rpx;
} }
...@@ -986,15 +1024,13 @@ ...@@ -986,15 +1024,13 @@
height: 84rpx; height: 84rpx;
display: flex; display: flex;
align-items: center; align-items: center;
font-size:24rpx; font-size: 26rpx;
font-family:PingFangSC-Regular,PingFang SC; color: #666666;
font-weight:400;
color:rgba(128,129,130,1);
box-sizing: border-box; box-sizing: border-box;
border-bottom: 2rpx solid rgba(245,246,247,1); border-bottom: 2rpx solid rgba(245,246,247,1);
} }
.catlog-dailog .content .catlog-list .action-item{ .catlog-dailog .content .catlog-list .action-item{
color:rgba(249,187,0,1); color:#FB7A28;
} }
.catlog-dailog .content .catlog-list .catlog-item image{ .catlog-dailog .content .catlog-list .catlog-item image{
width: 36rpx; width: 36rpx;
......
src/pages/websiteindex/teacherdetail.js
View file @ c8f3b39a
...@@ -25,11 +25,11 @@ Page({ ...@@ -25,11 +25,11 @@ Page({
}).then((res) => { }).then((res) => {
const { code, data } = res; const { code, data } = res;
if (code == 200) { if (code == 200) {
// let intro = []; // let intro = '';
// try { // try {
// intro = JSON.parse(data.intro)[0].value; // intro = JSON.parse(data.intro);
// } catch (error) { // } catch (error) {
// intro = []; // intro = ''
// } // }
// data.intro = intro // data.intro = intro
this.setData({ this.setData({
......
src/pages/websiteindex/teacherdetail.wxss
View file @ c8f3b39a
...@@ -102,5 +102,7 @@ ...@@ -102,5 +102,7 @@
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
transform: scaleY(0.5);
} }
video{
width: 100%;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment