Commit 164a6f30 authored by wangxuelai's avatar wangxuelai

'最新打卡提交'

parent 3432c7ad
...@@ -44,7 +44,7 @@ Page({ ...@@ -44,7 +44,7 @@ Page({
}, },
introduceContent: [ introduceContent: [
{ {
title: "训练营是如何开展学习的?", title: "",
content: [ content: [
{ type: "text", value: "1.全程陪伴练字教学,我们通过听课+作业+点\r\n评+群内解答等互动形式,提高学习效果\r\n2.国家级书法名师亲自授课,指导你快速学习\r\n正确的握笔姿势和练字方法\r\n3.从零基础讲起,适合小白快速入门,课程系\r\n 统全面,有经验的学员也能得到进一步提高;\r\n4.我们的每一位同学都将得到一对一教师指导,\r\n每天督促学习,陪伴式成长\r\n\r\n适合人群\r\n(1)零基础练字学员\r\n(2)有一点基础,想提升的学员\r\n(3)节假日期间想快速练好字的学员" }, { type: "text", value: "1.全程陪伴练字教学,我们通过听课+作业+点\r\n评+群内解答等互动形式,提高学习效果\r\n2.国家级书法名师亲自授课,指导你快速学习\r\n正确的握笔姿势和练字方法\r\n3.从零基础讲起,适合小白快速入门,课程系\r\n 统全面,有经验的学员也能得到进一步提高;\r\n4.我们的每一位同学都将得到一对一教师指导,\r\n每天督促学习,陪伴式成长\r\n\r\n适合人群\r\n(1)零基础练字学员\r\n(2)有一点基础,想提升的学员\r\n(3)节假日期间想快速练好字的学员" },
{ type: "img", value: "https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2b/themeeditorlock/title-1.png" }, { type: "img", value: "https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2b/themeeditorlock/title-1.png" },
......
...@@ -78,7 +78,7 @@ Component({ ...@@ -78,7 +78,7 @@ Component({
}, },
selectedVoice: '', selectedVoice: '',
expandShow: false expandShow: true
}, },
created () { created () {
console.log(this.data.content, 'asdasd') console.log(this.data.content, 'asdasd')
...@@ -87,19 +87,20 @@ Component({ ...@@ -87,19 +87,20 @@ Component({
}, },
ready () { ready () {
const that = this; const that = this;
// setTimeout(()=> { setTimeout(()=> {
// const query = wx.createSelectorQuery().in(this) const query = wx.createSelectorQuery().in(this)
// query.select('#contentbox').fields({ query.select('#media-content-box').fields({
// size: true, size: true,
// }, function (res) { }, function (res) {
// const {height} = res; const {height} = res;
// if (height > 60) { if (height < 60) {
// that.setData({ that.setData({
// expandShow: true expandShow: false,
// }) expanded: true
// } })
// }).exec() }
// }, 200) }).exec()
}, 200)
}, },
methods: { methods: {
expandAction () { expandAction () {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="contentbox" id="contentbox" > <view class="contentbox" id="contentbox" >
<view class="mask-cover" style="{{morethemeStyle? 'height: 40%; background:linear-gradient(0deg,rgba(240,240,244,1) 0%,rgba(240,240,244,0) 100%);' :''}}" wx:if="{{!expanded && expandeddefault}}"></view> <view class="mask-cover" style="{{morethemeStyle? 'height: 40%; background:linear-gradient(0deg,rgba(240,240,244,1) 0%,rgba(240,240,244,0) 100%);' :''}}" wx:if="{{!expanded && expandeddefault}}"></view>
<!-- <view class="mask-cover" ></view> --> <!-- <view class="mask-cover" ></view> -->
<view class="media-content-box" wx:for="{{content}}" wx:key="index"> <view class="media-content-box" id="media-content-box" wx:for="{{content}}" wx:key="index">
<text class="media-box-item media-text-item" data-type="{{item.type}}" data-index="{{index}}" wx:if="{{item.type == 'text'}}">{{item.value}}</text> <text class="media-box-item media-text-item" data-type="{{item.type}}" data-index="{{index}}" wx:if="{{item.type == 'text'}}">{{item.value}}</text>
<view class="media-box-item media-img-item" wx:if="{{item.type == 'img'}}" data-index="{{index}}" bindtap="prevImg"> <view class="media-box-item media-img-item" wx:if="{{item.type == 'img'}}" data-index="{{index}}" bindtap="prevImg">
<image class="" src="{{filter.imagify(item.value, 'image/resize,w_640/format,jpg/quality,q_50')}}" mode="widthFix"></image> <image class="" src="{{filter.imagify(item.value, 'image/resize,w_640/format,jpg/quality,q_50')}}" mode="widthFix"></image>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</view> </view>
</view> </view>
<!-- <view class="" hidden="{{content.length == 0}}" wx:if="{{expandShow}}"> --> <!-- <view class="" hidden="{{content.length == 0}}" wx:if="{{expandShow}}"> -->
<view class="{{!expanded?'btn-expand-fixBottom': ''}}"> <view class="{{!expanded?'btn-expand-fixBottom': ''}}" wx:if="{{expandShow}}">
<view class="{{expanded ? 'expand-box-withtext' : 'expand-box-withtext down'}}" wx:if="{{widthtext && expandeddefault}}" bindtap="expandAction"> <view class="{{expanded ? 'expand-box-withtext' : 'expand-box-withtext down'}}" wx:if="{{widthtext && expandeddefault}}" bindtap="expandAction">
<text class="">{{text}}{{expanded ? '收起' : '展开'}}</text> <text class="">{{text}}{{expanded ? '收起' : '展开'}}</text>
<view class="expandicon-box"> <view class="expandicon-box">
......
...@@ -71,7 +71,7 @@ page { ...@@ -71,7 +71,7 @@ page {
.instro-box { .instro-box {
/* padding: 20rpx 20rpx 0; */ /* padding: 20rpx 20rpx 0; */
padding: 0 20rpx 0; padding: 0 20rpx 20rpx;
} }
.instro-box .title-box { .instro-box .title-box {
display: flex; display: flex;
......
...@@ -99,8 +99,12 @@ page { ...@@ -99,8 +99,12 @@ page {
} */ } */
.instro-bx .media-box { .instro-bx .media-box {
} }
.instro-bx .introduce-box {
padding-bottom: 20rpx;
}
.instro-bx .introduce-box .title-wrapper{ .instro-bx .introduce-box .title-wrapper{
text-align: center; text-align: center;
margin-bottom: 10rpx;
} }
.instro-bx .introduce-box .title{ .instro-bx .introduce-box .title{
display: inline-block; display: inline-block;
......
...@@ -70,7 +70,7 @@ page { ...@@ -70,7 +70,7 @@ page {
} }
.instro-box { .instro-box {
padding: 20rpx 20rpx 0; padding: 20rpx 20rpx 20rpx;
} }
.instro-box .title-box { .instro-box .title-box {
display: flex; display: flex;
......
...@@ -99,8 +99,12 @@ page { ...@@ -99,8 +99,12 @@ page {
} */ } */
.instro-bx .media-box { .instro-bx .media-box {
} }
.instro-bx .introduce-box {
padding-bottom: 20rpx;
}
.instro-bx .introduce-box .title-wrapper{ .instro-bx .introduce-box .title-wrapper{
text-align: center; text-align: center;
margin-bottom: 10rpx;
} }
.instro-bx .introduce-box .title{ .instro-bx .introduce-box .title{
display: inline-block; display: inline-block;
......
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