Commit 9f25c328 authored by wangxuelai's avatar wangxuelai

''

parent 5dbe6a87
......@@ -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(() => {
......
......@@ -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
......@@ -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>
......
......@@ -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
......@@ -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">
......
......@@ -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
......@@ -303,6 +303,7 @@
bind:showcommenteditor="showcommenteditor"
isactivityclock="{{item.subject_id == activtySchoolInfo.tid}}"
bind:drawpaint="drawpaint"
bind:integrallogpost="integrallogpost"
>
</clock-item>
</view>
......
......@@ -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
......@@ -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>
......
......@@ -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
......@@ -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">
......
......@@ -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
......@@ -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>
......
......@@ -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
......@@ -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>
......
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