Commit af5a41f0 authored by sujie@126.com's avatar sujie@126.com

dd

parent 04871e0a
export default {
imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/',
host: 'https://qxapi.qingxiao.online/daka',
host2: 'https://wx.m.shangjiadao.cn',
// host: 'https://qxapi.qingxiao.online/daka',
// host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '5.0',
imageVersion: '20200117',
// host: 'https://clock.wp53.cn',
// host2: 'https://test.wp53.cn',
host: 'https://clock.wp53.cn',
host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785',
miniProgram: {
clock: 'wxdeee20e52a1fd7ee'
......
......@@ -2567,7 +2567,15 @@ Page({
this.generateNewPoster(1);
},1500)
}
this.chooseSub(choose);
if(this.data.pagefrom != 'clockeditor'){
const unclockSubject = data.list.find((ele)=>{
return ele.my_unlock_count>0 && ele.my_clock_count<=0
})
const chooseData = unclockSubject || data.list[0];
this.chooseSub(chooseData);
} else{
this.chooseSub(choose);
}
if(refresh!=1&&choose.sort==this.data.moreTheme.subject_count&&this.data.pagefrom=="clockeditor"){
this.setData({
allentrydialog:true
......@@ -2602,7 +2610,7 @@ Page({
})
},
// 解锁主题
modeUnlock(id) {
modeUnlock(id, autoChoose) {
const _moreTheme = this.data.moreTheme;
if (_moreTheme.unlock_limit - _moreTheme.my_today_unlock_count <= 0) {
this.showSEdialog()
......@@ -2653,6 +2661,10 @@ Page({
moreTheme: _moreTheme,
themeSelect: _themeSelect,
})
if(this.data.pagefrom!="clockeditor"){
const choose = _subjectsList.find((ele) => ele.id == id)
this.chooseSub(choose);
}
this.showSEdialog()
}
}
......
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