Commit c7e0ae5f authored by wangxuelai's avatar wangxuelai

''

parent 58ae2999
...@@ -205,14 +205,14 @@ Page({ ...@@ -205,14 +205,14 @@ Page({
} }
if (from == 'menu') { if (from == 'menu') {
shareObj = { shareObj = {
title: this.data.moreTheme.title, title: this.data.params.title,
path: `/src/pages/sharemoretheme/index?tid=${this.data.tid}&id=${this.data.id}` path: `/src/pages/sharemoretheme/index?tid=${this.data.mid}&sid=${this.data.sid}`
} }
} else if (from == 'button') { } else if (from == 'button') {
if (!target.dataset.info) { if (!target.dataset.info) {
shareObj = { shareObj = {
title: this.data.moreTheme.title, title: this.data.params.title,
path: `/src/pages/sharemoretheme/index?tid=${this.data.tid}&id=${this.data.id}` path: `/src/pages/sharemoretheme/index?tid=${this.data.mid}&sid=${this.data.sid}`
} }
} else { } else {
const { const {
...@@ -222,6 +222,7 @@ Page({ ...@@ -222,6 +222,7 @@ Page({
} }
} }
} = option; } = option;
shareObj = { shareObj = {
title: `${info.school_student.nickname}的打卡详情`, title: `${info.school_student.nickname}的打卡详情`,
path: `/src/pages/clockdetail/newindex?tid=${info.subject_id}&cid=${info.id}` path: `/src/pages/clockdetail/newindex?tid=${info.subject_id}&cid=${info.id}`
...@@ -258,6 +259,7 @@ Page({ ...@@ -258,6 +259,7 @@ Page({
unlocksubjectdetail({ unlocksubjectdetail({
id: this.data.tid, id: this.data.tid,
school_id:this.data.sid, school_id:this.data.sid,
extra: 'subject_creator'
}).then((res) => { }).then((res) => {
const {code, data} = res; const {code, data} = res;
if (code == 200) { if (code == 200) {
......
...@@ -93,21 +93,15 @@ ...@@ -93,21 +93,15 @@
</view> </view>
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<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="settingSubject" style="margin-left: 0"> <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">
<button class="tabbar-share" open-type="share">分享</button>
</view>
<view class="tabbar-item" bindtap="goClock">
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_data.png"></image>
<text class="tabbar-text">打卡数据</text>
</view> -->
</view> </view>
</view> </view> -->
<view class="form-fixbtn" bindtap="settingSubject">编辑关卡</view>
<!-- 详情弹框 --> <!-- 详情弹框 -->
<view class="modal modal-themedetail {{detailModalClass? 'hide': ''}}" hidden="{{!detailModalShow}}"> <view class="modal modal-themedetail {{detailModalClass? 'hide': ''}}" hidden="{{!detailModalShow}}">
<view class="mask" bindtap="closeDetailModal"></view> <view class="mask" bindtap="closeDetailModal"></view>
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
padding: 15rpx 20rpx; padding: 15rpx 20rpx;
margin-top: 16rpx; margin-top: 16rpx;
height: 140rpx; height: 140rpx;
position: relative;
} }
.page-topbg .top-content .top-detail { .page-topbg .top-content .top-detail {
font-size: 22rpx; font-size: 22rpx;
...@@ -45,6 +46,10 @@ ...@@ -45,6 +46,10 @@
color: rgba(22, 176, 253, 1); color: rgba(22, 176, 253, 1);
line-height: 32rpx; line-height: 32rpx;
text-align: right; text-align: right;
position: absolute;
bottom: 16rpx;
right: 20rpx;
line-height: 1;
} }
.page-topbg .top-content .top-ask { .page-topbg .top-content .top-ask {
overflow: hidden; overflow: hidden;
...@@ -188,4 +193,14 @@ ...@@ -188,4 +193,14 @@
height: 400rpx; height: 400rpx;
position: relative; position: relative;
} }
.form-fixbtn {
width: 630rpx;
height: 90rpx;
border-radius: 49rpx;
background: rgba(22,176,253,1);
font-size: 32rpx;
bottom: 36rpx;
z-index: 7;
}
@import "../../style/themeindex.wxss"; @import "../../style/themeindex.wxss";
...@@ -96,7 +96,7 @@ Page({ ...@@ -96,7 +96,7 @@ Page({
index, index,
currentSortIndex, currentSortIndex,
from, from,
clone, clone: clone || 0,
// params: JSON.parse(decodeURIComponent(detail)), // params: JSON.parse(decodeURIComponent(detail)),
}) })
if (this.data.id > 0) { if (this.data.id > 0) {
......
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