Commit bdee9887 authored by lvtz's avatar lvtz

fix

parent ba8ca994
......@@ -120,6 +120,7 @@ Page({
onReady: function () {
this.recorderManager.onStop((res) => {
console.log(res,'结果')
const { tempFilePath } = res;
if (!this.data.audioStatus.upload) {
return;
......@@ -128,15 +129,17 @@ Page({
this.setData({
voiceuploading: true
})
let access = '';
bMediaOssAccess({
school_id: this.data.sid,
type: 2
}).then((acc) => {
let access = acc.data;
filename = `${access.dir}${getRandomFilename(tempFilePath)}`;
access = acc.data;
// filename = `${access.dir}${getRandomFilename(tempFilePath)}`;
return wxUploadFile({
url: access.host,
formData: {
key: filename,
key: access.path,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
......@@ -147,6 +150,7 @@ Page({
name: 'file',
})
}).then((res) => {
console.log('上传res',res)
const {data} = res;
this.data.audioStatus.upload = false;
if (data == '{"status":"ok"}') {
......@@ -156,7 +160,7 @@ Page({
this.setData({
voiceuploading: false
})
this.data.audioInfo.src = filename;
this.data.audioInfo.src = access.path;
this.data.audioInfo.duration = this.data.duration;
this.data.audioCanPlay = true;
this.setData({
......
......@@ -2,7 +2,7 @@
<view class="container">
<view class="courselist-box" wx:if="{{!emptyPage}}">
<block wx:for="{{courseList}}" wx:for-item="bigitem" wx:key="bigindex" wx:for-index="bigindex">
<view class="list-item" wx:for="{{bigitem}}" wx:for-item="item" data-item="{{item}}" data-id="{{item.id}}" bindtap="addOrEditCourse" wx:key="">
<view class="list-item" wx:for="{{bigitem}}" wx:for-item="item" data-item="{{item}}" data-id="{{item.id}}" bindtap="addOrEditCourse" wx:key="index">
<view class="item-title">{{item.title}}</view>
<view class="item-color" style="background: {{filter.courseColor(item.color)}}"></view>
</view>
......
......@@ -214,7 +214,6 @@ page {
.section .section-title .btn-more {
font-size: 26rpx;
color: #666;
font-weight: 500;
display: flex;
align-items: center;
}
......
......@@ -18,8 +18,7 @@ page{
width:702rpx;
background:#fff;
border-radius: 20rpx;
padding: 32rpx 32rpx 28rpx 32rpx;
padding-top: 40rpx;
padding: 0 24rpx;
margin: 27rpx auto 26rpx;
position: relative;
z-index: 20;
......@@ -28,8 +27,18 @@ page{
.header-box .top-box {
display: flex;
align-items: center;
padding-bottom: 30rpx;
border-bottom: 1px solid #eee;
padding: 40rpx 0 30rpx;
position: relative;
}
.header-box .top-box::after{
content: "";
width: 100%;
height: 1px;
background: #eee;
position: absolute;
left: 0;
bottom: 0;
transform: scaleY(.5);
}
.header-box .top-box .logo-box{
width:120rpx;
......@@ -63,9 +72,8 @@ page{
.header-box .top-box .info-box .name{
font-size:28rpx;
font-family:PingFang SC;
font-weight:bold;
font-weight: bold;
color:rgba(0,0,0,1);
line-height:1;
padding-bottom: 26rpx;
max-width: 450rpx;
overflow: hidden;
......@@ -96,14 +104,11 @@ page{
}
.header-box .nick-name{
font-size:24rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(130,130,130,1);
line-height:1;
padding-top: 28rpx;
display: flex;
align-items: center;
justify-content: space-between;
height: 78rpx;
}
.header-box .nick-name .schoolname {
color: #666666;
......@@ -116,6 +121,7 @@ page{
display: flex;
align-items: center;
justify-content: space-between;
height: 100%;
}
.header-box .nick-name .rolechangebox .rolechange {
color: #666666;
......
......@@ -190,9 +190,9 @@ Page({
page: this.data.page,
perPage: this.data.perPage,
school_id:this.data.sid,
extra:'time',
extra:'time,integral_count',
keyword:this.data.searchName,
min_time: this.data.min_time
min_time: this.data.min_time,
// wechat_status: 1,//1-绑定 2-未绑定
}).then((res) => {
const { code, data } = res;
......
......@@ -24,9 +24,15 @@
<image class="avatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
<view class="item-content" >
<view class="name" >{{item.name}}</view>
<view class="info-box" >
<view class="info-label" >剩余课时:</view>
<view class="num" >{{item.surplus?item.surplus:0}}</view>
<view class="info-box">
<view class="info-item">
<view class="info-label" >剩余课时:</view>
<view class="num">{{item.surplus?item.surplus:0}}</view>
</view>
<view class="info-item">
<view class="info-label" >积分:</view>
<view class="num" >{{item.integral_count || 0}}</view>
</view>
</view>
</view>
</view>
......
......@@ -48,7 +48,7 @@
margin-left: 24rpx;
}
.commenteditor-box .btn.btn2c{
background: #FFD146;
background: #FEA917;
}
.commenteditor-box .btn.btn2b{
background: #35BAFD;
......
......@@ -80,6 +80,7 @@ Component({
bMediaOssAccess({
type: 2,
school_id:this.data.sid,
ext: 'aac'
}).then((acc) => {
access = acc.data;
return wxUploadFile({
......@@ -97,7 +98,6 @@ Component({
})
}).then((res) => {
const {data} = res;
console.log(data,access.path,'数据')
if (data == '{"status":"ok"}') {
wx.showToast({
title: '上传成功'
......
......@@ -82,19 +82,22 @@ Component({
let filename = '';
that.triggerEvent('beforevoiceupload');
let mediaAccess;
let access = '';
if (that.data.role == '2c') {
mediaAccess = cMediaOssAccess({
type: 2,
school_id:this.data.sid
school_id:this.data.sid,
ext: 'aac'
})
} if (that.data.role == '2b') {
mediaAccess = bMediaOssAccess({
type: 2,
school_id:this.data.sid
school_id:this.data.sid,
ext: 'aac'
})
}
mediaAccess.then((acc) => {
let access = acc.data;
access = acc.data;
return wxUploadFile({
url: access.host,
formData: {
......@@ -116,7 +119,7 @@ Component({
})
that.triggerEvent('voiceuploadsuccess')
that.triggerEvent('pushVoice', {
src: filename,
src: access.path,
duration: this.data.voiceDuration
})
} else {
......
......@@ -3,7 +3,7 @@
// host: 'https://qxapi.qingxiao.online/daka',
// host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '5.0',
imageVersion: '20200409',
imageVersion: '20200420',
host: 'https://clock.wp53.cn',
host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785',
......
......@@ -211,6 +211,7 @@ page{
}
.schoolinfo-box .address-box .icon-box{
width: 35rpx;
padding-top: 4rpx;
}
.schoolinfo-box .address-box .icon-box .icon{
width: 22rpx;
......@@ -219,7 +220,7 @@ page{
.schoolinfo-box .address-box .address{
width: 520rpx;
position: relative;
padding-right: 20rpx;
padding-right: 50rpx;
}
.schoolinfo-box .address-box .address::after{
content: '';
......@@ -250,7 +251,7 @@ page{
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 10rpx;
right: 17rpx;
}
.schoolinfo-box .part-box .content swiper-item{
line-height: 60rpx;
......
......@@ -45,7 +45,7 @@
</view>
<view slot="tab-right">
<view class="tab-item {{curTabIndex == 1 ? 'act-tab' : ''}}" data-index="{{1}}">目录
<image data-index="{{1}}" class="" src="{{imageRoot}}2c/websiteindex/{{curTabIndex == 1 ? ( catalogSort == 1 ? 'sortupicon' : 'light-catalog') : ( catalogSort == 1 ? 'sortupdark' : 'dark-catalog' )}}.png" />
<!-- <image data-index="{{1}}" class="act" src="{{imageRoot}}2c/websiteindex/{{curTabIndex == 1 ? ( catalogSort == 1 ? 'sortupicon' : 'light-catalog') : ( catalogSort == 1 ? 'sortupdark' : 'dark-catalog' )}}.png" /> -->
<view class="sort-dailog" wx:if="{{sortDailogShow}}">
<image class="sort-bg" src="{{imageRoot}}2c/websiteindex/sortbg.png?{{imageVersion}}" />
<view class="sort-item1 {{catalogSort == 1 ? 'actSort' :''}}" data-sortindex="{{1}}" bindtap="catlogSortChange">正序</view>
......@@ -111,15 +111,15 @@
<view class="catalog-item" wx:for="{{onlinesubcourses}}" wx:key="index" bindtap="goOnlineclassroomplay" data-item="{{item}}">
<view class="type-box">
<block wx:if="{{item.content}}">
<view class="type-tag" wx:if="{{item.content.type == 1 || item.content.type == 4 || item.content.type == 5}}">图</view>
<view class="type-tag" wx:if="{{item.content.type == 2}}">视频</view>
<view class="type-tag" wx:if="{{item.content.type == 3}}">音频</view>
<view class="type-tag" wx:if="{{item.content.type == 1 || item.content.type == 4 || item.content.type == 5}}">图</view>
<view class="type-tag tag-red" wx:if="{{item.content.type == 2}}">视频</view>
<view class="type-tag tag-yellow" wx:if="{{item.content.type == 3}}">音频</view>
</block>
<view class="type-tag" wx:else>文字</view>
<view class="type-tag" wx:else>图文</view>
</view>
<view class="info-box">
<view class="title">{{item.title}}</view>
<view class="count-box" wx:if="{{item.content}}">
<view class="count-box" wx:if="{{item.content && (item.content.type==2 || item.content.type==3)}}">
<view class="count-item" wx:if="{{item.content.properties.duration}}">
<image class="icon" src="{{imageRoot}}2c/websiteindex/onlinecourse/icon_time.png"/>{{filter.Mathceil(item.content.properties.duration/60)}}分钟
</view>
......
......@@ -118,7 +118,7 @@
color:#999;
line-height: 34rpx;
word-break: break-all;
padding-top: 20rpx;
padding-top: 11rpx;
}
.learncountbox {
padding: 0 24rpx 0 24rpx;
......@@ -191,6 +191,7 @@
height:2rpx;
margin: 0 auto;
background: #eee;
transform: scaleY(.5);
}
.content-box .tab-box{
display: flex;
......@@ -208,7 +209,6 @@
display: flex;
align-items: center;
justify-content: center;
position: relative;
}
.tab-itemSet::before{
content: '';
......@@ -218,17 +218,20 @@
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
transform: translateY(-50%) scaleX(.5);
}
.content-box .tab-item image{
.content-box .tab-item .act{
width: 20rpx;
height: 18rpx;
vertical-align: middle;
margin-left: 4rpx;
margin-left: 4rpx;position: absolute;
top: 50%;
transform: translateY(-50%);
left: calc(50% + 30rpx);
}
.content-box .act-tab{
color:#222;
font-weight: 600;
font-weight: bold;
}
.content-box .act-tab::after{
content: '';
......@@ -245,8 +248,7 @@
width: 190rpx;
height: 212rpx;
position: absolute;
left: 50%;
margin-left: -95rpx;
left: 40%;
bottom: -212rpx;
z-index: 1;
}
......@@ -446,6 +448,7 @@
width: 88rpx;
height: 88rpx;
border-radius: 50%;
display: block;
}
.content-box .introduction .business-box .business-info .business-name .title{
font-size: 26rpx;
......@@ -461,7 +464,7 @@
.content-box .introduction .business-box .business-info .business-name .info-num-box{
display: flex;
flex-wrap: wrap;
padding-top: 7rpx;
padding-top: 10rpx;
}
.content-box .introduction .business-box .business-info .business-name .info-num-box .num-item{
font-size: 22rpx;
......@@ -471,6 +474,7 @@
position: relative;
padding: 0 10rpx;
margin: 4rpx 20rpx 4rpx 0;
border-radius: 6rpx;
}
.content-box .introduction .business-box .in-btn{
min-width: 96rpx;
......@@ -504,6 +508,7 @@
position: absolute;
left: 0;
bottom: 0;
transform: scaleY(.5);
}
.catalog-list .catalog-item:last-of-type::after{
display: none;
......@@ -513,14 +518,22 @@
}
.catalog-list .catalog-item .type-box .type-tag{
width: 52rpx;
height: 25rpx;
border-radius: 4rpx;
height: 28rpx;
border-radius: 6rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 16rpx;
color: #FEA917;
border:1px solid #FEA917;
color: #35BAFD;
border:1px solid #35BAFD;
}
.catalog-list .catalog-item .type-box .tag-yellow{
color: #FF9F49;
border:1px solid #FF9F49;
}
.catalog-list .catalog-item .type-box .tag-red{
color: #FB7A28;
border:1px solid #FB7A28;
}
.catalog-list .catalog-item .info-box{
flex: 1;
......@@ -554,7 +567,7 @@
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
transform: translateY(-50%) scaleX(.5);
}
.catalog-list .catalog-item .info-box .count-box .count-item:last-of-type::after{
display: none;
......
......@@ -231,7 +231,7 @@
background: #999;
position: absolute;
top: 50%;
transform: translateY(-50%);
transform: translateY(-50%) scaleX(.5);
right: 0;
}
.online-classroom .content-box .content-item .learnbox .learnitem:last-of-type::after{
......
......@@ -74,11 +74,11 @@
</view>
<view class="title-box">
<view class="title">{{coursesDetail.title}}</view>
<view class="subtitle">{{coursesDetail.remark}}</view>
<view class="subtitle" wx:if="{{coursesDetail.remark}}">{{coursesDetail.remark}}</view>
</view>
<view class="learncountbox">
<view class="left">
<view class="studentboxavatarbox">
<view class="studentboxavatarbox" wx:if="{{coursesDetail.visitors.length>0}}">
<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}}2c/ucenter2/empty_avatar.png?{{imageVersion}}" wx:else></image>
......@@ -86,11 +86,7 @@
<image class="studentboxavatar" src="{{imageRoot}}2c/onlineclass/moreicon.png?{{imageVersion}}"></image>
<text class="learncount">{{coursesDetail.study_count}}人已学习</text>
</view>
<!-- <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="coursecount" wx:if="{{coursesDetail.content && (coursesDetail.content.type==2 || coursesDetail.content.type==3)}}">
<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>
......@@ -205,7 +201,7 @@
<view class="btn-title">返回</view>
</view> -->
<view class="impressions" bindtap="showcommenteditor">
<image class="icon" src="{{localImageRoot}}2c/websiteindex/icon_edit.png?{{imageVersion}}"></image>
<image class="icon" src="{{imageRoot}}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">
......@@ -217,7 +213,7 @@
<view class="btn-title">分享</view>
</view> -->
<view class="btn-item" bindtap="showCatlogDailog" wx:if="{{pid}}">
<image class="icon catlog-icon" src="{{localImageRoot}}2c/websiteindex/catlog-icon.png?{{imageVersion}}"></image>
<image class="icon catlog-icon" src="{{imageRoot}}2c/websiteindex/catlog-icon.png?{{imageVersion}}"></image>
<view class="btn-title">目录</view>
</view>
</view>
......@@ -263,15 +259,15 @@
<view class="catlog-item {{item.isAction ? 'action-item' : ''}}" bindtap="changeCourse" data-item="{{item}}" data-index="{{index}}" wx:for="{{onlinesubcourses}}" wx:key="index">
<view class="type-box">
<block wx:if="{{item.content}}">
<view class="type-tag" wx:if="{{item.content.type == 1 || item.content.type == 4 || item.content.type == 5}}">图</view>
<view class="type-tag" wx:if="{{item.content.type == 2}}">视频</view>
<view class="type-tag" wx:if="{{item.content.type == 3}}">音频</view>
<view class="type-tag" wx:if="{{item.content.type == 1 || item.content.type == 4 || item.content.type == 5}}">图</view>
<view class="type-tag tag-red" wx:if="{{item.content.type == 2}}">视频</view>
<view class="type-tag tag-yellow" wx:if="{{item.content.type == 3}}">音频</view>
</block>
<view class="type-tag" wx:else>文字</view>
<view class="type-tag" wx:else>图文</view>
</view>
<view class="info-box">
<view class="title">{{item.title}}</view>
<view class="count-box">
<view class="count-box" wx:if="{{item.content && (item.content.type==2 || item.content.type==3)}}">
<view class="count-item" wx:if="{{item.content && item.content.properties.duration}}">
<image class="icon" src="{{imageRoot}}2c/websiteindex/onlinecourse/icon_time.png"/>{{filter.Mathceil(item.content.properties.duration/60)}}分钟
</view>
......@@ -287,7 +283,7 @@
</view>
</view>
</view>
<image class="icon-status status-video" wx:if="{{item.isAction && item.content.type==2}}" src="{{imageRoot}}2c/websiteindex/onlinecourse/video_play.png?{{imageVersion}}"/>
<image class="icon-status status-video" wx:if="{{item.isAction && (item.content.type==2 || item.content.type==3)}}" src="{{imageRoot}}2c/websiteindex/onlinecourse/video_play.png?{{imageVersion}}"/>
<image class="icon-status status-pic" wx:if="{{item.isAction && (item.content.type==1 || item.content.type==4 || item.content.type==5)}}" src="{{imageRoot}}2c/websiteindex/onlinecourse/pic_play.png?{{imageVersion}}"/>
</view>
</scroll-view>
......
......@@ -163,7 +163,7 @@
.learncountbox {
padding: 0 24rpx 0 24rpx;
display: flex;
align-items: flex-start;
align-items: center;
justify-content: space-between;
margin-bottom: 18rpx;
position: relative;
......@@ -172,19 +172,17 @@
width: 114rpx;
height: 114rpx;
display: block;
position: absolute;
top: 50%;
right: 24rpx;
transform: translateY(-50%);
}
.divideline {
width: 702rpx;
margin: 0 auto;
border-bottom: 1px solid #EEEEEE;
border-bottom: 1px solid #eee;
transform: scaleY(.5);
}
.coursecount {
display: flex;
align-items: center;
padding-top: 20rpx;
}
.coursecount .count-item{
font-size: 22rpx;
......@@ -206,7 +204,7 @@
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
transform: translateY(-50%) scaleX(.5);
}
.coursecount .count-item:last-of-type::after{
display: none;
......@@ -228,7 +226,6 @@
.studentboxavatarbox {
display: flex;
align-items: center;
margin-bottom: 20rpx;
}
.studentboxavatarbox .studentboxavatar {
display: block;
......@@ -252,15 +249,13 @@
font-weight:700;
color:rgba(51,51,51,1);
line-height:1;
padding-bottom: 14rpx;
line-height: 48rpx;
}
.top-box .title-box .subtitle{
font-size:24rpx;
font-family:PingFangSC-Light,PingFang SC;
font-weight:300;
color:rgba(127,123,123,1);
font-size: 22rpx;
color:#999;
line-height: 34rpx;
padding-top: 11rpx;
}
.top-box .phase-count{
padding: 24rpx 24rpx 10rpx 0;
......@@ -329,10 +324,11 @@
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
transform: translateY(-50%) scaleX(.5);
}
.content-box .tab-box .tab-item.active{
color: #222;
font-weight: bold;
}
.content-box .tab-box .tab-item.active::after{
content:'';
......@@ -346,7 +342,7 @@
bottom: 10rpx;
}
.content-box .introduction{
padding: 0 24rpx 36rpx;
padding: 14rpx 24rpx 36rpx;
min-height: 300rpx;
position: relative;
}
......@@ -466,6 +462,7 @@
width: 88rpx;
height: 88rpx;
border-radius: 50%;
display: block;
}
.content-box .introduction .business-box .business-info .business-name .title{
font-size:28rpx;
......@@ -481,7 +478,7 @@
.content-box .introduction .business-box .business-info .business-name .info-num-box{
display: flex;
flex-wrap: wrap;
padding-top: 7rpx;
padding-top: 10rpx;
}
.content-box .introduction .business-box .business-info .business-name .info-num-box .num-item{
font-size: 22rpx;
......@@ -491,6 +488,7 @@
position: relative;
padding: 0 10rpx;
margin: 4rpx 20rpx 4rpx 0;
border-radius: 6rpx;
}
.content-box .introduction .business-box .in-btn{
min-width: 96rpx;
......@@ -857,6 +855,7 @@
position: absolute;
left: 0;
bottom: 0;
transform: scaleY(.5);
}
.comment-list .comment-item:last-of-type::after{
display: none;
......@@ -1086,6 +1085,25 @@
color: #FEA917;
border:1px solid #FEA917;
}
.catlog-dailog .content .catlog-list .catlog-item .type-box .type-tag{
width: 52rpx;
height: 28rpx;
border-radius: 6rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 16rpx;
color: #35BAFD;
border:1px solid #35BAFD;
}
.catlog-dailog .content .catlog-list .catlog-item .type-box .tag-yellow{
color: #FF9F49;
border:1px solid #FF9F49;
}
.catlog-dailog .content .catlog-list .catlog-item .type-box .tag-red{
color: #FB7A28;
border:1px solid #FB7A28;
}
.catlog-dailog .content .catlog-list .action-item{
color:#FB7A28;
}
......@@ -1128,7 +1146,7 @@
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
transform: translateY(-50%) scaleX(.5);
}
.catlog-dailog .content .catlog-list .catlog-item .info-box .count-box .count-item:last-of-type::after{
display: none;
......
......@@ -38,6 +38,22 @@
font-size: 26rpx;
color: #000;
}
.userlist-box .list-item .item-content .info-box .info-item{
display: flex;
align-items: center;
padding-right: 100rpx;
}
.userlist-box .list-item .item-content .info-box .info-item:last-of-type{
padding-right: 0;
}
.userlist-box .list-item .item-content .info-box .info-item .info-label{
font-size: 24rpx;
}
.userlist-box .list-item .item-content .info-box .info-item .num{
font-size: 26rpx;
color: #FFB97A;
font-weight: 500;
}
.userlist-box .list-item .item-content .nickname{
font-size: 26rpx;
color: #000;
......
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