Skip to content

E
educationStu
Commit a674d8c2 authored by 罗超's avatar 罗超
Browse files
Options

2

parent 6f8db03d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 107 deletions
src/components/subscribe/otherTeacherTime.vue 0 → 100644
View file @ a674d8c2
<style scoped>
.popupbox {
width: 60vw;
background-color: #FFF;
height: 60vh;
box-sizing: border-box;
position: relative;
}
.popupbox .title {
height: 100rpx;
color: #111;
font-size: 30rpx;
font-weight: 500;
display: flex;
justify-content: center;
align-items: center;
}
.subtitle {
color: #666;
font-size: 26rpx;
font-weight: 500;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 10rpx;
}
.infoBox {
height: calc(100% - 150rpx);
box-sizing: border-box;
padding: 0 20rpx;
overflow-y: auto;
}
.infoItem {
border-bottom: 1px solid #999;
margin-bottom: 10rpx;
}
.infoRow {
display: flex;
flex-wrap: nowrap;
}
.label {
width: 80rpx;
color: #666;
font-size: 26rpx;
white-space: nowrap;
}
.value {
font-size: 28rpx;
color: #111;
flex-grow: 1;
}
.infoRow .subBtn {
font-size: 20rpx;
font-family: PingFang SC;
font-weight: 500;
color: #FFFFFF;
background-color: #4C50E7;
padding: 10rpx 20rpx;
border-radius: 10rpx;
margin: 10rpx auto;
}
</style>
<template>
<view>
<van-popup :show="showpop" round closeable @close="taggleShow(false)">
<view class="popupbox">
<view class="title">
提示
</view>
<view class="subtitle">
当前时段已有预约列表,是否切换？
</view>
<view class="infoBox">
<view v-for="(info,index) in infoList" :key="index" class="infoItem">
<view class="infoRow">
<view class="label">
老师：
</view>
<view class="value">
{{info.TeacherName}}
</view>
</view>
<view class="infoRow">
<view class="label">
教室：
</view>
<view class="value">
{{info.RoomName}}
</view>
</view>
<view class="infoRow">
<view class="label">
时间：
</view>
<view class="value">
{{info.CourseSTime}}/{{info.CourseETime}}
</view>
</view>
<view class="infoRow">
<view class="label">
学员：
</view>
<view class="value" style="white-space: wrap;">
<view v-for="(item,index) in info.StuList" :key="index" style="display: inline-block;">
{{item.StuName}},
</view>
</view>
</view>
<view class="infoRow">
<view class="subBtn" @click="chooseTime(info)">
预约该时段
</view>
</view>
</view>
</view>
</view>
</van-popup>
</view>
</template>
<script>
import {
reactive,
toRefs,
watch
} from "vue";
export default {
components: {
},
props: {
show: {
type: Boolean,
default: false
},
infoList: {
type: Array,
default: () => []
}
},
setup(props, ctx) {
let data = reactive({
showpop: false,
msg: {
pageIndex: 1,
pageSize: 10,
StartTime: '',
EntTime: '',
State: 0,
TeacherId: 0,
Q_SelectNormal: 1,
},
})
let methods = {
taggleShow(val) {
ctx.emit("close", val)
},
chooseTime(item) {
ctx.emit("change", item)
}
}
watch(() => props.show, (val) => {
data.showpop = val
})
let that = methods;
return {
...toRefs(data),
...methods,
};
},
}
</script>
src/pages/appointment/index.vue
View file @ a674d8c2
This diff is collapsed.
src/pages/appointment/mySubscribe.vue
View file @ a674d8c2
......@@ -240,10 +240,18 @@
</view>
<view class="listItemBox3">
<view class="label">
学生
教室
</view>
<view class="con">
{{x.StuName}}
{{x.RoomName}}
</view>
</view>
<view class="listItemBox3">
<view class="label">
校区
</view>
<view class="con">
{{x.RoomSchoolName}}
</view>
</view>
<view class="listItemBox3">
......@@ -375,29 +383,13 @@
EntTime: '',
State: 0,
TeacherId: 0,
Q_SelectNormal:1,
},
TeacherName: "",
pageState: "more",
PageCount: 0,
timer: null, //防抖
List: [{
Date: "2020-01-01",
CourseTimeList: [{
StartTime: '09:00',
Minutes: 90,
EndTime: "12:00"
}, {
StartTime: '09:00',
Minutes: 90,
EndTime: "12:00"
}],
CourseName: "内部斑",
StuName: "张三",
ChapterNo: 1,
TeacherName: "张三",
StateName: '待确认',
State: 1,
}, ],
List: [],
stateList: [],
show: false,
AppointId: 0,
......@@ -413,6 +405,11 @@
})
let methods = {
getList() {
if(data.msg.State==0){
data.msg.Q_SelectNormal=1
}else{
data.msg.Q_SelectNormal=0
}
data.pageState = "loading";
proxy.$request("/AppletCenter/GetMyAppointPageList", data.msg).then(res => {
if (res.Code == 1) {
......
src/pages/index/components/indexassembly.vue
View file @ a674d8c2
......@@ -150,6 +150,7 @@
code
})
if (res && res.Data.phoneNumber) {
console.log('dsadas', res)
data.obj.phoneNum = res.Data.phoneNumber
// data.obj.phoneNum = '18328620563'
data.obj.openid = res.Data.openid
......
src/pages/index/index.vue
View file @ a674d8c2
......@@ -22,9 +22,6 @@
<view class="scanBox" @click="scan">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/scan2x.png"
mode="aspectFit" class="scanIcon"></image>
<!-- <view class="scanText">
签到
</view> -->
</view>
</view>
</navbar>
......
src/pages/person/person.vue
View file @ a674d8c2
......@@ -2,9 +2,6 @@
<view class="person">
<view class="info flex_between_center flex_nowrap">
<view class="left flex_start_between">
<!-- <view class="date">
2021年12月30日
</view> -->
<view class="name"> <text v-if="pageData.StuName">Hello，{{ pageData.StuName }}</text><text
v-if="!pageData.StuName&&pageData.StuName!==''"
@click="jumpPage('/pages/login/login')">未登录</text> </view>
......@@ -43,16 +40,24 @@
</view>
</view>
</view>
<view class="courseInfo">
<view class="courseInfo" v-if="pageData.CourseInfo.State==2">
<view class="title">课程信息</view>
<view style="display: flex;justify-content: space-between;">
<!-- <view class="title" @click="jumpPage(`/pages/appointment/mySubscribe`)">
约课记录
</view> -->
<view style="display: flex; justify-content: space-between;padding: 0 22rpx;margin-top: 30rpx;">
<view style="margin-left: 17px;">
<view style="font-size: 13px;font-family: PingFang SC;font-weight: bold;color: #111111;">暂无课程</view>
<view
style="font-size: 10px;font-family: PingFang SC;font-weight: 400;color: #888888;margin-top: 10px;">
购买课程后可回顾</view>
</view>
<view>
<image style="width: 234rpx;height: 226rpx;" mode="aspectFit"
src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/studyindex_nan.png'>
</image>
</view>
</view>
</view>
<view class="courseInfo" v-if="pageData.CourseInfo.State==1">
<view class="title">课程信息</view>
<view class="statistic">
<view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.TotalHours||0 }}
......@@ -62,19 +67,16 @@
</view>
<view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.CompleteHours||0 }}
<!-- <text class="unit">节</text> -->
</view>
<view class="statisticName">已学课时</view>
</view>
<view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.AbsenceNum||0 }}
<!-- <text class="unit">节</text> -->
</view>
<view class="statisticName">缺勤课时</view>
</view>
<view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.LeaveNum||0 }}
<!-- <text class="unit">节</text> -->
</view>
<view class="statisticName">请假课时</view>
</view>
......@@ -114,14 +116,17 @@
<view class="className one_line">{{
pageData.CourseInfo.CourseName
}}</view>
<view class="Grade" style="margin-bottom:20rpx">{{
<view class="Grade" style="margin-bottom:20rpx" v-if="pageData.CourseInfo.ClassScrollType!==2">{{
pageData.CourseInfo.ClassName
}}</view>
<view class="Grade">等级：{{ pageData.CourseInfo.CourseRate||'' }}</view>
<view><text class="Grade">状态：</text>
<text class="StatusName" v-if="pageData.CourseInfo.ClassStatusName">{{
pageData.CourseInfo.ClassStatusName
}}</text>
<text class="StatusName" v-if="pageData.CourseInfo.TotalHours>pageData.CourseInfo.CompleteHours">
学习中
</text>
<text class="StatusName" v-if="pageData.CourseInfo.TotalHours==pageData.CourseInfo.CompleteHours">
已结课
</text>
</view>
</view>
</view>
......@@ -182,10 +187,12 @@
pageData: {
AssistList: []
},
yuyueNum:0
yuyueNum: 0
});
const methods = {
jumpPage(url) {
uni.navigateTo({
url: url,
});
......@@ -201,20 +208,20 @@
});
},
getyuyue() {
const msg={
const msg = {
pageIndex: 1,
pageSize: 1,
StartTime: '',
EntTime: '',
State: 0,
TeacherId: 0,
Q_SelectNormal: 1,
}
proxy.$request("/AppletCenter/GetMyAppointPageList", msg).then(res => {
if (res.Code == 1) {
data.yuyueNum=res.Data.Count
data.yuyueNum = res.Data.Count
}
})
},
};
let that = methods;
......
src/pages/timetable/timeTable.vue
View file @ a674d8c2
......@@ -5,12 +5,6 @@
<view class="navbar">
<van-nav-bar title="课表" fixed title-class="navTitle">
<view slot="left" class="chooseDate flex flex_start_center">
<!-- <van-icon
name="arrow-left"
size="36rpx"
style="margin-right: 10rpx"
@click="back"
/> -->
<view @click="showdatetime">{{ currentDate }}</view>
</view>
</van-nav-bar>
......
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