Skip to content

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

fix

parent 1bcb2162
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 78 deletions
business/pages/organizationalmgt/index.wxml
View file @ a8b68814
......@@ -20,7 +20,7 @@
<view class="nick-name">
<view class="schoolname">{{schoolInfo.title}}</view>
<view class="rolechangebox" bindtap="exchangeBusinessSchool">
<view class="rolechange">身份切换</view>
<view class="rolechange">切换身份</view>
<image class="icon" src="{{imageRoot}}2b/organizationalmgt/exchange2.png?{{imageVersion}}"></image>
</view>
</view>
......
business/pages/organizationalmgt/index.wxss
View file @ a8b68814
......@@ -138,16 +138,17 @@ page{
align-items: center;
justify-content: space-between;
padding: 30rpx 24rpx;
border-bottom: 1px solid rgba(0,0,0,.05);
position: relative;
}
.line-box .line::after{
content: '';
width: calc(100% - 24rpx);
height: 1px;
background: #eee;
position: absolute;
bottom: 0;
right: 0;
transform: scaleY(.5);
}
.line-box .line:last-of-type::after{
display: none;
......
components/commenteditor/index.wxml
View file @ a8b68814
......@@ -2,10 +2,6 @@
<view class="commenteditor-box" bindtap="hide">
<view class="input-box" data-ipt='ipt'>
<view class="ipt"><input auto-focus data-ipt='ipt' value="{{value}}" bindinput="contentInput" placeholder="{{prams.name ? '@' + prams.name : '写评论...'}}" cursor-spacing="10" /></view>
<view class="" data-ipt='ipt'>
<form bindsubmit="submit" report-submit="true" data-ipt='ipt'>
<button class="submitbtn" form-type="submit" class="btn" style="{{type=='2c'?'background: #FFD146;color:#000':''}}" data-ipt='ipt'>发送</button>
</form>
</view>
<view bindtap="submit" data-ipt='ipt' class="btn {{value? (type=='2b'? 'btn2b': 'btn2c'): ''}}">发送</view>
</view>
</view>
\ No newline at end of file
components/commenteditor/index.wxss
View file @ a8b68814
......@@ -6,21 +6,21 @@
background: rgba(0, 0, 0, .5);
position: fixed;
left: 0;
bottom: 5rpx;
bottom: 0;
z-index: 999;
}
.input-box {
position: absolute;
width: 100%;
height: 106rpx;
height: 118rpx;
padding: 0 24rpx;
background: rgba(244, 244, 247, 1);
border: 1px solid rgba(212, 212, 212, 1);
background: #fff;
display: flex;
align-items: center;
left: 0;
bottom:0;
bottom: 0;
border-radius: 20rpx 20rpx 0 0;
}
.commenteditor-box .ipt {
......@@ -30,20 +30,26 @@
.commenteditor-box .ipt input {
width: 100%;
height: 70rpx;
background: #fff;
background: rgba(247,247,247,1);
border: none;
padding: 0 16rpx;
padding: 0 24rpx;
border-radius: 35rpx;
}
.commenteditor-box .btn {
width: 90rpx;
height: 54rpx;
line-height: 54rpx;
background: rgba(101, 184, 244, 1);
border-radius: 10rpx;
font-size: 28rpx;
color: rgba(255, 255, 255, 1);
width: 96rpx;
height: 44rpx;
line-height: 44rpx;
background: #ccc;
border-radius: 25rpx;
font-size: 22rpx;
color: #fff;
text-align: center;
margin-left: 32rpx;
padding: 0 !important;
margin-left: 24rpx;
}
.commenteditor-box .btn.btn2c{
background: #FFD146;
}
.commenteditor-box .btn.btn2b{
background: #35BAFD;
}
src/components/clockitemv2/index.wxss
View file @ a8b68814
......@@ -138,7 +138,7 @@
font-size: 30rpx;
font-family: PingFang SC;
font-weight: bold;
color: #6C7A97;
color: #222;
letter-spacing: 2rpx;
max-width: 400rpx;
word-break: break-all;
......
src/pages/websiteindex/onlineclassroomindex.wxml
View file @ a8b68814
......@@ -20,7 +20,7 @@
<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>
<image class="studentboxavatar" src="{{imageRoot}}2c/ucenter2/empty_avatar.png?{{imageVersion}}" wx:else></image>
</block>
<image class="studentboxavatar" src="{{imageRoot}}2c/onlineclass/moreicon.png?{{imageVersion}}"></image>
<text class="learncount">{{coursesDetail.study_count}}人已学习</text>
......
src/pages/websiteindex/onlineclassroomindex.wxss
View file @ a8b68814
......@@ -456,11 +456,12 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding-top: 4rpx;
}
.content-box .introduction .business-box .business-info .business-name .info-num-box{
display: flex;
flex-wrap: wrap;
padding-top: 10rpx;
padding-top: 7rpx;
}
.content-box .introduction .business-box .business-info .business-name .info-num-box .num-item{
font-size: 22rpx;
......@@ -469,7 +470,7 @@
color: #999;
position: relative;
padding: 0 10rpx;
margin: 5rpx;
margin: 4rpx 20rpx 4rpx 0;
}
.content-box .introduction .business-box .in-btn{
min-width: 96rpx;
......@@ -629,11 +630,10 @@
width:572rpx;
height:58rpx;
border-radius:30rpx;
/* border:2rpx solid rgba(204,204,204,1); */
background:rgba(241,241,241,1);
background:#F7F7F7;
display: flex;
align-items: center;
padding: 0 30rpx;
padding: 0 24rpx;
}
.content-box .search-box .input-box input{
width: 100%;
......@@ -644,17 +644,15 @@
margin-right: 26rpx;
}
.content-box .search-box .btn-box{
width:92rpx;
height:56rpx;
background:rgba(249,187,0,1);
border-radius:8rpx;
width: 96rpx;
height: 44rpx;
background:#FEA917;
border-radius: 22rpx;
display: flex;
align-items: center;
justify-content: center;
font-size:28rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(255,255,255,1);
font-size:22rpx;
color:#fff;
}
.quicken-dailog{
width: 100%;
......
src/pages/websiteindex/onlineclassroomlist.js
View file @ a8b68814
......@@ -20,6 +20,7 @@ Page({
localImageRoot: '../../../images/',
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
egOnlineCourseUrl: 'https://cdn.img.shangjiadao.cn/qingxiao/dakav2/images/2c/websiteindex/eg/eg_onlinecourse.png',
},
/**
......
src/pages/websiteindex/onlineclassroomlist.wxml
View file @ a8b68814
......@@ -24,7 +24,7 @@
<view class="content-item" bindtap="goOnlineClass" data-item="{{item}}">
<view class="cover-box">
<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" wx:else/>
<image class="cover-img" src="{{egOnlineCourseUrl}}" mode="aspectFill" wx:else/>
<image class="classtypeicon" src="{{imageRoot}}2c/onlineclass/textimgicon.png?{{imageVersion}}" />
</view>
<view class="info-box">
......
src/pages/websiteindex/onlineclassroomplay.wxml
View file @ a8b68814
......@@ -36,9 +36,9 @@
</view>
<view class="audio-box" wx:if="{{coursesDetail.content.type == 3}}">
<view class="icon">
<image class="" wx:if="{{!audioStorage[coursesDetail.content.src] || !audioStorage[coursesDetail.content.src].play}}" src="{{imageRoot}}2c/websiteindex/yellow-pause.png" bindtap="playvoice" data-value="{{coursesDetail.content.src}}" data-duration="{{coursesDetail.content.properties.duration}}"/>
<image class="" wx:if="{{!audioStorage[coursesDetail.content.src] || !audioStorage[coursesDetail.content.src].play}}" src="{{imageRoot}}2c/websiteindex/play-video.png" bindtap="playvoice" data-value="{{coursesDetail.content.src}}" data-duration="{{coursesDetail.content.properties.duration}}"/>
<cssloading wx:if="{{isWaiting}}"/>
<image class="" wx:if="{{audioStorage[coursesDetail.content.src] && audioStorage[coursesDetail.content.src].play && !isWaiting}}" src="{{imageRoot}}2c/websiteindex/yellow-play.png" bindtap="pausevoice" data-value="{{coursesDetail.content.src}}" data-duration="{{coursesDetail.content.properties.duration}}"/>
<!-- <image class="" wx:if="{{audioStorage[coursesDetail.content.src] && audioStorage[coursesDetail.content.src].play && !isWaiting}}" src="{{imageRoot}}2c/websiteindex/play-video.png" bindtap="pausevoice" data-value="{{coursesDetail.content.src}}" data-duration="{{coursesDetail.content.properties.duration}}"/> -->
</view>
<view class="play-progree-box">
<view class="time">{{filter.voiceTimeFormat(audioStorage[coursesDetail.content.src].currentTime)}}</view>
......@@ -81,14 +81,26 @@
<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>
<image class="studentboxavatar" src="{{imageRoot}}2c/ucenter2/empty_avatar.png?{{imageVersion}}" wx:else></image>
</block>
<image class="studentboxavatar" src="{{imageRoot}}2c/onlineclass/moreicon.png?{{imageVersion}}"></image>
<text class="learncount">{{coursesDetail.study_count}}人已学习</text>
</view>
<view class="coursecount">
<!-- <view class="coursecount">
<image class="newicon" src="{{imageRoot}}2c/websiteindex/bookicon.png?{{imageVersion}}"></image>
<view class="coursecounttext">已更新{{coursesDetail.type==1?'1': coursesDetail.sub_courses_count}}期</view>
</view> -->
<view class="coursecount" wx:if="{{coursesDetail.content}}">
<view class="count-item" wx:if="{{coursesDetail.content.properties.duration}}">
<image class="icon" src="{{imageRoot}}2c/websiteindex/onlinecourse/icon_time.png"/>{{filter.Mathceil(coursesDetail.content.properties.duration/60)}}分钟
</view>
<view class="count-item" wx:if="{{coursesDetail.content.type==2 || coursesDetail.content.type==3}}">
<block wx:if="{{coursesDetail.visitor}}">
<block wx:if="{{filter.toFix(coursesDetail.visitor.learned_time/coursesDetail.content.properties.duration,2)>=1}}">已学完</block>
<block wx:else>已学{{filter.toFix(coursesDetail.visitor.learned_time/coursesDetail.content.properties.duration,2)*100}}%</block>
</block>
<block wx:else>已学0%</block>
</view>
</view>
</view>
<image class="shareicon" bindtap="ShowShareDailog" src="{{imageRoot}}2c/onlineclass/shareicon.png?{{imageVersion}}" wx:if="{{coursesDetail.share_switch==1}}"></image>
......@@ -97,8 +109,8 @@
<view class="divideline"></view>
<view class="content-box">
<view class="tab-box">
<view class="tab-item" data-index="{{1}}" bindtap="tabChange">详情<view wx:if="{{curTabIndex == 1}}" class="tabactive"></view></view>
<view class="tab-item" data-index="{{2}}" bindtap="tabChange">评论<view wx:if="{{curTabIndex == 2}}" class="tabactive"></view></view>
<view class="tab-item {{curTabIndex == 1?'active': ''}}" data-index="{{1}}" bindtap="tabChange">详情</view>
<view class="tab-item {{curTabIndex == 2?'active': ''}}" data-index="{{2}}" bindtap="tabChange">评论</view>
</view>
<view class="introduction" wx:if="{{curTabIndex==1}}">
<block wx:for="{{coursesDetail.intro}}" wx:key="index">
......@@ -156,7 +168,8 @@
<view class="num">{{item.website_likes_count || 0}}</view>
</view>
<view class="avatar-box">
<image class="" src="{{filter.imagify(item.comment_user.avatar)}}" />
<image class="" src="{{filter.imagify(item.comment_user.avatar)}}" wx:if="{{item.comment_user.avatar}}"/>
<image class="" src="{{imageRoot}}2c/ucenter2/empty_avatar.png?{{imageVersion}}" wx:else/>
<view class="info-box">
<view class="name">{{item.comment_user.nickname}} <view class="top-tag" wx:if="{{item.place_top_at}}">置顶</view></view>
<view class="time">{{item.created_at}}</view>
......@@ -192,7 +205,7 @@
<view class="btn-title">返回</view>
</view> -->
<view class="impressions" bindtap="showcommenteditor">
<image class="icon" src="{{imageRoot}}2b/organizationalmgt/editicon.png?{{imageVersion}}"></image>
<image class="icon" src="{{localImageRoot}}2c/websiteindex/icon_edit.png?{{imageVersion}}"></image>
<view class="text">说点什么吧…</view>
</view>
<!-- <view class="btn-item" bindtap="commentBoxShow" style="margin-right: {{pid ? 20: 50}}rpx; padding-right: {{pid ? 20: 50}}rpx;" bindtap="commentBoxShow">
......@@ -204,7 +217,7 @@
<view class="btn-title">分享</view>
</view> -->
<view class="btn-item" bindtap="showCatlogDailog" wx:if="{{pid}}">
<image class="icon catlog-icon" src="{{imageRoot}}2c/websiteindex/catlog-icon.png?{{imageVersion}}"></image>
<image class="icon catlog-icon" src="{{localImageRoot}}2c/websiteindex/catlog-icon.png?{{imageVersion}}"></image>
<view class="btn-title">目录</view>
</view>
</view>
......@@ -263,11 +276,14 @@
<image class="icon" src="{{imageRoot}}2c/websiteindex/onlinecourse/icon_time.png"/>{{filter.Mathceil(item.content.properties.duration/60)}}分钟
</view>
<view class="count-item" wx:if="{{item.content && item.content.type==2 || item.content.type==3}}">
<block wx:if="{{item.visitor}}">
<block wx:if="{{filter.toFix(item.visitor.learned_time/item.content.properties.duration,2)>=1}}">已学完</block>
<block wx:else>已学{{filter.toFix(item.visitor.learned_time/item.content.properties.duration,2)*100}}%</block>
<block wx:if="{{item.isAction}}">正在观看</block>
<block wx:else>
<block wx:if="{{item.visitor}}">
<block wx:if="{{filter.toFix(item.visitor.learned_time/item.content.properties.duration,2)>=1}}">已学完</block>
<block wx:else>已学{{filter.toFix(item.visitor.learned_time/item.content.properties.duration,2)*100}}%</block>
</block>
<block wx:else>已学0%</block>
</block>
<block wx:else>已学0%</block>
</view>
</view>
</view>
......
src/pages/websiteindex/onlineclassroomplay.wxss
View file @ a8b68814
......@@ -166,12 +166,17 @@
align-items: flex-start;
justify-content: space-between;
margin-bottom: 18rpx;
position: relative;
}
.learncountbox .shareicon {
width: 114rpx;
height: 114rpx;
display: block;
margin-top: -10rpx;
position: absolute;
top: 50%;
right: 0;
transform: translateY(-50%);
}
.divideline {
width: 702rpx;
......@@ -181,7 +186,37 @@
.coursecount {
display: flex;
align-items: center;
}
}
.coursecount .count-item{
font-size: 22rpx;
color: #999;
display: flex;
align-items: center;
padding: 0 14rpx;
position: relative;
line-height: 30rpx;
}
.coursecount .count-item:nth-child(1) {
padding-left: 0;
}
.coursecount .count-item::after{
content: '';
width: 1px;
height: 16rpx;
background: #999;
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
}
.coursecount .count-item:last-of-type::after{
display: none;
}
.coursecount .count-item .icon{
width: 24rpx;
height: 24rpx;
margin-right: 12rpx
}
.coursecount .newicon {
width: 24rpx;
height: 24rpx;
......@@ -278,28 +313,16 @@
display: flex;
position: relative;
}
.content-box .tab-box .tabactive {
width: 30rpx;
height: 6rpx;
border-radius: 3rpx;
background-color: #FEA917;
position: absolute;
left: 50%;
transform: translateX(-50%);
bottom: 10rpx;
}
.content-box .tab-box .tab-item{
flex: 1;
font-size:28rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(102,102,102,1);
font-size: 26rpx;
color:#999;
line-height:1;
text-align: center;
padding: 26rpx 0;
position: relative;
}
.content-box .tab-box .tab-item:first-child::after {
.content-box .tab-box .tab-item:first-child::before {
content:'';
width: 1px;
height: 26rpx;
......@@ -309,14 +332,19 @@
top: 50%;
transform: translateY(-50%);
}
.content-box .tab-box .tab-item image{
width: 24rpx;
height: 20rpx;
vertical-align: middle;
margin-left: 4rpx;
.content-box .tab-box .tab-item.active{
color: #222;
}
.content-box .tab-box .act-tab{
color:rgba(249,187,0,1);
.content-box .tab-box .tab-item.active::after{
content:'';
width: 30rpx;
height: 6rpx;
border-radius: 3rpx;
background-color: #FEA917;
position: absolute;
left: 50%;
transform: translateX(-50%);
bottom: 10rpx;
}
.content-box .introduction{
padding: 0 24rpx 36rpx;
......@@ -449,11 +477,12 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding-top: 4rpx;
}
.content-box .introduction .business-box .business-info .business-name .info-num-box{
display: flex;
flex-wrap: wrap;
padding-top: 10rpx;
padding-top: 7rpx;
}
.content-box .introduction .business-box .business-info .business-name .info-num-box .num-item{
font-size: 22rpx;
......@@ -462,7 +491,7 @@
color: #999;
position: relative;
padding: 0 10rpx;
margin: 5rpx;
margin: 4rpx 20rpx 4rpx 0;
}
.content-box .introduction .business-box .in-btn{
min-width: 96rpx;
......@@ -701,7 +730,7 @@
.footer-innerbox{
width: 100%;
height: 120rpx;
padding: 0 18rpx 0 30rpx;
padding: 0 26rpx;
display: flex;
align-items: center;
justify-content: space-between;
......
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