Skip to content

W
wechatapp.shangjiadao.com
Commit fdc2399e authored by lvtz's avatar lvtz
Browse files
Options

fix

parent f3179141
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1527 additions and 1913 deletions
business/pages/calendarthemeeditor/index.js
View file @ fdc2399e
......@@ -559,7 +559,8 @@ Page({
subject_type: 2,
start_time: start_time,
end_time: end_time,
rest_dates: restdates.join(',')
rest_dates: restdates.join(','),
content_id: 7
})
themeEditor(data).then((res) => {
const {
......
business/pages/calendarthemeindex/index.js
View file @ fdc2399e
......@@ -1521,5 +1521,81 @@ Page({
this.setData({
'remindTips.show': false
})
},
goLoodDetail(){
this.setData({
detailModalShow: true,
})
},
closeDetailModal(){
this.setData({
detailModalClass: true,
})
setTimeout(() => {
this.setData({
detailModalShow: false,
detailModalClass: false
})
}, 200)
},
// 跳转打卡数据
goClock(){
const { params } = this.data;
wx.navigateTo({
url: `/business/pages/themeindex/jobclockdata?subject_id=${params.id}&subject_type=${params.subject_type}&subject_title=${params.title}`,
})
},
handleClickSetting(){
this.setData({
settingModalShow: true,
})
},
closeSettingModal(){
this.setData({
settingModalClass: true,
})
setTimeout(() => {
this.setData({
settingModalClass: false,
settingModalShow: false
})
}, 200)
},
goMembers(){
const { params } = this.data;
wx.navigateTo({
url: `/business/pages/themeindex/members?subject_id=${params.id}&subject_type=${params.subject_type}&sid=${params.school_id}`,
})
},
// 分享弹框
goClickShare(e){
const { clock } = e.detail;
console.log(clock)
this.setData({
goShareClockItem: {
shareModalShow: true,
shareModalClass: false,
info: { ...clock}
}
})
},
closeShareModal(){
this.setData({
"goShareClockItem.shareModalClass": true,
})
setTimeout(() => {
this.setData({
goShareClockItem: {
shareModalShow: false,
shareModalClass: false,
info: { }
}
})
}, 200)
},
toEdit () {
wx.navigateTo({
url: `/business/pages/themeeditor/index?id=${this.data.id}&tid=${this.data.tid}&sid=${this.data.sid}&editType=2`
})
}
})
\ No newline at end of file
business/pages/calendarthemeindex/index.json
View file @ fdc2399e
{
"navigationBarTitleText": "日历打卡",
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#00B1FC",
"navigationBarTextStyle": "white",
"usingComponents": {
"sjd-media-show": "../../../components/sjdmediashow",
"clock-item": "../../components/clockitem",
......@@ -14,6 +12,7 @@
"calender":"../../components/calendar",
"btn-drag":"../../../components/btndrag",
"expiredTip": "../../components/expiredTip",
"comment-editor-type-choose": "../../components/commentEditorTypeChoose"
"comment-editor-type-choose": "../../components/commentEditorTypeChoose",
"commentClockItemShare": "../../components/commentClockItemShare"
}
}
\ No newline at end of file
business/pages/deskcenter/clocklist.js
View file @ fdc2399e
This diff is collapsed.
business/pages/deskcenter/clocklist.wxml
View file @ fdc2399e
......@@ -24,11 +24,22 @@
</view>
</view>
</permission-box>
<view class="class-select-box" bindtap="showClassSelectModal" wx:if="{{tag!=1}}">
<view class="select-box">
<view class="select-item" bindtap="showThemeTypeSelectModal">
<view class="item-title">{{ selectThemeType.title }}</view>
<image class="icon-arr {{modalThemeType? 'active': ''}}" src="{{imageRoot}}2c/shopindex/arrowdown.png?{{imageVersion}}"></image>
</view>
<view class="select-item" bindtap="showClassSelectModal">
<view class="item-title">{{selectClass? selectClass.title: '全部班级'}}</view>
<image class="icon-arr {{modalClass? 'active': ''}}" src="{{imageRoot}}2c/shopindex/arrowdown.png?{{imageVersion}}"></image>
</view>
</view>
<!-- <view class="class-select-box" bindtap="showClassSelectModal" wx:if="{{tag!=1}}">
<view class="label">班级:</view>
<view class="title">{{selectClass.title}}</view>
<view class="exchang-btn">切换班级 <image class="icon" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/></view>
</view>
</view> -->
<view class="content-topbox">
<view class="tab-box">
......@@ -168,6 +179,7 @@
<view class="mask" bindtap="hideClassSelectModal"></view>
<view class="modal-content">
<view class="opt-list">
<view class="opt-item {{!selectClass.id ? 'active' : ''}}" bindtap="selectClassHandle2">全部班级</view>
<view class="opt-item {{selectClass.id == item.id ? 'active' : ''}}" wx:for="{{classList}}" wx:key="index" data-item="{{item}}" bindtap="selectClassHandle">{{item.title}}</view>
<list-loading loading="{{circlelistLoading}}"></list-loading>
</view>
......@@ -175,6 +187,16 @@
</view>
</view>
<view class="modal {{modelThemeTypeAnimate? 'hide': ''}}" hidden="{{!modalThemeType}}">
<view class="mask" bindtap="hideThemeTypeSelectModal"></view>
<view class="modal-content">
<view class="opt-list">
<view class="opt-item {{selectThemeType.type == item.type ? 'active' : ''}}" wx:for="{{themeTypeArr}}" wx:key="index" data-item="{{item}}" bindtap="selectThemeTypeHandle">{{item.title}}</view>
</view>
<view class="opt-item btn-cancel" bindtap="hideThemeTypeSelectModal">取消</view>
</view>
</view>
<view class="modal modal-copy" wx:if="{{showcopybox}}">
<view class="modal-copy-content">
<view class="modal-title">选择要复制到的班级</view>
......
business/pages/deskcenter/clocklist.wxss
View file @ fdc2399e
......@@ -45,6 +45,40 @@
background: #24CCA9;
}
/* 打卡列表筛选 类型选择 */
.select-box{
width: 100%;
display: flex;
align-items: center;
}
.select-box .select-item{
display: flex;
align-items: center;
margin-right: 50rpx;
padding: 20rpx;
}
.select-box .select-item:last-of-type{
margin-right: 0;
}
.select-box .select-item .item-title{
font-size: 30rpx;
font-weight:500;
color:rgba(0,0,0,1);
max-width: 300rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.select-box .select-item .icon-arr{
width: 22rpx;
height: 12rpx;
margin-left: 20rpx;
}
.select-box .select-item .icon-arr.active{
transform: rotate(180deg);
}
.class-select-box{
padding: 40rpx 24rpx;
display: flex;
......
business/pages/themeindex/index.js
View file @ fdc2399e
......@@ -1331,5 +1331,10 @@ Page({
}
})
}, 200)
},
toEdit () {
wx.navigateTo({
url: `/business/pages/themeeditor/index?id=${this.data.id}&tid=${this.data.tid}&sid=${this.data.sid}&editType=1`
})
}
})
\ No newline at end of file
business/pages/themeindex/index.wxml
View file @ fdc2399e
......@@ -104,10 +104,6 @@
<canvas canvas-id="myCanvas" style="width:100%;height:1334rpx;" />
</view>
<go-top wx:if="{{backTopValue}}"></go-top>
<!-- <view class="footer-box" >
<button open-type='share'></button>
<view class="btn" >转发给学员打卡</view>
</view> -->
</view>
<view class="videodialog" wx:if="{{videostatus.videoShow}}">
<view class="videodialogmask" bindtap="closeVideo"></view>
......@@ -135,8 +131,7 @@
</view>
</view>
<!-- 底部按钮 -->
<!-- {{imageRoot}}2b/themeindex/bottomTabbar.png?v=1') -->
<view class="fixed-tabbar" style="background-image: url('https://s1.ax1x.com/2020/03/23/8TVEIf.png?v=1')">
<view class="fixed-tabbar" style="background-image: url('{{imageRoot}}2b/themeindex/bottomTabbar.png?{{imageVersion}}')">
<view class="tabbar-list">
<view class="tabbar-item" bindtap="handleClickSetting">
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_setting.png"></image>
......@@ -152,63 +147,72 @@
</view>
</view>
<!-- 详情弹框 -->
<view class="modal {{detailModalClass? 'hide': ''}}" hidden="{{!detailModalShow}}">
<view class="modal modal-themedetail {{detailModalClass? 'hide': ''}}" hidden="{{!detailModalShow}}">
<view class="mask" bindtap="closeDetailModal"></view>
<view class="modal-content">
<view class="modal-title">
打卡内容详情
<view class="close-img" bindtap="closeDetailModal">
<image src="{{imageRoot}}2b/themeindex/close_icon.png"></image>
</view>
<image class="icon-close" src="{{imageRoot}}2b/themeindex/close_icon.png" bindtap="closeDetailModal"></image>
</view>
<view class="modal-detail-wrap" wx:if="{{params.content.length > 0}}">
<sjd-media-show content="{{params.content}}" noheight="{{true}}" bind:playvoice="playvoice" actionsPalyvalue="{{actPalyaudioValue}}" bind:pausevoice="pausevoice" bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}" bind:slidestart="slidestart"
bind:slideend="slideend" expanded="{{false}}" expandeddefault='{{false}}' widthtext="{{false}}" text="" bind:playvideo="playvideo" defineheight="{{200}}">
<sjd-media-show
content="{{params.content}}"
noheight="{{true}}"
bind:playvoice="playvoice"
actionsPalyvalue="{{actPalyaudioValue}}"
bind:pausevoice="pausevoice"
bind:voiceslide="voiceslide"
audioStorage="{{audioStorage}}"
bind:slidestart="slidestart"
bind:slideend="slideend"
expanded="{{false}}"
expandeddefault='{{false}}'
widthtext="{{false}}"
text=""
bind:playvideo="playvideo"
defineheight="{{200}}"
>
</sjd-media-show>
</view>
</view>
</view>
<!-- 高级设置弹框 -->
<view class="modal {{settingModalClass? 'hide': ''}}" hidden="{{!settingModalShow}}">
<view class="modal modal-setup {{settingModalClass? 'hide': ''}}" hidden="{{!settingModalShow}}">
<view class="mask" bindtap="closeSettingModal"></view>
<view class="modal-content">
<view class="modal-title">
高级设置
<view class="close-img" bindtap="closeSettingModal">
<image src="{{imageRoot}}2b/themeindex/close_icon.png"></image>
</view>
</view>
<view class="modal-setting-wrap">
<view class="modal-setting-list">
<view class="modal-setting-item" bindtap="goMembers">
<view class="modal-setting-left">
<view class="setting-left-name">成员管理</view>
<view class="setting-left-tip">已打卡学生管理、点评老师管理</view>
</view>
<view class="modal-setting-right">
<image src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
<view class="modal-setting-item">
<view class="modal-setting-left">
<view class="setting-left-name">作业打卡设置</view>
<view class="setting-left-tip">作业内容、作业要求、参与打卡方式等设置</view>
</view>
<view class="modal-setting-right">
<image src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
<view class="modal-setting-item">
<view class="modal-setting-left">
<view class="setting-left-name">打卡营销页设置</view>
<view class="setting-left-tip">配置此页面后可在学生加入打卡前展示，此功能可收集有意向学生的联系方式。 <text class="setting-more-tip">了解更多</text></view>
</view>
<view class="modal-setting-right">
<image src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
</view>
<image class="icon-close" src="{{imageRoot}}2b/themeindex/close_icon.png" bindtap="closeSettingModal"></image>
</view>
<view class="setting-list">
<view class="setting-item" bindtap="goMembers">
<view class="left">
<view class="item-label">成员管理</view>
<view class="item-desc">已打卡学生管理、点评老师管理</view>
</view>
<view class="right">
<image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
<view class="setting-item" bindtap="toEdit">
<view class="left">
<view class="item-label">作业打卡设置</view>
<view class="item-desc">作业内容、作业要求、参与打卡方式等设置</view>
</view>
<view class="right">
<image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
<view class="setting-item">
<view class="left">
<view class="item-label">打卡营销页设置</view>
<view class="item-desc">配置此页面后可在学生加入打卡前展示，此功能可收集有意向学生的联系方式。 <text class="more-tip">了解更多</text></view>
</view>
<view class="right">
<image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
</view>
</view>
</view>
<commentClockItemShare id="shareClockItem" info="{{goShareClockItem.info}}" shareModalShow="{{goShareClockItem.shareModalShow}}" bind:closeShareModal="closeShareModal"shareModalClass="{{goShareClockItem.shareModalClass}}" />
\ No newline at end of file
business/pages/themeindex/index.wxss
View file @ fdc2399e
This diff is collapsed.
business/style/themeindex.wxss
View file @ fdc2399e
This diff is collapsed.
components/sjdmediashow/index.wxss
View file @ fdc2399e
......@@ -3,7 +3,6 @@
position: relative;
}
.contentbox {
padding: 20rpx 0 0 0;
}
.sjd-media-show.expanded {
max-height: none;
......
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