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
532376ce
Commit
532376ce
authored
Mar 19, 2020
by
lvtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix clock
parent
cb4918fe
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
1338 additions
and
2277 deletions
+1338
-2277
index.js
components/sjdmediashow/index.js
+1
-0
index.wxml
components/sjdmediashow/index.wxml
+25
-25
index.wxss
components/sjdmediashow/index.wxss
+151
-159
api.js
constants/api.js
+2
-1
arr_down.png
images/2c/themeindex/arr_down.png
+0
-0
arr_up.png
images/2c/themeindex/arr_up.png
+0
-0
circleindex.js
service/customer/circleindex.js
+10
-1
index.js
src/pages/clockeditor/index.js
+10
-24
index.json
src/pages/clockeditor/index.json
+1
-1
index.wxml
src/pages/clockeditor/index.wxml
+91
-143
index.wxss
src/pages/clockeditor/index.wxss
+490
-502
index.json
src/pages/themeindex/index.json
+0
-1
index.wxml
src/pages/themeindex/index.wxml
+189
-265
index.wxss
src/pages/themeindex/index.wxss
+319
-1089
landpage.js
src/pages/themeindex/landpage.js
+36
-35
landpage.json
src/pages/themeindex/landpage.json
+1
-1
landpage.wxml
src/pages/themeindex/landpage.wxml
+12
-30
No files found.
components/sjdmediashow/index.js
View file @
532376ce
...
...
@@ -62,6 +62,7 @@ Component({
}
},
data
:
{
localImageRoot
:
'../../images/'
,
imageRoot
:
app
.
globalData
.
imageRoot
,
imageVersion
:
app
.
globalData
.
imageVersion
,
maxTextBoxLength
:
10
,
...
...
components/sjdmediashow/index.wxml
View file @
532376ce
<wxs src="./../../filter/index.wxs" module="filter" />
<view
class=""
>
<view
style="position: relative;"
>
<view class="{{(expanded || !expandeddefault) ? 'sjd-media-show expanded' : 'sjd-media-show unexpanded'}}" style="{{ !expanded && defineheight != null ? 'max-height:' + defineheight + 'rpx' : ''}}">
<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">
<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"
lazy-load="false" binderror="" bindload=""
></image>
<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">
<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>
</view>
<view class="media-box-item media-voice-item"
wx:if="{{item.type == 'voice'}}">
<view class="sjd-radio-box"
>
<view class="media-box-item media-voice-item" wx:if="{{item.type == 'voice'}}">
<view class="sjd-radio-box" >
<view
class="play-btn"
data-value="{{item.value}}"
...
...
@@ -19,7 +19,7 @@
data-duration="{{item.duration}}"
wx:if="{{(!audioStorage[item.value] || !audioStorage[item.value].play) && (!audioStorage[item.value].isWaiting)}}"
>
<image class="play-btn-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""
></image>
<image class="play-btn-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}"></image>
</view>
<view class="pause-btn load-box" wx:if="{{audioStorage[item.value].isWaiting}}" >
<cssloading size="{{6}}"/>
...
...
@@ -32,7 +32,7 @@
data-duration="{{item.duration}}"
bindtap="pausevoice"
>
<image class="pause-btn-icon" src="{{imageRoot}}2c/common/pauseicon.png?{{imageVersion}}"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""
></image>
<image class="pause-btn-icon" src="{{imageRoot}}2c/common/pauseicon.png?{{imageVersion}}"></image>
</view>
<view class="play-time" >
{{audioStorage[item.value] && filter.voiceTimeFormat(audioStorage[item.value].currentTime) || filter.voiceTimeFormat(0)}}
...
...
@@ -69,26 +69,26 @@
bindplay="playvideo"
></video> -->
<view class="video-play-icon-box">
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""
></image>
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}"></image>
</view>
<image class="video-image" src="{{filter.videoPoster(item.value)}}" mode="widthFix"
lazy-load="false" binderror="" bindload=""
></image>
<image class="video-image" src="{{filter.videoPoster(item.value)}}" mode="widthFix"></image>
</view>
</view>
</view>
</view>
<!-- <view class="" hidden="{{content.length == 0}}"
id="expandbox"
wx:if="{{expandShow}}"> -->
<view class="
" hidden="{{content.length == 0}}" id="expandbox"
>
<view class="{{expanded ? 'expand-box-withtext' : 'expand-box-withtext down'}}"
wx:if="{{widthtext && expandeddefault}}" bindtap="expandAction">
<text class=""
selectable="false" space="false" decode="false">{{expanded ? '收起' : '展开'}}{{text
}}</text>
<view class="expandicon-box
{{expanded ? ' up' : 'down'}}"
>
<image wx:if="{{expanded}}" class="arrowdowngrey" src="{{
imageRoot}}2b/common/right.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="
"></image>
<image wx:if="{{!expanded}}" class="arrowdowngrey" src="{{
imageRoot}}2b/common/right.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="
"></image>
<!-- <view class="" hidden="{{content.length == 0}}" wx:if="{{expandShow}}"> -->
<view class="
{{!expanded?'btn-expand-fixBottom': ''}}"
>
<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
"
>
<image wx:if="{{expanded}}" class="arrowdowngrey" src="{{
localImageRoot}}2c/themeindex/arr_up.png?{{imageVersion}}
"></image>
<image wx:if="{{!expanded}}" class="arrowdowngrey" src="{{
localImageRoot}}2c/themeindex/arr_down.png?{{imageVersion}}
"></image>
</view>
</view>
<view class="{{expanded ? 'expand-box-withouttext' : 'expand-box-withouttext down'}}"
wx:if="{{!widthtext && expandeddefault}}" bindtap="expandAction">
<view class="expandicon-box
"
>
<image wx:if="{{expanded}}" class="arrowdowngrey" src="{{imageRoot}}2b/common/right.png?{{imageVersion}}"
lazy-load="false" binderror="" bindload=""
></image>
<image wx:if="{{!expanded}}" class="arrowdowngrey" src="{{imageRoot}}2b/common/right.png?{{imageVersion}}"
lazy-load="false" binderror="" bindload=""
></image>
<view class="{{expanded ? 'expand-box-withouttext' : 'expand-box-withouttext down'}}" wx:if="{{!widthtext && expandeddefault}}" bindtap="expandAction">
<view class="expandicon-box
"
>
<image wx:if="{{expanded}}" class="arrowdowngrey" src="{{imageRoot}}2b/common/right.png?{{imageVersion}}"></image>
<image wx:if="{{!expanded}}" class="arrowdowngrey" src="{{imageRoot}}2b/common/right.png?{{imageVersion}}"></image>
</view>
</view>
</view>
...
...
components/sjdmediashow/index.wxss
View file @
532376ce
/*小程序媒体展示器的样式*/
.sjd-media-show {
position: relative;
.sjd-media-show {
position: relative;
}
.contentbox {
padding: 20rpx 0 0 0;
padding: 20rpx 0 0 0;
}
.sjd-media-show.expanded{
max-height: none;
.sjd-media-show.expanded
{
max-height: none;
}
.sjd-media-show.unexpanded{
/* height: 159rpx; */
overflow: hidden;
/* box-shadow: 0px -34rpx 159rpx 1rpx rgba(241, 236, 236, 0.15) inset; */
.sjd-media-show.unexpanded
{
/* height: 159rpx; */
overflow: hidden;
/* box-shadow: 0px -34rpx 159rpx 1rpx rgba(241, 236, 236, 0.15) inset; */
}
.sjd-media-show.unexpandednoheight {
height: 0;
overflow: hidden;
height: 0;
overflow: hidden;
}
.sjd-media-show .media-content-box .media-box-item
{
margin-bottom: 23rpx;
position: relative;
.sjd-media-show .media-content-box .media-box-item
{
margin-bottom: 23rpx;
position: relative;
}
.sjd-media-show .media-content-box .media-box-item.media-text-item{
border-radius: 8rpx;
width: 100%;
word-break: break-all;
display: block;
.sjd-media-show .media-content-box:last-of-type .media-box-item {
margin-bottom: 0;
}
.sjd-media-show .media-content-box .media-box-item.media-text-item {
border-radius: 8rpx;
width: 100%;
word-break: break-all;
display: block;
}
.sjd-media-show .media-content-box .media-box-item.media-img-item image {
width: 100%;
display: block;
width: 100%;
display: block;
}
.sjd-media-show .media-type-box {
display: flex;
display: -webkit-flex;
justify-content: space-between;
padding-top: 60rpx;
border-top: 1rpx solid rgba(0,0,0,
0.05);
.sjd-media-show .media-type-box {
display: flex;
display: -webkit-flex;
justify-content: space-between;
padding-top: 60rpx;
border-top: 1rpx solid rgba(0, 0, 0,
0.05);
}
.sjd-media-show .media-type-box .media-type-item {
}
.sjd-media-show .media-type-box .media-type-item .media-type-icon {
margin-bottom: 17rpx;
}
.sjd-media-show .media-type-box .media-type-item .media-type-icon .media-type-icon-img{
width: 50rpx;
height: 50rpx;
border-radius: 50%;
display: block;
margin: 0 auto;
}
.sjd-media-show .media-type-box .media-type-item .media-type-name{
color: #828E9C;
font-size: 24rpx;
letter-spacing: 2rpx;
text-align: center;
margin-bottom: 17rpx;
}
.sjd-media-show
.media-type-box
.media-type-item
.media-type-icon
.media-type-icon-img {
width: 50rpx;
height: 50rpx;
border-radius: 50%;
display: block;
margin: 0 auto;
}
.sjd-media-show .media-type-box .media-type-item .media-type-name {
color: #828e9c;
font-size: 24rpx;
letter-spacing: 2rpx;
text-align: center;
}
.sjd-media-show .media-content-box .media-box-item image.del-icon {
width: 40rpx;
height: 40rpx;
display: block;
position: absolute;
top: 0;
right: 0;
z-index: 1;
width: 40rpx;
height: 40rpx;
display: block;
position: absolute;
top: 0;
right: 0;
z-index: 1;
}
.sjd-media-show .media-content-box .media-box-item
.media-box-video-item {
width: 100%;
.sjd-media-show .media-content-box .media-box-item .media-box-video-item {
width: 100%;
}
.media-box-item .video-play-icon-box {
z-index: 4;
width: 118rpx;
height: 118rpx;
border-radius: 50%;
background-color: rgba(0,0,0,
0.5);
position: absolute;
left: 50%;
top: 50%;
margin: -69rpx 0 0 -69rpx;
display: flex;
align-items: center;
justify-content: center;
z-index: 4;
width: 118rpx;
height: 118rpx;
border-radius: 50%;
background-color: rgba(0, 0, 0,
0.5);
position: absolute;
left: 50%;
top: 50%;
margin: -69rpx 0 0 -69rpx;
display: flex;
align-items: center;
justify-content: center;
}
.media-box-item .video-play-icon-box .video-play-icon {
width: 31rpx;
height: 36rpx;
display: block;
width: 31rpx;
height: 36rpx;
display: block;
}
.media-box-item .video-image {
display: block;
/* height: 353rpx; */
width: 100%;
/* border-radius:8rpx; */
display: block;
/* height: 353rpx; */
width: 100%;
/* border-radius:8rpx; */
}
.btn-expand-fixBottom {
width: 100%;
position: absolute;
bottom: 0;
left: 0;
z-index: 1;
}
.expand-box-withtext,
.expand-box-withouttext {
display: flex;
display: -webkit-flex;
align-items: center;
justify-content: center;
padding: 20rpx 0;
}
.expand-box-withtext, .expand-box-withouttext {
display: flex;
display: -webkit-flex;
align-items: center;
justify-content: center;
padding: 32rpx 0 0 0;
.expand-box-withtext .arrowdowngrey {
display: block;
width: 16rpx;
height: 14rpx;
}
.expand-box-withtext.down, .expand-box-withouttext.down {
.expand-box-withtext text {
color: #fea917;
font-size: 22rpx;
font-weight: 500rpx;
padding-right: 6rpx;
}
.expand-box-withtext .arrowdowngrey {
display: block;
width: 13rpx;
height: 23rpx;
/* transform: rotate(90deg); */
}
.expand-box-withtext .arrowdowngrey.up {
transform: rotate(180deg);
}
.expand-box-withtext text{
color:rgba(142,142,142,1);
font-size: 24rpx;
font-weight: 500rpx;
padding-right: 20rpx;
}
.expand-box-withouttext .arrowdowngrey{
display: block;
width: 13rpx;
height: 23rpx;
.expand-box-withouttext .arrowdowngrey {
display: block;
width: 13rpx;
height: 23rpx;
}
.expand-box-withouttext .arrowdowngrey.up {
/* transform: rotate(180deg); */
transform: rotate(180deg);
}
.expandicon-box {
overflow: hidden;
width:36rpx;
height:23rpx;
position: relative;
transform: rotate(90deg);
display: flex;
align-items: center;
justify-content: center;
}
.expandicon-box.up {
transform: rotate(270deg);
overflow: hidden;
width: 36rpx;
height: 23rpx;
position: relative;
/* transform: rotate(90deg); */
display: flex;
align-items: center;
justify-content: center;
}
@keyframes expandiconanimation {
0% {
opacity: 1;
top: -100%;
/* width: 70%;
0% {
opacity: 1;
top: -100%;
/* width: 70%;
left: 15%; */
}
to {
top: 100%;
opacity: 0;
/* width: 0%;
}
to {
top: 100%;
opacity: 0;
/* width: 0%;
left: 50%; */
}
}
/* @-webkit-keyframes expandiconanimation {
0% {
opacity: 1;
top: -10rpx;
width: 100%;
left: 0;
}
to {
top: 23rpx;
opacity: 0.2;
width: 40%;
left: 30%;
}
} */
}
}
.expandicon-box .expandiconanimation {
position: absolute;
width: 100%;
height: 10rpx;
left: 0;
/* top: -100%; */
transform: rotate(-5deg);
margin: 0 auto;
animation: expandiconanimation 1.2s linear 0s infinite;
-webkit-animation: expandiconanimation 1.2s linear 0s infinite;
}
.mask-cover{
background:-webkit-linear-gradient(rgba(255,255,255,0.7),rgba(255,255,255,1));
position: absolute;
width:102%;
left:-2%;
height: 60%;
z-index: 1;
left:-5rpx;
bottom: -5rpx;
/* box-shadow: 0px -10px 50px 10px rgba(0,0,0,0.5) inset; */
filter: blur(2px);
/* filter:blur(10px); */
}
@import "../../style/radio.wxss";
\ No newline at end of file
position: absolute;
width: 100%;
height: 10rpx;
left: 0;
/* top: -100%; */
transform: rotate(-5deg);
margin: 0 auto;
animation: expandiconanimation 1.2s linear 0s infinite;
-webkit-animation: expandiconanimation 1.2s linear 0s infinite;
}
.mask-cover {
background: -webkit-linear-gradient(
rgba(255, 255, 255, 0.7),
rgba(255, 255, 255, 1)
);
position: absolute;
width: 102%;
left: -2%;
height: 60%;
z-index: 1;
left: -5rpx;
bottom: -5rpx;
/* box-shadow: 0px -10px 50px 10px rgba(0,0,0,0.5) inset; */
filter: blur(2px);
/* filter:blur(10px); */
}
@import "../../style/radio.wxss";
constants/api.js
View file @
532376ce
...
...
@@ -73,7 +73,8 @@ const apis = {
customerCircleList
:
`
${
api
}
consumer/clock/circle/NewIndex`
,
},
circleIndex
:
{
subjectClassStudent
:
`
${
api
}
student/subject_class_student`
,
subjectClassStudent
:
`
${
api
}
student/subject_class_student`
,
//主题打卡学员
subjectStudents
:
`
${
api
}
student/subject/students`
,
//主题报名学员
circleDetail
:
`
${
api
}
consumer/clock/circle/show`
,
themeList
:
`
${
api
}
student/subject/index`
,
unlockthemeList
:
`
${
api
}
student/unlock_modes`
,
//解锁课时列表
...
...
images/2c/themeindex/arr_down.png
0 → 100644
View file @
532376ce
240 Bytes
images/2c/themeindex/arr_up.png
0 → 100644
View file @
532376ce
240 Bytes
service/customer/circleindex.js
View file @
532376ce
...
...
@@ -203,7 +203,7 @@ function studentTasks (data) {
errorresolve
:
1
,
})
}
function
subjectClassStudent
(
data
)
{
function
subjectClassStudent
(
data
)
{
//主题打卡学员
return
wxRequest
({
url
:
apis
.
customer
.
circleIndex
.
subjectClassStudent
,
data
,
...
...
@@ -211,6 +211,14 @@ function subjectClassStudent (data) {
errorresolve
:
1
,
})
}
function
subjectSignStudents
(
data
)
{
//主题报名学员
return
wxRequest
({
url
:
apis
.
customer
.
circleIndex
.
subjectStudents
,
data
,
method
:
'GET'
,
errorresolve
:
1
,
})
}
function
scoreTrend
(
data
)
{
return
wxRequest
({
url
:
apis
.
customer
.
scoreStatic
.
scoreTrend
,
...
...
@@ -253,6 +261,7 @@ export {
mineClassList
,
studentTasks
,
subjectClassStudent
,
subjectSignStudents
,
reviewScore
,
scoreTrend
,
}
\ No newline at end of file
src/pages/clockeditor/index.js
View file @
532376ce
...
...
@@ -82,7 +82,7 @@ Page({
}
},
id
:
0
,
// 圈子ID
localImageRoot
:
'../../../images'
,
localImageRoot
:
'../../../images
/
'
,
imageRoot
:
app
.
globalData
.
imageRoot
,
imageVersion
:
app
.
globalData
.
imageVersion
,
tid
:
0
,
// 主题ID
...
...
@@ -155,6 +155,8 @@ Page({
getmobiledialogshow
:
false
,
uploadVideoTask
:
{
},
detailExpand
:
true
,
//作业详情 默认收起
},
onLoad
:
function
(
options
)
{
// Do some initialize when page load.
const
that
=
this
;
...
...
@@ -195,6 +197,7 @@ Page({
audio
:
data
.
audio_require_status
==
0
?
0
:
data
.
audio_require_num
,
}
},
()
=>
{
console
.
log
(
this
.
data
.
themeDetail
.
content
.
length
,
'content'
)
this
.
userShow
();
this
.
queryActivtySchoolInfo
(
this
.
data
.
sid
);
this
.
getClockUuid
();
...
...
@@ -210,7 +213,6 @@ Page({
}).
catch
((
err
)
=>
{
wx
.
hideLoading
()
})
wx
.
hideShareMenu
();
})
},
queryActivtySchoolInfo
(
sid
)
{
...
...
@@ -254,23 +256,7 @@ Page({
}
// clearInterval(this.data.voiceInterval);
},
onPullDownRefresh
:
function
()
{
// Do something when pull down.
},
onReachBottom
:
function
()
{
// Do something when page reach bottom.
},
onShareAppMessage
:
function
()
{
// return custom share data when user share.
},
onPageScroll
:
function
()
{
// Do something when page scroll
},
onTabItemTap
(
item
)
{
},
loadClockDetail
(
cid
)
{
if
(
cid
)
{
//编辑打卡的时候查询打卡详情
}
else
{
// 新建打卡的操作
}
},
userShow
()
{
const
visitor
=
LocalStorage
.
getItem
(
'visitor'
);
studentidentity
({
...
...
@@ -332,11 +318,6 @@ Page({
callBack
(
rect
)
}).
exec
()
},
expandaction
()
{
this
.
setData
({
isexpand
:
!
this
.
data
.
isexpand
})
},
addressSelect
()
{
wxAuthorize
(
'scope.userLocation'
).
then
(()
=>
{
return
wxChooseLocation
();
...
...
@@ -1294,4 +1275,9 @@ audioStorage[value].isWaiting = true;
})
}
},
bindExpand
(){
this
.
setData
({
detailExpand
:
!
this
.
data
.
detailExpand
})
}
})
src/pages/clockeditor/index.json
View file @
532376ce
{
"navigationBarTitleText"
:
"
打卡
"
,
"navigationBarTitleText"
:
"
提交作业
"
,
"onReachBottomDistance"
:
100
,
"usingComponents"
:
{
"sjd-media-show"
:
"../../../components/sjdmediashow"
,
...
...
src/pages/clockeditor/index.wxml
View file @
532376ce
This diff is collapsed.
Click to expand it.
src/pages/clockeditor/index.wxss
View file @
532376ce
This diff is collapsed.
Click to expand it.
src/pages/themeindex/index.json
View file @
532376ce
...
...
@@ -2,7 +2,6 @@
"navigationBarTitleText"
:
"作业打卡"
,
"onReachBottomDistance"
:
100
,
"enablePullDownRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#FFD146"
,
"usingComponents"
:
{
"sjd-media-show"
:
"../../../components/sjdmediashow"
,
"clock-item"
:
"../../components/clockitemv2"
,
...
...
src/pages/themeindex/index.wxml
View file @
532376ce
This diff is collapsed.
Click to expand it.
src/pages/themeindex/index.wxss
View file @
532376ce
This diff is collapsed.
Click to expand it.
src/pages/themeindex/landpage.js
View file @
532376ce
...
...
@@ -7,7 +7,8 @@ import {
adInfoGet
,
getPrize
,
newLikeIndex
,
newCommentIndex
newCommentIndex
,
subjectSignStudents
}
from
"../../../service/customer/circleindex.js"
;
import
{
userShow
,
themeDetail
}
from
"../../../service/customer/themeindex.js"
;
...
...
@@ -32,34 +33,6 @@ Page({
imageRoot
:
app
.
globalData
.
imageRoot
,
imageVersion
:
app
.
globalData
.
imageVersion
,
id
:
0
,
content
:
[
{
type
:
"text"
,
value
:
"1.点击上方按钮“我要报名”。
\
r
\n
2.点击“我要砍价”按钮帮助自己砍价。
\
r
\n
3.点击“找人帮忙”按钮找好友帮忙砍价。
\
r
\n
4.奖品份数有限,达标就会减少一份,份数领完则无法继续报名,亲速度哦!
\
r
\n
5.完成后,马上联系商家兑奖吧。"
},
{
type
:
"img"
,
value
:
"https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/gif1.gif"
},
{
type
:
"text"
,
value
:
"扫码下方二维码,联系客服咨询!"
},
{
type
:
"img"
,
value
:
"https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/code.png"
},
{
type
:
"text"
,
value
:
"★★★额外福利★★★
\
r
\n
新生砍到底价,支付成功,即可获得:
\
r
\n
①学费最低6折
\
r
\n
②老生带新生报名,双双赢儿童高清照相机一部
\
r
\n
③新生组团来报课,更享团购优惠
\
r
\n
④报课成功参与砸金蛋,再享千元优惠"
},
{
type
:
"img"
,
value
:
"https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/gif2.gif"
}
],
circleInfo
:
{
school_id
:
0
},
...
...
@@ -163,7 +136,9 @@ Page({
bigindex
:
undefined
,
studentId
:
""
,
modalContact
:
false
//联系弹框
modalContact
:
false
,
//联系弹框
signStudentsTotal
:
0
,
signStudentsList
:
[]
},
onLoad
:
function
(
options
,
b
)
{
// Do some initialize when page load.
...
...
@@ -219,6 +194,7 @@ Page({
activitybarloaded
:
true
});
});
this
.
subjectSignStudents
();
},
onShow
:
function
(
options
)
{
if
(
this
.
data
.
needREfresh
||
this
.
data
.
needRefresh
)
{
...
...
@@ -476,7 +452,8 @@ Page({
},
themeDetail
()
{
themeDetail
({
subject_id
:
this
.
data
.
tid
subject_id
:
this
.
data
.
tid
,
extra
:
'land_content'
}).
then
(
res
=>
{
const
{
data
,
code
,
datetime
}
=
res
;
this
.
data
.
datetime
=
datetime
;
...
...
@@ -497,6 +474,9 @@ Page({
});
return
false
;
}
wx
.
setNavigationBarTitle
({
title
:
data
.
title
})
this
.
queryActivtySchoolInfo
(
data
.
school_id
);
this
.
judgeIsClock
(
this
.
data
.
tid
);
this
.
schoolInfoGet
(
data
.
school_id
);
...
...
@@ -525,6 +505,7 @@ Page({
this
.
setData
({
themeSelect
:
data
,
});
}
});
},
...
...
@@ -671,12 +652,12 @@ Page({
clockList
({
page
:
this
.
data
.
clockPage
,
perPage
:
this
.
data
.
clockPerPage
,
// subject_id: this.data.tid,
// exclude_self: true
subject_id
:
this
.
data
.
tid
,
school_id
:
this
.
data
.
sid
,
type
:
1
,
hidden_dismissed_class
:
1
,
now_student_id
:
3
// hidden_dismissed_class: 1,
now_student_id
:
this
.
data
.
studentId
,
is_top
:
1
})
.
then
(
res
=>
{
const
{
code
,
data
}
=
res
;
...
...
@@ -1155,5 +1136,25 @@ Page({
wx
.
makePhoneCall
({
phoneNumber
:
"182224144"
});
},
// 报名学员
subjectSignStudents
()
{
subjectSignStudents
({
subject_source_id
:
this
.
data
.
tid
,
subject_source_type
:
1
,
page
:
1
,
perPage
:
6
}).
then
((
res
)
=>
{
const
{
code
,
data
}
=
res
;
if
(
code
!=
200
)
{
}
this
.
setData
({
signStudentsTotal
:
data
.
total
,
signStudentsList
:
data
.
list
})
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
})
}
});
src/pages/themeindex/landpage.json
View file @
532376ce
{
"navigationBarTitleText"
:
"
营销页
"
,
"navigationBarTitleText"
:
""
,
"usingComponents"
:
{
"sjd-media-show"
:
"../../../components/sjdmediashow"
,
"clock-item"
:
"../../components/clockitemv2"
,
...
...
src/pages/themeindex/landpage.wxml
View file @
532376ce
...
...
@@ -13,13 +13,13 @@
<view class="time">老师 {{themeSelect.created_at}} 发布</view>
</view>
</view>
<view class="instro-bx">
<view class="instro-bx"
wx:if="{{themeSelect.land_content && themeSelect.land_content.length>0}}"
>
<view class="title-box">
<view class="title">介绍</view>
</view>
<view class="media-box">
<sjd-media-show
content="{{content}}"
content="{{
themeSelect.land_
content}}"
bind:playvoice="playvoice"
actionsPalyvalue="{{actPalyaudioValue}}"
bind:pausevoice="pausevoice"
...
...
@@ -30,9 +30,9 @@
widthtext="{{true}}"
expanded="{{isexpand}}"
bind:expandaction="expandaction"
text="
详情
"
text="
点击
"
bind:playvideo="playvideo"
defineheight="{{
53
0}}"
defineheight="{{
36
0}}"
>
</sjd-media-show>
</view>
...
...
@@ -41,7 +41,8 @@
<view class="section contact-box">
<view class="left">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png" wx:if="{{themeSelect.land_content.teacher.avatar}}"></image>
<image class="avatar" src="{{imageRoot}}common/empty/avatar_teacher.png?{{imageVersion}}" wx:else></image>
<view class="nickname">齇老师</view>
</view>
<view class="right" bindtap="bindModalContact">
...
...
@@ -49,33 +50,14 @@
</view>
</view>
<view class="section clocker-box">
<view class="title">他们也在(
156
人)</view>
<view class="section clocker-box"
wx:if="{{signStudentsTotal>0}}"
>
<view class="title">他们也在(
{{signStudentsTotal}}
人)</view>
<view class="sub-title">加入打卡跟他们一起养成好习惯</view>
<view class="list">
<view class="item">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<view class="nickname">齇老师齇老师齇老师</view>
</view>
<view class="item">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<view class="nickname">齇老师齇</view>
</view>
<view class="item">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<view class="nickname">齇老师</view>
</view>
<view class="item">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<view class="nickname">齇老师齇老师齇老师</view>
</view>
<view class="item">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<view class="nickname">齇老师齇</view>
</view>
<view class="item">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<view class="nickname">齇老师</view>
<view class="item" wx:for="{{signStudentsList}}" wx:key="item.id">
<image class="avatar" src="{{filter.imagify(item.school_student.avatar)}}" wx:if="{{item.school_student.avatar}}"></image>
<image class="avatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
<view class="nickname">{{item.school_student.nickname}}</view>
</view>
</view>
</view>
...
...
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