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
9f25c328
Commit
9f25c328
authored
Jun 19, 2019
by
wangxuelai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
''
parent
5dbe6a87
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
223 additions
and
14 deletions
+223
-14
index.js
src/components/clockitem/index.js
+10
-3
index.js
src/pages/calendarthemeindex/index.js
+59
-2
index.wxml
src/pages/calendarthemeindex/index.wxml
+12
-3
index.js
src/pages/clockdetail/index.js
+19
-0
index.wxml
src/pages/clockdetail/index.wxml
+1
-0
index.js
src/pages/growthrecord/index.js
+19
-0
index.wxml
src/pages/growthrecord/index.wxml
+1
-0
index.js
src/pages/morethemeindex/index.js
+29
-1
index.wxml
src/pages/morethemeindex/index.wxml
+2
-2
index.js
src/pages/mycalendart/index.js
+19
-0
index.wxml
src/pages/mycalendart/index.wxml
+1
-1
index.js
src/pages/scoretasklist/index.js
+19
-0
index.wxml
src/pages/scoretasklist/index.wxml
+1
-1
index.js
src/pages/themeindex/index.js
+29
-1
index.wxml
src/pages/themeindex/index.wxml
+2
-0
No files found.
src/components/clockitem/index.js
View file @
9f25c328
...
...
@@ -537,16 +537,20 @@ Component({
generatelongimg
()
{
let
page
=
''
;
let
scene
=
''
;
let
themeId
;
switch
(
Number
(
this
.
data
.
clock
.
subject
.
subject_type
))
{
case
1
:
themeId
=
this
.
data
.
clock
.
subject_id
;
page
=
'src/pages/themeindex/index'
;
scene
=
`i=
${
this
.
data
.
clock
.
class_id
}
&t=
${
this
.
data
.
clock
.
subject_id
}
`
break
;
case
2
:
themeId
=
this
.
data
.
clock
.
subject_id
;
page
=
'src/pages/calendarthemeindex/index'
;
scene
=
`i=
${
this
.
data
.
clock
.
class_id
}
&t=
${
this
.
data
.
clock
.
subject_id
}
`
break
;
case
3
:
themeId
=
this
.
data
.
clock
.
unlock_mode_id
;
scene
=
`i=
${
this
.
data
.
clock
.
class_id
}
&t=
${
this
.
data
.
clock
.
unlock_mode_id
}
`
page
=
'src/pages/morethemeindex/index'
;
break
;
...
...
@@ -562,9 +566,12 @@ Component({
}).
then
((
res
)
=>
{
wx
.
hideLoading
();
if
(
res
.
code
==
200
)
{
wxPreviewImage
({
urls
:
[
`data:image/jpeg;base64,
${
res
.
data
.
data
}
`
],
current
:
`data:image/jpeg;base64,
${
res
.
data
.
data
}
`
// wxPreviewImage({
// urls: [`data:image/jpeg;base64,${res.data.data}`],
// current: `data:image/jpeg;base64,${res.data.data}`
// })
this
.
triggerEvent
(
'integrallogpost'
,
{
themeId
})
}
}).
catch
(()
=>
{
...
...
src/pages/calendarthemeindex/index.js
View file @
9f25c328
...
...
@@ -30,7 +30,8 @@ import {
posterLog
,
calendarClockRank
,
integralLog
,
getActivities
getActivities
,
generatePiiic
}
from
'../../../service/common.js'
;
import
{
getSchoolDetail
...
...
@@ -179,8 +180,17 @@ Page({
const
{
i
,
t
,
d
d
,
c
}
=
sceneQuery
;
if
(
c
)
{
integralLog
({
type
:
2
,
source_type
:
1
,
source_id
:
c
}).
then
((
res
)
=>
{
})
}
this
.
setData
({
id
:
i
,
tid
:
t
,
...
...
@@ -2525,4 +2535,51 @@ Page({
paintingType
:
'longImg'
})
},
integrallogpost
(
e
)
{
integralLog
({
type
:
1
,
source_type
:
1
,
source_id
:
e
.
detail
.
themeId
}).
then
((
res
)
=>
{
// const {integral} = res;
if
(
res
.
integral
&&
Number
(
res
.
integral
)
>
0
)
{
this
.
setData
({
scoreFeedBackStatus
:
{
integral
:
res
.
integral
,
show
:
true
,
scoretype
:
2
,
}
})
this
.
autoclosefeedback
();
}
})
},
generatePiiic
()
{
wx
.
showLoading
({
title
:
'打卡详情长图生成中...'
})
generatePiiic
({
type
:
2
,
record_id
:
this
.
data
.
tid
,
page
:
'src/pages/calendarthemeindex/index'
,
scene
:
`i=
${
this
.
data
.
id
}
&t=
${
this
.
data
.
tid
}
`
}).
then
((
res
)
=>
{
wx
.
hideLoading
();
if
(
res
.
code
==
200
)
{
// wxPreviewImage({
// urls: [`data:image/jpeg;base64,${res.data.data}`],
// current: `data:image/jpeg;base64,${res.data.data}`
// })
this
.
triggerEvent
(
'integrallogpost'
,
{
themeId
})
}
}).
catch
(()
=>
{
wx
.
hideLoading
();
wx
.
showToast
({
title
:
'打卡长图生成失败'
})
})
},
}
})
\ No newline at end of file
src/pages/calendarthemeindex/index.wxml
View file @
9f25c328
...
...
@@ -20,7 +20,16 @@
邀请好友
</view>
</view>
<view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="generateNewPoster">
<!-- <view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="generateNewPoster">
<view class="icon" hover-class="none" hover-stop-propagation="false">
<image class="icon2" src="{{imageRoot}}2c/themeindex/img-iocn.png"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
</view>
<view class="text" hover-class="none" hover-stop-propagation="false">
生成日签
</view>
</view> -->
<view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="generatePiiic">
<view class="icon" hover-class="none" hover-stop-propagation="false">
<image class="icon2" src="{{imageRoot}}2c/themeindex/img-iocn.png"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
...
...
@@ -257,7 +266,7 @@
headerclick="{{true}}" bind:playvoice="playvoice" bind:pausevoice="pausevoice"
bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}" bind:slidestart="slidestart"
bind:slideend="slideend" bind:videoplay="videoplay" bind:delEvaluate="selfDelEvaluate"
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:delActiveDClock="delActiveDClock" bind:drawpaint="drawpaint">
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:delActiveDClock="delActiveDClock" bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
<view class="sign-count-box" hover-class="none" hover-stop-propagation="false">
...
...
@@ -278,7 +287,7 @@
bind:playvoice="playvoice" bind:pausevoice="pausevoice" bind:voiceslide="voiceslide"
audioStorage="{{audioStorage}}" bind:slidestart="slidestart" bind:slideend="slideend"
bind:videoplay="videoplay" bind:delEvaluate="delEvaluate"
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:drawpaint="drawpaint">
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
<list-loading loading="{{clockGetting}}"></list-loading>
...
...
src/pages/clockdetail/index.js
View file @
9f25c328
...
...
@@ -1071,4 +1071,23 @@ Page({
posterBoxShow
:
false
})
},
integrallogpost
(
e
)
{
integralLog
({
type
:
1
,
source_type
:
1
,
source_id
:
e
.
detail
.
themeId
}).
then
((
res
)
=>
{
// const {integral} = res;
if
(
res
.
integral
&&
Number
(
res
.
integral
)
>
0
)
{
this
.
setData
({
scoreFeedBackStatus
:
{
integral
:
res
.
integral
,
show
:
true
,
scoretype
:
2
,
}
})
this
.
autoclosefeedback
();
}
})
}
})
\ No newline at end of file
src/pages/clockdetail/index.wxml
View file @
9f25c328
...
...
@@ -32,6 +32,7 @@
bind:delEvaluate="delEvaluate"
isactivityclock="{{clock.subject_id == activtySchoolInfo.tid}}"
bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
<!-- <view class="submitbtn-box" hover-class="none" hover-stop-propagation="false">
...
...
src/pages/growthrecord/index.js
View file @
9f25c328
...
...
@@ -1319,4 +1319,23 @@ Page({
})
}
},
integrallogpost
(
e
)
{
integralLog
({
type
:
1
,
source_type
:
1
,
source_id
:
e
.
detail
.
themeId
}).
then
((
res
)
=>
{
// const {integral} = res;
if
(
res
.
integral
&&
Number
(
res
.
integral
)
>
0
)
{
this
.
setData
({
scoreFeedBackStatus
:
{
integral
:
res
.
integral
,
show
:
true
,
scoretype
:
2
,
}
})
this
.
autoclosefeedback
();
}
})
}
})
\ No newline at end of file
src/pages/growthrecord/index.wxml
View file @
9f25c328
...
...
@@ -303,6 +303,7 @@
bind:showcommenteditor="showcommenteditor"
isactivityclock="{{item.subject_id == activtySchoolInfo.tid}}"
bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
...
...
src/pages/morethemeindex/index.js
View file @
9f25c328
...
...
@@ -177,8 +177,17 @@ Page({
let
sceneQuery
=
scenQueryGet
(
options
.
scene
);
const
{
i
,
t
t
,
c
}
=
sceneQuery
;
if
(
c
)
{
integralLog
({
type
:
2
,
source_type
:
1
,
source_id
:
c
}).
then
((
res
)
=>
{
})
}
posterLog
({
poster_type
:
4
,
type
:
2
,
...
...
@@ -2400,4 +2409,23 @@ Page({
paintingType
:
'longImg'
})
},
integrallogpost
(
e
)
{
integralLog
({
type
:
1
,
source_type
:
1
,
source_id
:
e
.
detail
.
themeId
}).
then
((
res
)
=>
{
// const {integral} = res;
if
(
res
.
integral
&&
Number
(
res
.
integral
)
>
0
)
{
this
.
setData
({
scoreFeedBackStatus
:
{
integral
:
res
.
integral
,
show
:
true
,
scoretype
:
2
,
}
})
this
.
autoclosefeedback
();
}
})
}
})
\ No newline at end of file
src/pages/morethemeindex/index.wxml
View file @
9f25c328
...
...
@@ -212,7 +212,7 @@
bind:pausevoice="pausevoice" bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}"
bind:slidestart="slidestart" bind:slideend="slideend" bind:videoplay="videoplay"
bind:delEvaluate="selfDelEvaluate" bind:showcommenteditor="showcommenteditor"
bind:playvideo="playvideo" modeType="{{3}}" bind:drawpaint="drawpaint">
bind:playvideo="playvideo" modeType="{{3}}" bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
</view>
...
...
@@ -234,7 +234,7 @@
bind:playvoice="playvoice" bind:pausevoice="pausevoice" bind:voiceslide="voiceslide"
audioStorage="{{audioStorage}}" bind:slidestart="slidestart" bind:slideend="slideend"
bind:videoplay="videoplay" bind:delEvaluate="delEvaluate" modeType="{{3}}"
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:drawpaint="drawpaint">
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
<list-loading loading="{{clockGetting}}"></list-loading>
...
...
src/pages/mycalendart/index.js
View file @
9f25c328
...
...
@@ -1723,5 +1723,24 @@ Page({
setTodoLabels
({
days
:
result
})
},
integrallogpost
(
e
)
{
integralLog
({
type
:
1
,
source_type
:
1
,
source_id
:
e
.
detail
.
themeId
}).
then
((
res
)
=>
{
// const {integral} = res;
if
(
res
.
integral
&&
Number
(
res
.
integral
)
>
0
)
{
this
.
setData
({
scoreFeedBackStatus
:
{
integral
:
res
.
integral
,
show
:
true
,
scoretype
:
2
,
}
})
this
.
autoclosefeedback
();
}
})
}
})
\ No newline at end of file
src/pages/mycalendart/index.wxml
View file @
9f25c328
...
...
@@ -42,7 +42,7 @@
headerclick="{{true}}" bind:playvoice="playvoice" bind:pausevoice="pausevoice"
bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}" bind:slidestart="slidestart"
bind:slideend="slideend" bind:videoplay="videoplay" bind:delEvaluate="selfDelEvaluate"
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo">
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
<view class="empty-box" wx:else hover-class="none" hover-stop-propagation="false">
...
...
src/pages/scoretasklist/index.js
View file @
9f25c328
...
...
@@ -888,4 +888,23 @@ Page({
})
}
},
integrallogpost
(
e
)
{
integralLog
({
type
:
1
,
source_type
:
1
,
source_id
:
e
.
detail
.
themeId
}).
then
((
res
)
=>
{
// const {integral} = res;
if
(
res
.
integral
&&
Number
(
res
.
integral
)
>
0
)
{
this
.
setData
({
scoreFeedBackStatus
:
{
integral
:
res
.
integral
,
show
:
true
,
scoretype
:
2
,
}
})
this
.
autoclosefeedback
();
}
})
}
})
\ No newline at end of file
src/pages/scoretasklist/index.wxml
View file @
9f25c328
...
...
@@ -79,7 +79,7 @@
bind:playvoice="playvoice" bind:pausevoice="pausevoice" bind:voiceslide="voiceslide"
audioStorage="{{audioStorage}}" bind:slidestart="slidestart" bind:slideend="slideend"
bind:videoplay="videoplay" bind:delEvaluate="delEvaluate"
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:drawpaint="drawpaint">
bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
<list-loading loading="{{clockGetting}}"></list-loading>
...
...
src/pages/themeindex/index.js
View file @
9f25c328
...
...
@@ -180,8 +180,17 @@ Page({
let
sceneQuery
=
scenQueryGet
(
options
.
scene
);
const
{
i
,
t
t
,
c
}
=
sceneQuery
;
if
(
c
)
{
integralLog
({
type
:
2
,
source_type
:
1
,
source_id
:
c
}).
then
((
res
)
=>
{
})
}
posterLog
({
poster_type
:
4
,
type
:
2
,
...
...
@@ -2183,4 +2192,23 @@ Page({
paintingType
:
'longImg'
})
},
integrallogpost
(
e
)
{
integralLog
({
type
:
1
,
source_type
:
1
,
source_id
:
e
.
detail
.
themeId
}).
then
((
res
)
=>
{
// const {integral} = res;
if
(
res
.
integral
&&
Number
(
res
.
integral
)
>
0
)
{
this
.
setData
({
scoreFeedBackStatus
:
{
integral
:
res
.
integral
,
show
:
true
,
scoretype
:
2
,
}
})
this
.
autoclosefeedback
();
}
})
}
})
\ No newline at end of file
src/pages/themeindex/index.wxml
View file @
9f25c328
...
...
@@ -153,6 +153,7 @@
bind:playvideo="playvideo"
isactivityclock="{{tid == activtySchoolInfo.tid}}"
bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
...
...
@@ -190,6 +191,7 @@
bind:playvideo="playvideo"
isactivityclock="{{tid == activtySchoolInfo.tid}}"
bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</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