Skip to content

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

fix

parent 17550d34
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 303 additions and 245 deletions
business/pages/classservice/classdetail.wxml
View file @ d1782d0b
......@@ -12,7 +12,9 @@
<view class="header-wrap">
<view class="header-box">
<view class="edit" bindtap="circleSetting">编辑班级</view>
<permission-box cinfigid="30012">
<view class="edit" bindtap="circleSetting" slot="menubtn">编辑班级</view>
</permission-box>
<view class="box-top">
<view class="coursename">{{circleInfo.course.title}}</view>
<view class="circlename">{{circleInfo.title}}</view>
......@@ -25,18 +27,24 @@
</view>
<view class="opt-btngroup">
<view class="opt-btnitem" bindtap="bindInvite">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_invite.png?{{imageVersion}}"></image>
<view class="title">邀请学员</view>
</view>
<view class="opt-btnitem" bindtap="goClocklist">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_clock.png?{{imageVersion}}"></image>
<view class="title">作业打卡</view>
</view>
<view class="opt-btnitem" bindtap="bindRankingList">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_rank.png?{{imageVersion}}"></image>
<view class="title">排行榜</view>
</view>
<permission-box cinfigid="70000">
<view class="opt-btnitem" bindtap="bindInvite" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_invite.png?{{imageVersion}}"></image>
<view class="title">邀请学员</view>
</view>
</permission-box>
<permission-box cinfigid="30002">
<view class="opt-btnitem" bindtap="goClocklist" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_clock.png?{{imageVersion}}"></image>
<view class="title">作业打卡</view>
</view>
</permission-box>
<permission-box>
<view class="opt-btnitem" bindtap="bindRankingList" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_rank.png?{{imageVersion}}"></image>
<view class="title">排行榜</view>
</view>
</permission-box>
</view>
<view class="devided-line"></view>
......@@ -96,22 +104,30 @@
<view class="nickname">{{optStudentInfo.name}}</view>
</view>
<view class="opt-tabbox">
<view class="opt-tabitem" bindtap="goReviewStudent">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_classreview.png?{{imageVersion}}"></image>
<view class="title">课堂点评</view>
</view>
<view class="opt-tabitem" bindtap="gorewardstudent">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_studentreward.png?{{imageVersion}}"></image>
<view class="title">奖励学员</view>
</view>
<view class="opt-tabitem" bindtap="goExchangeClass">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_exchange.png?{{imageVersion}}"></image>
<view class="title">调班</view>
</view>
<view class="opt-tabitem" bindtap="bindRemoveStudent">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_studentremove.png?{{imageVersion}}"></image>
<view class="title">移除</view>
</view>
<permission-box cinfigid="3">
<view class="opt-tabitem" bindtap="goReviewStudent" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_classreview.png?{{imageVersion}}"></image>
<view class="title">课堂点评</view>
</view>
</permission-box>
<permission-box cinfigid="90004">
<view class="opt-tabitem" bindtap="gorewardstudent" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_studentreward.png?{{imageVersion}}"></image>
<view class="title">奖励学员</view>
</view>
</permission-box>
<permission-box cinfigid="30015">
<view class="opt-tabitem" bindtap="goExchangeClass" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_exchange.png?{{imageVersion}}"></image>
<view class="title">调班</view>
</view>
</permission-box>
<permission-box cinfigid="30014">
<view class="opt-tabitem" bindtap="bindRemoveStudent" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_studentremove.png?{{imageVersion}}"></image>
<view class="title">移除</view>
</view>
</permission-box>
</view>
<view class="btn-cancel" bindtap="hideStudentOptModal">取消</view>
</view>
......
business/pages/classservice/classdetail.wxss
View file @ d1782d0b
......@@ -19,7 +19,7 @@ page{
position: relative;
}
.header-box .box-top{
padding: 30rpx 40rpx 66rpx;
padding: 30rpx 150rpx 66rpx 40rpx;
}
.header-box .edit{
position: absolute;
......@@ -73,12 +73,13 @@ page{
align-items: center;
}
.opt-btngroup .opt-btnitem{
flex: 1;
/* flex: 1; */
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
padding: 30rpx 0;
width: 250rpx;
}
.opt-btngroup .opt-btnitem .icon{
width: 44rpx;
......
business/pages/classservice/teacherindex.wxml
View file @ d1782d0b
......@@ -112,15 +112,17 @@
<view class="left"><image class="recently-clock" src="{{imageRoot}}2b/classservice/recently-clock.png?{{imageRoot}}" mode="aspectFit|aspectFill|widthFix" />最近关注的班级</view>
<view class="right" bindtap="goclasslist" data-btnname="goclasslist2">更多班级 <image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/></view>
</view>
<view class="content-box" wx:if="{{!emptyPage}}">
<view class="class-item" wx:for="{{classrecentlyList}}" wx:key="{{index}}" data-item="{{item}}" bindtap="goClassDetail">
<view class="icon"></view>
<view class="name">{{item.class.title}}</view>
</view>
</view>
<empty-content text="暂无数据~" emptyimg="" wx:if="{{emptyPage}}"></empty-content>
<view class="content-box" wx:if="{{!emptyPage}}">
<view class="class-item" wx:for="{{classrecentlyList}}" wx:key="{{index}}" data-item="{{item}}" bindtap="goClassDetail">
<view class="icon"></view>
<view class="name">{{item.class.title}}</view>
</view>
</view>
<empty-content text="暂无数据~" emptyimg="" wx:if="{{emptyPage}}"></empty-content>
<view class="has-nomore" wx:if="{{!emptyPage && !hasmore}}">没有更多了</view>
<view class="wanted-btn" bindtap="gotodolist">我要点名</view>
<permission-box cinfigid="3">
<view class="wanted-btn" bindtap="gotodolist" slot="menubtn">我要点名</view>
</permission-box>
</view>
</view>
<view class="modal {{modelHideClass? 'hide': ''}}" hidden="{{!modalshow}}">
......
business/pages/deskcenter/clocklist.json
View file @ d1782d0b
......@@ -2,6 +2,7 @@
"navigationBarTitleText": "打卡",
"enablePullDownRefresh": true,
"usingComponents": {
"expiredTip": "../../components/expiredTip"
"expiredTip": "../../components/expiredTip",
"permission-box":"../../components/permissionbox"
}
}
\ No newline at end of file
business/pages/deskcenter/clocklist.wxml
View file @ d1782d0b
<view class="container">
<view class="top-nav">
<view class="nav-item bg-FFA922" bindtap="addTheme" data-createtype="1">
<image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_zuoye2.png?{{imageRoot}}"/>
<view class="item-title-box">
<view class="item-title">作业打卡</view>
<view class="item-desc">每日家庭作业</view>
<permission-box cinfigid="30002">
<view class="top-nav" slot="menubtn">
<view class="nav-item bg-FFA922" bindtap="addTheme" data-createtype="1">
<image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_zuoye2.png?{{imageRoot}}"/>
<view class="item-title-box">
<view class="item-title">作业打卡</view>
<view class="item-desc">每日家庭作业</view>
</view>
</view>
</view>
<view class="nav-item bg-2AACFA" bindtap="addTheme" data-createtype="2">
<image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_rili2.png?{{imageRoot}}"/>
<view class="item-title-box">
<view class="item-title">日历打卡</view>
<view class="item-desc">养成学习习惯</view>
<view class="nav-item bg-2AACFA" bindtap="addTheme" data-createtype="2">
<image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_rili2.png?{{imageRoot}}"/>
<view class="item-title-box">
<view class="item-title">日历打卡</view>
<view class="item-desc">养成学习习惯</view>
</view>
</view>
</view>
<view class="nav-item bg-24CCA9" bindtap="addTheme" data-createtype="3">
<image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_chuang2.png?{{imageRoot}}"/>
<view class="item-title-box">
<view class="item-title">闯关打卡</view>
<view class="item-desc">每日家庭作业</view>
<view class="nav-item bg-24CCA9" bindtap="addTheme" data-createtype="3">
<image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_chuang2.png?{{imageRoot}}"/>
<view class="item-title-box">
<view class="item-title">闯关打卡</view>
<view class="item-desc">每日家庭作业</view>
</view>
</view>
</view>
</view>
</permission-box>
<view class="class-select-box" bindtap="showClassSelectModal" wx:if="{{tag!=1}}">
<view class="label">班级:</view>
<view class="title">{{selectClass.title}}</view>
......
business/pages/scoremgt/index.json
View file @ d1782d0b
{
"usingComponents": {
"expiredTip": "../../components/expiredTip"
"expiredTip": "../../components/expiredTip",
"permission-box":"../../components/permissionbox"
},
"navigationBarTitleText": "积分管理"
}
\ No newline at end of file
business/pages/scoremgt/index.wxml
View file @ d1782d0b
<wxs src="./../../../filter/index.wxs" module="filter" />
<view class="container {{choiceBoxShow?'containerDisabledScroll':''}}">
<view class="header-box">
<view class="btnitem" bindtap="toPointsRuleSet" wx:if="{{!my}}">
<view class="iconbox">
<image class="icon scoresetting" src="{{imageRoot}}2b/scoremgt/scoresetting.png?{{imageVersion}}"></image>
<permission-box cinfigid="900">
<view class="btnitem" bindtap="toPointsRuleSet" slot="menubtn">
<view class="iconbox">
<image class="icon scoresetting" src="{{imageRoot}}2b/scoremgt/scoresetting.png?{{imageVersion}}"></image>
</view>
<view class="btnname">积分设置</view>
</view>
<view class="btnname">积分设置</view>
</view>
<view class="btnitem" bindtap="toIntegralChange">
<view class="iconbox">
<image class="icon change" src="{{imageRoot}}2b/scoremgt/change.png?{{imageVersion}}"></image>
</permission-box>
<permission-box cinfigid="90004">
<view class="btnitem" bindtap="toIntegralChange" slot="menubtn">
<view class="iconbox">
<image class="icon change" src="{{imageRoot}}2b/scoremgt/change.png?{{imageVersion}}"></image>
</view>
<view class="btnname">积分变动</view>
</view>
<view class="btnname">积分变动</view>
</view>
<view class="btnitem" bindtap="toAddPointsGift">
<view class="iconbox">
<image class="icon addprize" src="{{imageRoot}}2b/scoremgt/addprize.png?{{imageVersion}}"></image>
</permission-box>
<permission-box cinfigid="90001">
<view class="btnitem" bindtap="toAddPointsGift" slot="menubtn">
<view class="iconbox">
<image class="icon addprize" src="{{imageRoot}}2b/scoremgt/addprize.png?{{imageVersion}}"></image>
</view>
<view class="btnname">添加奖品</view>
</view>
<view class="btnname">添加奖品</view>
</view>
<view class="btnitem" bindtap="toPointsExchangeRecord">
<view class="iconbox">
<image class="icon exchangeprize" src="{{imageRoot}}2b/scoremgt/exchangeprize.png?{{imageVersion}}"></image>
</permission-box>
<permission-box cinfigid="0">
<view class="btnitem" bindtap="toPointsExchangeRecord" slot="menubtn">
<view class="iconbox">
<image class="icon exchangeprize" src="{{imageRoot}}2b/scoremgt/exchangeprize.png?{{imageVersion}}"></image>
</view>
<view class="btnname">兑换记录</view>
</view>
<view class="btnname">兑换记录</view>
</view>
<view class="btnitem" bindtap="quickExchange">
<view class="iconbox">
<image class="icon scan" src="{{imageRoot}}2b/scoremgt/scan.png?{{imageVersion}}"></image>
</permission-box>
<permission-box cinfigid="0">
<view class="btnitem" bindtap="quickExchange" slot="menubtn">
<view class="iconbox">
<image class="icon scan" src="{{imageRoot}}2b/scoremgt/scan.png?{{imageVersion}}"></image>
</view>
<view class="btnname">扫码核销</view>
</view>
<view class="btnname">扫码核销</view>
</view>
</permission-box>
</view>
<view class="divideline"></view>
<view wx:if="{{pointsGoodsList.length>0 || pointsCardList.length>0}}" class="goods-box">
......@@ -48,8 +58,12 @@
</view>
</view>
<view class="operatebox">
<view class="operatebtn" bindtap="editGoodsOrCard" data-item="{{item}}">修改</view>
<view class="operatebtn" bindtap="downGoodsOrCard" data-item="{{item}}">删除</view>
<permission-box cinfigid="90002">
<view class="operatebtn" bindtap="editGoodsOrCard" data-item="{{item}}" slot="menubtn">修改</view>
</permission-box>
<permission-box cinfigid="90003">
<view class="operatebtn" bindtap="downGoodsOrCard" data-item="{{item}}" slot="menubtn">删除</view>
</permission-box>
</view>
</view>
</view>
......@@ -73,8 +87,12 @@
</view>
<view class="couponcardname">{{item.title}}</view>
<view class="operatebox">
<view class="operatebtn" bindtap="editGoodsOrCard" data-item="{{item}}">修改</view>
<view class="operatebtn" bindtap="downGoodsOrCard" data-item="{{item}}">删除</view>
<permission-box cinfigid="90002">
<view class="operatebtn" bindtap="editGoodsOrCard" data-item="{{item}}" slot="menubtn">修改</view>
</permission-box>
<permission-box cinfigid="90003">
<view class="operatebtn" bindtap="downGoodsOrCard" data-item="{{item}}" slot="menubtn">删除</view>
</permission-box>
</view>
</view>
</view>
......
constants/permissionconfig.js
View file @ d1782d0b
This diff is collapsed.
src/pages/myschedule/landpage.js
View file @ d1782d0b
......@@ -79,9 +79,10 @@ Page({
title: '已确认',
duration: 200,
success(){
that.getCourseDetail();
that.setData({
'coueseDetail.schedule_remind': {
confirm_status: 2
confirm_status: this.data.courseDetail.schedule_remind &&this.data.courseDetail.schedule_remind.confirm_status==2?1:2
}
})
}
......@@ -310,11 +311,15 @@ Page({
icon: 'success',
duration: 500,
success: function(){
that.getCourseDetail()
that.setData({
'courseDetail.my_leave': {
status: res.data.status,
id: data.id
},
'courseDetail.schedule_remind': {
confirm_status: 1,
},
leaveContent: '',
modalLeaveShow: false
})
......@@ -372,10 +377,14 @@ Page({
icon: 'success',
duration: 500,
success: function(){
that.getCourseDetail();
that.setData({
'courseDetail.my_leave':{
status: 2,
},
'courseDetail.schedule_remind':{
confirm_status: 1
},
modalBackLeaveShow: false,
})
}
......
src/pages/myschedule/landpage.wxml
View file @ d1782d0b
......@@ -47,9 +47,9 @@
</view>
<view class="bottom-box">
<view class="btn-group">
<view class="btn btn-primary {{(courseDetail.my_leave && (courseDetail.my_leave.status==1 || courseDetail.my_leave.status==3)) || courseDetail.call_time || (courseDetail.schedule_remind && courseDetail.schedule_remind.confirm_status==2)?'btn-disabled':''}}" bindtap="bindArriveStatus">{{courseDetail.schedule_remind && courseDetail.schedule_remind.confirm_status==2?'已确认':'我会准时到课'}}</view>
<view class="btn btn-primary {{(courseDetail.my_leave && (courseDetail.my_leave.status==1 || courseDetail.my_leave.status==3)) || courseDetail.call_time || (courseDetail.schedule_remind && courseDetail.schedule_remind.confirm_status==2)?'btn-disabled':''}}" bindtap="bindArriveStatus" wx:if="{{courseDetail.my_leave.status!=3}}">{{courseDetail.schedule_remind && courseDetail.schedule_remind.confirm_status==2?'已确认':'我会准时到课'}}</view>
<view class="btn" bindtap="bindShowModalLeave" wx:if="{{!courseDetail.my_leave || (courseDetail.my_leave.status!=1 && courseDetail.my_leave.status!=3)}}">我要请假{{coueseDetail.schedule_remind.confirm_status}}</view>
<view class="btn" bindtap="bindShowModalLeave" wx:if="{{!courseDetail.my_leave || (courseDetail.my_leave.status!=1 && courseDetail.my_leave.status!=3)}}">我要请假</view>
<view class="btn" bindtap="bindBackLeave" wx:if="{{courseDetail.my_leave.status && courseDetail.my_leave.status==1}}">撤销请假</view>
<view class="btn" wx:if="{{courseDetail.my_leave && courseDetail.my_leave.status==3}}">请假已通过</view>
</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