Commit ac1b7150 authored by sujie's avatar sujie

dd

parent 5b84f8e4
......@@ -68,6 +68,8 @@ import activityconfig from '../../../constants/activityconfig.js';
var app = getApp();
Page({
data: {
titleBarHeight: app.globalData.titleBarHeight,
statusBarHeight: app.globalData.statusBarHeight,
userInfoDetail: {},
localImageRoot: '../../../images/',
id: 0,
......@@ -2509,6 +2511,7 @@ Page({
this.data.needREfresh = false;
this.setData({
moreTheme: data,
passwordDailogShow: data.join_rule_type == 2 ? true : false
})
this.judgeIsSchoolStudent(data.school_id);
this.websitehomeGet(data.school_id);
......@@ -2535,7 +2538,15 @@ Page({
data
} = res;
if (code == 200) {
const choose = this.data.sub?data.list.find((ele)=>ele.id==this.data.sub):data.list[0];
let choose = this.data.sub?data.list.find((ele)=>ele.id==this.data.sub):data.list[0];
if(!choose){
wx.showToast({
title: '该关卡已删除,已为您切换到第一关',
icon: 'none',
duration: 2000
})
choose = data.list[0];
}
const _allSubList = this.data.allSubList;
for(let i=0;i<_allSubList.length;i++){
_allSubList[i] = data.list[i]
......@@ -2648,7 +2659,7 @@ Page({
item,
index
} = e.currentTarget.dataset;
if(!item&&this.data.subjectsList[index-1]&&this.data.subjectsList[index-1].my_unlock_count){
if(!item){
wx.showToast({
title: '老师还没有编辑该课时',
icon: 'none',
......@@ -2661,12 +2672,55 @@ Page({
}
const _scrollLeft = this.data.scrollLeft;
this.setData({
scrollLeft:(item.sort-1)*10
scrollLeft:(item.sort-1)*10,
selectClassShow: false
})
this.chooseSub(item);
},
nextCard(){
const { themeSelect, subjectsList} = this.data;
if(themeSelect.sort == subjectsList.length){
wx.showToast({
title: '当前已经是最后一关了',
icon: 'none',
duration: 2000
})
return
}
const data = subjectsList[themeSelect.sort] || '';
this.chooseSub(data);
},
preCard(){
const { themeSelect, subjectsList} = this.data;
if(themeSelect.sort-2<0){
wx.showToast({
title: '当前已经是第一关了',
icon: 'none',
duration: 2000
})
return
}
const data = subjectsList[themeSelect.sort-2] || '';
this.chooseSub(data);
},
// 选中的课时
chooseSub(data) {
if(!data){
wx.showToast({
title: '老师还没有编辑该课时',
icon: 'none',
duration: 2000
})
return
}
if (!data||data.my_unlock_count == 0) {
wx.showToast({
title: '该关卡还未解锁',
icon: 'none',
duration: 2000
})
return;
}
try {
data.content = JSON.parse(data.content);
} catch (error) {
......@@ -2888,6 +2942,11 @@ Page({
url: `/src/pages/websiteindex/index?sid=${this.data.circleInfo.school_id}`,
})
},
showSelectClass(){
this.setData({
selectClassShow: true
})
},
hideSelectClass(e) {
if (e.target.dataset.flag) {
this.setData({
......@@ -2895,6 +2954,43 @@ Page({
})
}
},
goBack(){
wx.navigateBack({
delta:1
})
},
passwordInput(e) {
const {
value
} = e.detail;
this.setData({
password: value,
})
},
hidePasswordDailog(){
const { password, moreTheme } =this.data;
if(password == moreTheme.password){
wx.showToast({
title: '密码正确',
icon: 'none',
duration: 2000
})
this.setData({
passwordDailogShow: false
})
}else{
wx.showToast({
title: '密码错误,请重新输入',
icon: 'none',
duration: 2000
})
}
},
goWebsiteindex(){
wx.navigateTo({
url: `/src/pages/websiteindex/index?sid=${this.data.sid}&tabIndex=${this.data.moreTheme.jump_type}`,
})
},
// 防止悬浮窗滚动页面滚动,无特殊意义
ture () { },
......
This diff is collapsed.
......@@ -92,6 +92,163 @@ page{
background: #f7f7f7;
padding-bottom: 40rpx;
}
.container-top-box{
width:100%;
height:314rpx;
position: relative;
}
.container-top-box .back-btn{
position: absolute;
left: 26rpx;
z-index: 10;
}
.container-top-box .back-btn image{
width: 14rpx;
height: 27rpx;
}
.container-top-box .mask{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
background:rgba(60,60,60,.3);
z-index: 2;
}
.container-top-box .img-mask{
width:100%;
height:314rpx;
position: absolute;
left: 0;
top: 0;
z-index: 1;
filter:blur(10rpx);
}
.container-top-box .info-box{
position: absolute;
left: 0;
bottom: 32rpx;
padding: 0 26rpx;
z-index: 3;
width: 100%;
display: flex;
}
.container-top-box .info-box .banner-box{
padding-right: 32rpx;
}
.container-top-box .info-box .banner-box image{
width:176rpx;
height:133rpx;
border-radius:10rpx;
}
.container-top-box .info-box .title-box{
max-width: 400rpx;
min-width: 300rpx;
}
.container-top-box .info-box .title-box .title{
font-size:28rpx;
font-family:PingFang SC;
font-weight:bold;
color:rgba(255,255,255,1);
line-height:1;
padding-bottom: 56rpx;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.container-top-box .info-box .title-box .btn-box{
display: flex;
justify-content: space-between;
}
.container-top-box .info-box .title-box .btn-box .btn{
padding: 12rpx 22rpx;
font-size:22rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(0,0,0,1);
line-height:1;
background:rgba(255,209,70,1);
border-radius:23rpx;
}
.container-top-box .info-box .share-btn{
position: absolute;
right: 24rpx;
top: 0;
}
.container-top-box .info-box .share-btn .img-box image{
width:67rpx;
height:67rpx;
border:1px solid rgba(255, 255, 255, 1);
border-radius: 50%;
}
.container-top-box .info-box .share-btn .text{
font-size:22rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(255,255,255,1);
padding-top: 2rpx;
text-align: center;
line-height: 1;
}
.select-box{
width: 100%;
height:110rpx;
background:rgba(255,255,255,1);
display: flex;
align-items: center;
padding: 0 26rpx;
}
.select-box .pre-btn{
font-size:24rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(26,26,26,1);
}
.select-box .pre-btn image{
width:12rpx;
height:20rpx;
transform: rotate(180deg);
margin-right: 12rpx;
}
.select-box .next-btn{
font-size:24rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(26,26,26,1);
}
.select-box .next-btn image{
width:12rpx;
height:20rpx;
margin-left: 12rpx;
}
.select-box .subject-title{
width:415rpx;
height:67rpx;
background:rgba(240,240,244,1);
border-radius:10rpx;
margin: 0 42rpx;
display: flex;
align-items: center;
justify-content: center;
font-size:26rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(26,26,26,1);
padding: 0 16rpx;
}
.select-box .subject-title .title{
max-width: 390rpx;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.select-box .subject-title image{
width:12rpx;
height:20rpx;
transform: rotate(90deg);
margin-left: 18rpx;
}
.theme-index-container {
min-height: 100vh;
background: rgba(244, 244, 247, 1);
......@@ -123,7 +280,6 @@ page{
} */
.theme-index-title {
background-color: #fff;
padding: 0 25rpx 15rpx 0;
position: relative;
}
......@@ -137,17 +293,20 @@ page{
}
.theme-index-title .big-title {
line-height: 1;
font-size: 30rpx;
line-height: 1.5;
font-size: 32rpx;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: rgba(84, 84, 84, 1);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-bottom: 20rpx;
color:rgba(0,0,0,1);
padding-bottom: 10rpx;
}
.theme-index-title .time{
font-size:24rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(118,118,118,1);
}
.theme-index-container .header-box {
padding: 30rpx 0 17rpx 0;
background-color: #fff;
......@@ -342,7 +501,7 @@ page{
}
.sjd-media-show-box {
background-color: #fff;
/* background-color: #fff; */
padding: 0 23rpx 0 23rpx;
border-bottom: 1px solid transparent;
}
......@@ -891,20 +1050,31 @@ page{
border:2rpx solid rgba(255,206,55,1);
}
.theme-detail-box {
margin: 0 auto;
margin-top: -30rpx;
width: 702rpx;
background: rgba(255, 255, 255, 1);
border: 1px solid rgba(242, 242, 242, 1);
box-shadow:0px 0px 15rpx 0px rgba(0, 0, 0, 0.05);
border-radius: 20rpx;
margin-bottom: 30rpx;
overflow: hidden;
background:rgba(240,240,244,1);
}
.theme-detail-box .title-name{
display: flex;
align-items: center;
padding: 50rpx 0 20rpx 24rpx;
}
.theme-detail-box .title-name .line{
width:8rpx;
height:26rpx;
background:rgba(255,209,70,1);
border-radius:4rpx;
margin-right: 13rpx;
}
.theme-detail-box .title-name .text{
font-size:28rpx;
font-family:PingFang SC;
font-weight:bold;
color:rgba(112,112,112,1);
}
.theme-detail-box .detail-content-box {
min-height: 200rpx;
padding-bottom: 20rpx;
color:rgba(112,112,112,1);
}
.theme-detail-box .detail-content-box.isexpand {
......@@ -919,7 +1089,7 @@ page{
}
.theme-detail-box .theme-index-title {
padding: 26rpx 30rpx 10rpx 30rpx;
padding: 20rpx 30rpx 10rpx 30rpx;
}
.theme-detail-box .theme-index-title .big-time {
......@@ -950,28 +1120,34 @@ page{
}
.theme-detail-box .operat-box {
/* height: 510rpx; */
width:702rpx;
height:100rpx;
border-radius:50rpx;
text-align: center;
position: fixed;
left: 23rpx;
bottom: 41rpx;
background: #fff;
z-index: 1000;
}
.theme-detail-box .operat-box .big-btn {
width:384rpx;
height:80rpx;
line-height: 80rpx;
width:702rpx;
height:100rpx;
line-height: 100rpx;
background:linear-gradient(90deg,rgba(255,223,113,1) 0%,rgba(255,210,72,1) 100%);
box-shadow:0px 0px 6rpx 0px rgba(255,209,70,0.4);
border-radius:40rpx;
border-radius:50rpx;
font-size: 26rpx;
text-align: center;
font-family: PingFang-SC-Bold;
font-weight: bold;
color: rgba(0, 0, 0, 1);
margin: 0 auto;
margin-top: 28rpx;
margin-bottom: 32rpx;
/* background: url('https://cdn.img.shangjiadao.cn/source/images/dakav3/2c/themeindex/dark.png') no-repeat center;
background-size: 100% 100%; */
position: relative;
letter-spacing: 2rpx;
z-index: 100;
}
.operat-box .big-btn .lightbtnbg{
width: 26rpx;
......@@ -1296,7 +1472,7 @@ page{
position: fixed;
left: 0;
top: 0;
z-index: 100;
z-index: 99999;
}
.password-ipt-dailog .mask{
width: 100%;
......@@ -1525,6 +1701,13 @@ page{
justify-content: center;
margin-right: 13rpx;
}
.select-student-dailog .dailog-class-content .class-list .class-item .item-info .status-box .did-icon{
background: #52DF89;
}
.select-student-dailog .dailog-class-content .class-list .class-item .item-info .status-box .did-icon image{
width: 18rpx;
height: 18rpx;
}
.select-student-dailog .dailog-class-content .class-list .class-item .item-info .status-box .inner{
width:13rpx;
height:3rpx;
......@@ -1541,6 +1724,9 @@ page{
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.select-student-dailog .dailog-class-content .class-list .class-item .act-class{
color: #FFD146;
}
.select-student-dailog .dailog-class-content .class-list .class-item:last-of-type{
border: none;
......
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