Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
wechatapp.shangjiadao.com
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxuelai
wechatapp.shangjiadao.com
Commits
164a6f30
Commit
164a6f30
authored
Apr 02, 2020
by
wangxuelai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'最新打卡提交'
parent
3432c7ad
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
19 deletions
+28
-19
index.js
business/pages/themead/index.js
+1
-1
index.js
components/sjdmediashow/index.js
+15
-14
index.wxml
components/sjdmediashow/index.wxml
+2
-2
index.wxss
src/pages/calendarthemeindex/index.wxss
+1
-1
landpage.wxss
src/pages/calendarthemeindex/landpage.wxss
+4
-0
index.wxss
src/pages/themeindex/index.wxss
+1
-1
landpage.wxss
src/pages/themeindex/landpage.wxss
+4
-0
No files found.
business/pages/themead/index.js
View file @
164a6f30
...
...
@@ -44,7 +44,7 @@ Page({
},
introduceContent
:
[
{
title
:
"
训练营是如何开展学习的?
"
,
title
:
""
,
content
:
[
{
type
:
"text"
,
value
:
"1.全程陪伴练字教学,我们通过听课+作业+点
\
r
\n
评+群内解答等互动形式,提高学习效果
\
r
\n
2.国家级书法名师亲自授课,指导你快速学习
\
r
\n
正确的握笔姿势和练字方法
\
r
\n
3.从零基础讲起,适合小白快速入门,课程系
\
r
\n
统全面,有经验的学员也能得到进一步提高;
\
r
\n
4.我们的每一位同学都将得到一对一教师指导,
\
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"
},
...
...
components/sjdmediashow/index.js
View file @
164a6f30
...
...
@@ -78,7 +78,7 @@ Component({
},
selectedVoice
:
''
,
expandShow
:
fals
e
expandShow
:
tru
e
},
created
()
{
console
.
log
(
this
.
data
.
content
,
'asdasd'
)
...
...
@@ -87,19 +87,20 @@ Component({
},
ready
()
{
const
that
=
this
;
// setTimeout(()=> {
// const query = wx.createSelectorQuery().in(this)
// query.select('#contentbox').fields({
// size: true,
// }, function (res) {
// const {height} = res;
// if (height > 60) {
// that.setData({
// expandShow: true
// })
// }
// }).exec()
// }, 200)
setTimeout
(()
=>
{
const
query
=
wx
.
createSelectorQuery
().
in
(
this
)
query
.
select
(
'#media-content-box'
).
fields
({
size
:
true
,
},
function
(
res
)
{
const
{
height
}
=
res
;
if
(
height
<
60
)
{
that
.
setData
({
expandShow
:
false
,
expanded
:
true
})
}
}).
exec
()
},
200
)
},
methods
:
{
expandAction
()
{
...
...
components/sjdmediashow/index.wxml
View file @
164a6f30
...
...
@@ -4,7 +4,7 @@
<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" ></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>
<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>
...
...
@@ -77,7 +77,7 @@
</view>
</view>
<!-- <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">
<text class="">{{text}}{{expanded ? '收起' : '展开'}}</text>
<view class="expandicon-box">
...
...
src/pages/calendarthemeindex/index.wxss
View file @
164a6f30
...
...
@@ -71,7 +71,7 @@ page {
.instro-box {
/* padding: 20rpx 20rpx 0; */
padding: 0 20rpx
0
;
padding: 0 20rpx
20rpx
;
}
.instro-box .title-box {
display: flex;
...
...
src/pages/calendarthemeindex/landpage.wxss
View file @
164a6f30
...
...
@@ -99,8 +99,12 @@ page {
} */
.instro-bx .media-box {
}
.instro-bx .introduce-box {
padding-bottom: 20rpx;
}
.instro-bx .introduce-box .title-wrapper{
text-align: center;
margin-bottom: 10rpx;
}
.instro-bx .introduce-box .title{
display: inline-block;
...
...
src/pages/themeindex/index.wxss
View file @
164a6f30
...
...
@@ -70,7 +70,7 @@ page {
}
.instro-box {
padding: 20rpx 20rpx
0
;
padding: 20rpx 20rpx
20rpx
;
}
.instro-box .title-box {
display: flex;
...
...
src/pages/themeindex/landpage.wxss
View file @
164a6f30
...
...
@@ -99,8 +99,12 @@ page {
} */
.instro-bx .media-box {
}
.instro-bx .introduce-box {
padding-bottom: 20rpx;
}
.instro-bx .introduce-box .title-wrapper{
text-align: center;
margin-bottom: 10rpx;
}
.instro-bx .introduce-box .title{
display: inline-block;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment