Skip to content

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

fix

parent bfae5901
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 423 additions and 168 deletions
business/pages/exchangebusiness/index.wxss
View file @ 08b00115
......@@ -107,6 +107,9 @@
}
.boxwrap .leftbox .schoolname.short{
width: 350rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.boxwrap .currenttag {
background-color: #35BAFD;
......
business/pages/organizationalmgt/index.wxss
View file @ 08b00115
......@@ -18,8 +18,8 @@ page{
width:702rpx;
background:#fff;
border-radius: 20rpx;
padding: 32rpx 32rpx 25rpx 32rpx;
padding-top: 56rpx;
padding: 32rpx 32rpx 28rpx 32rpx;
padding-top: 40rpx;
margin: 27rpx auto 26rpx;
position: relative;
z-index: 20;
......@@ -28,8 +28,8 @@ page{
.header-box .top-box {
display: flex;
align-items: center;
padding-bottom: 22rpx;
border-bottom: 1px solid rgba(0,0,0,.05);
padding-bottom: 30rpx;
border-bottom: 1px solid #eee;
}
.header-box .top-box .logo-box{
width:120rpx;
......@@ -53,7 +53,7 @@ page{
font-size: 22rpx;
text-align: center;
display: inline-block;
padding: 0 7rpx;
padding: 0 14rpx;
}
.header-box .top-box .info-box .roletag.teacher {
color: #FF9F49;
......@@ -67,7 +67,11 @@ page{
color:rgba(0,0,0,1);
line-height:1;
padding-bottom: 26rpx;
word-break: break-all;
max-width: 450rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.header-box .top-box .info-box .list-box {
display: flex;
......@@ -96,7 +100,7 @@ page{
font-weight:400;
color:rgba(130,130,130,1);
line-height:1;
padding-top: 25rpx;
padding-top: 28rpx;
display: flex;
align-items: center;
justify-content: space-between;
......@@ -105,7 +109,7 @@ page{
color: #666666;
font-size: 22rpx;
max-width: 450rpx;
line-height: 1.5;
line-height: 1;
word-break: break-all;
}
.header-box .nick-name .rolechangebox {
......@@ -121,7 +125,6 @@ page{
.header-box .nick-name .icon{
width: 24rpx;
height: 24rpx;
margin-right: 14rpx;
border-radius: 50%;
}
.line-box{
......@@ -134,8 +137,20 @@ page{
display: flex;
align-items: center;
justify-content: space-between;
padding: 36rpx 30rpx 34rpx 30rpx;
padding: 30rpx 24rpx;
border-bottom: 1px solid rgba(0,0,0,.05);
position: relative;
}
.line-box .line::after{
content: '';
width: calc(100% - 24rpx);
background: #eee;
position: absolute;
bottom: 0;
right: 0;
}
.line-box .line:last-of-type::after{
display: none;
}
.line-box .line .left{
font-size:26rpx;
......@@ -149,7 +164,7 @@ page{
.line-box .line .left .icon{
width: 40rpx;
height: 40rpx;
margin-right: 22rpx;
margin-right: 16rpx;
}
.line-box .line .left .message-icon{
width: 31rpx;
......
business/pages/websiteindex/index.wxml
View file @ 08b00115
This diff is collapsed.
business/pages/websiteindex/index.wxss
View file @ 08b00115
......@@ -202,6 +202,7 @@ page{
position: relative;
padding: 0 10rpx;
margin: 5rpx;
border-radius: 6rpx;
}
.schoolinfo-box .address-box{
padding: 25rpx 0;
......@@ -859,6 +860,7 @@ page{
.business-instro .desc-box{
padding: 0 24rpx;
position: relative;
margin-top: -10rpx;
}
.business-instro .desc-box .content{
font-size: 26rpx;
......@@ -1037,7 +1039,7 @@ page{
min-width: 130rpx;
height: 130rpx;
margin-right: 20rpx;
border-radius: 20rpx;
border-radius: 10rpx;
overflow: hidden;
}
.subject-list .list-item .cover-box .cover{
......@@ -1100,6 +1102,7 @@ page{
color: #222;
line-height: 37rpx;
padding: 12rpx 0 3rpx;
font-weight: bold;
}
.section-ad{
width: 100%;
......
constants/constants.js
View file @ 08b00115
export default {
imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/dakav2/images/',
// host: 'https://qxapi.qingxiao.online/daka',
// host2: 'https://wx.m.shangjiadao.cn',
host: 'https://qxapi.qingxiao.online/daka',
host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '5.0',
imageVersion: '20200409',
host: 'https://clock.wp53.cn',
host2: 'https://test.wp53.cn',
// host: 'https://clock.wp53.cn',
// host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785',
miniProgram: {
clock: 'wxdeee20e52a1fd7ee'
......
src/components/brickLayout/index.wxss
View file @ 08b00115
......@@ -22,7 +22,7 @@
}
.list-item .video-image{
width: 100%;
border-radius: 20rpx;
border-radius: 10rpx;
display: block;
}
.list-item .top-fix{
......
src/pages/websiteindex/index.js
View file @ 08b00115
......@@ -1501,7 +1501,7 @@ Page({
})
websitesubjectGet({
page: 1,
perPage: 3,
perPage: 4,
school_id: this.data.sid,
}).then((res) => {
const { code, data } = res;
......@@ -1554,5 +1554,14 @@ Page({
address: addressInfo.location_address,
name: addressInfo.address
})
},
jumpAdUrl (e){
const { url } = e.currentTarget.dataset;
if( !url ) {
return
}
wx.navigateTo({
url: '/'+url
})
}
})
\ No newline at end of file
src/pages/websiteindex/index.wxml
View file @ 08b00115
This diff is collapsed.
src/pages/websiteindex/index.wxss
View file @ 08b00115
......@@ -202,6 +202,7 @@ page{
position: relative;
padding: 0 10rpx;
margin: 5rpx;
border-radius: 6rpx;
}
.schoolinfo-box .address-box{
padding: 25rpx 0;
......@@ -859,6 +860,7 @@ page{
.business-instro .desc-box{
padding: 0 24rpx;
position: relative;
margin-top: -10rpx;
}
.business-instro .desc-box .content{
font-size: 26rpx;
......@@ -1037,7 +1039,7 @@ page{
min-width: 130rpx;
height: 130rpx;
margin-right: 20rpx;
border-radius: 20rpx;
border-radius: 10rpx;
overflow: hidden;
}
.subject-list .list-item .cover-box .cover{
......@@ -1100,6 +1102,7 @@ page{
color: #222;
line-height: 37rpx;
padding: 12rpx 0 3rpx;
font-weight: bold;
}
.section-ad{
width: 100%;
......@@ -1109,4 +1112,5 @@ page{
.section-ad .cover{
width: 100%;
height: 100%;
}
\ No newline at end of file
border-radius: 20rpx;
}
src/pages/websiteindex/momentvideo.wxml
View file @ 08b00115
......@@ -32,7 +32,7 @@
bindtransition="swipertransition"
bindanimationfinish="swiperanimationfinish"
>
<block wx:for="{{playList}}" wx:for-index="playindex" wx:for-item="playitem" wx:key="{{playindex}}" style="position: relative">
<block wx:for="{{playList}}" wx:for-index="playindex" wx:for-item="playitem" wx:key="playindex" style="position: relative">
<swiper-item>
<!-- <view class="video-box-wrapper" wx-if="{{playitem.type==2}}">
<view class="video-box-wrapper">
......
src/pages/websiteindex/onlineclassroomindex.js
View file @ 08b00115
......@@ -491,22 +491,22 @@ Page({
showPassWordTip:true,
passWord: ''
})
wx.showToast({
title: '密码错误',
icon: 'none',
duration: 2000
})
// wx.showToast({
// title: '密码错误',
// icon: 'none',
// duration: 2000
// })
}
}).catch((res)=>{
this.setData({
showPassWordTip:true,
passWord: ''
})
wx.showToast({
title: '密码错误',
icon: 'none',
duration: 2000
})
// wx.showToast({
// title: '密码错误',
// icon: 'none',
// duration: 2000
// })
})
},
goWebsiteIndex(){
......
src/pages/websiteindex/onlineclassroomindex.wxml
View file @ 08b00115
......@@ -119,11 +119,11 @@
</view>
<view class="info-box">
<view class="title">{{item.title}}</view>
<view class="count-box">
<view class="count-item" wx:if="{{item.content && item.content.properties.duration}}">
<view class="count-box" wx:if="{{item.content}}">
<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>
<view class="count-item" wx:if="{{item.content && item.content.type==2 || item.content.type==3}}">
<view class="count-item" wx:if="{{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>
......
src/pages/websiteindex/onlineclassroomindex.wxss
View file @ 08b00115
......@@ -452,7 +452,7 @@
font-weight: 600;
color:#222;
line-height: 1;
max-width: 450rpx;
max-width: 400rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
......@@ -566,7 +566,7 @@
.content-box .search-box{
display: flex;
margin: 0 26rpx 0 24rpx;
margin: 0 26rpx 20rpx 24rpx;
align-items: center;
justify-content: space-between;
}
......
src/pages/websiteindex/onlineclassroomplay.wxss
View file @ 08b00115
......@@ -445,7 +445,7 @@
font-weight: 600;
color:#222;
line-height: 1;
max-width: 450rpx;
max-width: 400rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
......@@ -1002,11 +1002,11 @@
.catlog-dailog .content .title-box .title{
font-size: 32rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:#222;
display: flex;
align-items: center;
line-height: 45rpx;
font-weight: bold;
}
.catlog-dailog .content .title-box .right{
display: flex;
......
src/pages/websiteindex/subjectlist.wxss
View file @ 08b00115
......@@ -24,7 +24,7 @@ page {
min-width: 130rpx;
height: 130rpx;
margin-right: 20rpx;
border-radius: 20rpx;
border-radius: 10rpx;
overflow: hidden;
}
.subject-list .list-item .cover-box .cover{
......
src/pages/websiteindex/teacherdetail.wxss
View file @ 08b00115
......@@ -40,12 +40,13 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: bold;
}
.list-box .list-item .main .line .label {
height: 30rpx;
height: 36rpx;
font-size: 22rpx;
background: #f7f7f7;
line-height: 30rpx;
line-height: 36rpx;
padding: 0 10rpx;
margin-left: 14rpx;
border-radius: 6rpx;
......@@ -102,10 +103,11 @@
content: "";
width: 100%;
height: 1px;
background: #eeeeee;
background: #eee;
position: absolute;
left: 0;
top: 0;
transform: scaleY(.5);
}
video{
width: 100%;
......
src/pages/websiteindex/teacherlist.wxss
View file @ 08b00115
......@@ -47,10 +47,10 @@ page {
text-overflow: ellipsis;
}
.list-box .list-item .main .line .label {
height: 30rpx;
height: 36rpx;
font-size: 22rpx;
background: #f7f7f7;
line-height: 30rpx;
line-height: 36rpx;
padding: 0 10rpx;
margin-left: 14rpx;
border-radius: 6rpx;
......
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