Commit 40d62760 authored by youjie's avatar youjie

no message

parent f601e3b7
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
content: '将退出登录,是否继续', content: '将退出登录,是否继续',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.removeStorageSync('userWxInfo') // uni.removeStorageSync('userWxInfo')
uni.removeStorageSync('wxUserAuthInfo') uni.removeStorageSync('wxUserAuthInfo')
uni.removeStorageSync('ErpStus') uni.removeStorageSync('ErpStus')
uni.removeStorageSync('erpUserInfo') uni.removeStorageSync('erpUserInfo')
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
content: '将退出登录,是否继续', content: '将退出登录,是否继续',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.removeStorageSync('userWxInfo') // uni.removeStorageSync('userWxInfo')
uni.removeStorageSync('wxUserAuthInfo') uni.removeStorageSync('wxUserAuthInfo')
uni.removeStorageSync('ErpStus') uni.removeStorageSync('ErpStus')
uni.removeStorageSync('erpUserInfo') uni.removeStorageSync('erpUserInfo')
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</view> </view>
</view> </view>
<view class="right-info"> <view class="right-info">
<view class="class-name">{{item.ClassName}}{{item.ClassName}}{{item.ClassName}}{{item.ClassName}}{{item.ClassName}}</view> <view class="class-name">{{item.ClassName}}</view>
<view class="teacher-box"> <view class="teacher-box">
<van-icon name="manager" /> <van-icon name="manager" />
<text style="margin:0 10rpx;">老师:</text> <text style="margin:0 10rpx;">老师:</text>
...@@ -97,21 +97,17 @@ ...@@ -97,21 +97,17 @@
<text style="margin:0 10rpx;">教室:</text> <text style="margin:0 10rpx;">教室:</text>
<text>{{item.RoomName}}</text> <text>{{item.RoomName}}</text>
</view> </view>
<view class="teacher-box"> <view class="teacher-box" style="margin-top: 30rpx;margin-bottom: 0;">
<van-icon name="clock" />
<text style="margin:0 10rpx;">状态:</text>
<text :style="{background:item.Finished==1?'#ddd':'#FFD694'}" style="display: inline-block;width: 20rpx;height: 20rpx;border-radius: 50%;margin-right: 10rpx;"></text>
<text :style="{color:item.Finished==1?'#ddd':'#282828'}">{{item.Finished==1?'已上课':'未上课'}}</text>
</view>
<view class="teacher-box" style="margin-bottom: 0;">
<van-icon name="underway" /> <van-icon name="underway" />
<text style="margin:0 10rpx;">出勤:</text> <text style="margin:0 10rpx;">出勤:</text>
<text v-if="x.IsCheck==0 && item.Finished==1" style="color:#282828">出勤</text> <text v-if="x.IsCheck==0 && item.Finished==1" style="color:#282828">出勤</text>
<text v-else-if="x.IsCheck==2 && item.Finished==1" style="color:orange">请假</text> <text v-else-if="x.IsCheck==2 && item.Finished==1" style="color:orange">请假</text>
<text v-else-if="item.Finished==1" style="color:red">缺勤</text> <text v-else-if="item.Finished==1" style="color:red">缺勤</text>
<view style="width:1px;flex:1;text-align: right;display: flex;align-items: center;justify-content: flex-end;">
<text :style="{background:item.Finished==1?'#ddd':'#FFD694'}" style="display: inline-block;width: 26rpx;height: 26rpx;border-radius: 50%;margin-right: 10rpx;"></text>
<text :style="{color:item.Finished==1?'#ddd':'#282828'}">{{item.Finished==1?'已上课':'未上课'}}</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
...@@ -526,7 +522,9 @@ ...@@ -526,7 +522,9 @@
onShow() { onShow() {
this.msg.StartTime = getToday('y', 'm') + '-01'; this.msg.StartTime = getToday('y', 'm') + '-01';
this.msg.EndTime = getToday('y', 'm') + '-' + getMonthMaxDay(); this.msg.EndTime = getToday('y', 'm') + '-' + getMonthMaxDay();
this.getAllData() if (this.$isLogin()) {
this.getAllData()
}
}, },
onLoad(options) { onLoad(options) {
this.initSwiper() this.initSwiper()
...@@ -719,10 +717,11 @@ ...@@ -719,10 +717,11 @@
.plan-box .right-info .class-name{ .plan-box .right-info .class-name{
font-size: 32rpx; font-size: 32rpx;
color:#000; color:#000;
width: 100%; text-overflow: -o-ellipsis-lastline;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box;
line-clamp: 2;
} }
.plan-box .right-info .teacher-box{ .plan-box .right-info .teacher-box{
margin:20rpx 0; margin:20rpx 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