Commit f30a5876 authored by wangxuelai's avatar wangxuelai

'闯关打卡主题'

parent 5bb86674
...@@ -54,6 +54,7 @@ Page({ ...@@ -54,6 +54,7 @@ Page({
imageRoot: app.globalData.imageRoot, imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion, imageVersion: app.globalData.imageVersion,
localImageRoot:'../../../images/', localImageRoot:'../../../images/',
mid: 0,
id: 0, id: 0,
tid: 0, tid: 0,
sid:'', sid:'',
...@@ -138,11 +139,12 @@ Page({ ...@@ -138,11 +139,12 @@ Page({
}, },
onLoad: function(options) { // Do some initialize when page load. onLoad: function(options) { // Do some initialize when page load.
const that = this; const that = this;
const {id, tid,sid} = options; const {id, mid, tid,sid} = options;
this.setData({ this.setData({
id, id,
tid, tid,
sid, sid,
mid,
page: 1, page: 1,
hasmore: true, hasmore: true,
}) })
...@@ -1271,5 +1273,10 @@ Page({ ...@@ -1271,5 +1273,10 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: `/business/pages/themeeditor/index?id=${this.data.id}&tid=${this.data.tid}&sid=${this.data.sid}&editType=1` url: `/business/pages/themeeditor/index?id=${this.data.id}&tid=${this.data.tid}&sid=${this.data.sid}&editType=1`
}) })
},
settingSubject () {
wx.navigateTo({
url: `/business/pages/themeeditor/subjecteditor?tid=${this.data.mid}&sid=${this.data.sid}&addSort=0&sort=${this.data.params.sort}&id=${this.data.tid}&index=0&currentSortIndex=0&from=detail`,
})
} }
}) })
\ No newline at end of file
...@@ -95,17 +95,17 @@ ...@@ -95,17 +95,17 @@
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="fixed-tabbar" style="background-image: url('{{imageRoot}}2b/themeindex/bottomTabbar.png?{{imageVersion}}')"> <view class="fixed-tabbar" style="background-image: url('{{imageRoot}}2b/themeindex/bottomTabbar.png?{{imageVersion}}')">
<view class="tabbar-list"> <view class="tabbar-list">
<view class="tabbar-item" bindtap="handleClickSetting"> <view class="tabbar-item" bindtap="settingSubject" style="margin-left: 0">
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_setting.png"></image> <image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_setting.png"></image>
<text class="tabbar-text">高级设置</text> <text class="tabbar-text">编辑关卡</text>
</view> </view>
<view class="tabbar-item"> <!-- <view class="tabbar-item">
<button class="tabbar-share" open-type="share">分享</button> <button class="tabbar-share" open-type="share">分享</button>
</view> </view>
<view class="tabbar-item" bindtap="goClock"> <view class="tabbar-item" bindtap="goClock">
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_data.png"></image> <image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_data.png"></image>
<text class="tabbar-text">打卡数据</text> <text class="tabbar-text">打卡数据</text>
</view> </view> -->
</view> </view>
</view> </view>
<!-- 详情弹框 --> <!-- 详情弹框 -->
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</view> </view>
</view> </view>
<!-- 高级设置弹框 --> <!-- 高级设置弹框 -->
<view class="modal modal-setup {{settingModalClass? 'hide': ''}}" hidden="{{!settingModalShow}}"> <!-- <view class="modal modal-setup {{settingModalClass? 'hide': ''}}" hidden="{{!settingModalShow}}">
<view class="mask" bindtap="closeSettingModal"></view> <view class="mask" bindtap="closeSettingModal"></view>
<view class="modal-content"> <view class="modal-content">
<view class="modal-title"> <view class="modal-title">
...@@ -176,5 +176,5 @@ ...@@ -176,5 +176,5 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
<commentClockItemShare id="shareClockItem" info="{{goShareClockItem.info}}" shareModalShow="{{goShareClockItem.shareModalShow}}" bind:closeShareModal="closeShareModal"shareModalClass="{{goShareClockItem.shareModalClass}}" /> <commentClockItemShare id="shareClockItem" info="{{goShareClockItem.info}}" shareModalShow="{{goShareClockItem.shareModalShow}}" bind:closeShareModal="closeShareModal"shareModalClass="{{goShareClockItem.shareModalClass}}" />
\ No newline at end of file
...@@ -128,7 +128,7 @@ Page({ ...@@ -128,7 +128,7 @@ Page({
const { index, item } = e.currentTarget.dataset; const { index, item } = e.currentTarget.dataset;
if (item.id > 0) { if (item.id > 0) {
wx.navigateTo({ wx.navigateTo({
url: `/business/pages/morethemeindex/index?id=0&tid=${item.id}&sid=${this.data.sid}`, url: `/business/pages/morethemeindex/index?mid=${this.data.tid}&tid=${item.id}&sid=${this.data.sid}`,
}) })
} else { } else {
const { item, index, } = e.currentTarget.dataset; const { item, index, } = e.currentTarget.dataset;
......
...@@ -30,7 +30,7 @@ Page({ ...@@ -30,7 +30,7 @@ Page({
sid: 0, sid: 0,
addSort: 0, addSort: 0,
sort: 0, sort: 0,
from: 'edit', // 新建页面进来 编辑关卡 index 主题页面进来新建关卡 from: 'edit', // 新建页面进来 编辑关卡 index 主题页面进来新建关卡 detail 闯关打卡关卡详情
id: 0, id: 0,
index: 0, index: 0,
currentSortIndex: 0, currentSortIndex: 0,
...@@ -324,6 +324,10 @@ Page({ ...@@ -324,6 +324,10 @@ Page({
prevPage.setData({ prevPage.setData({
[`lockSubjects[${this.data.sort-1}]`]: {...paramsData, id: data.id, clock_people: 0, review_clock_record_count: 0}, [`lockSubjects[${this.data.sort-1}]`]: {...paramsData, id: data.id, clock_people: 0, review_clock_record_count: 0},
}); });
} else if (this.data.from == 'detail') {
prevPage.setData({
needRefresh: true,
});
} }
wx.navigateBack({ wx.navigateBack({
delta: 1, // 回退前 delta(默认为1) 页面 delta: 1, // 回退前 delta(默认为1) 页面
......
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