Skip to content

M
mallapp
Commit 1eeb1fa4 authored by Mac's avatar Mac
Browse files
Options

1

parent d6468af0
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 21 deletions
pages/appointment/appointment.vue
View file @ 1eeb1fa4
...@@ -254,6 +254,7 @@ import tabbars from '@/components/tabbar/index'; ...@@ -254,6 +254,7 @@ import tabbars from '@/components/tabbar/index';
totalData:[], totalData:[],
fullDate:'', fullDate:'',
dotList:[], dotList:[],
WeekStr:'',
} }
}, },
onLoad(options) { onLoad(options) {
...@@ -305,13 +306,11 @@ import tabbars from '@/components/tabbar/index'; ...@@ -305,13 +306,11 @@ import tabbars from '@/components/tabbar/index';
datechange(e){ datechange(e){
this.fullDate = e.fullDate this.fullDate = e.fullDate
// this.msg.SelectStartTime = e.fullDate;
// this.msg.SelectEndTime = e.fullDate;
// this.init()
this.totalData.forEach(x=>{ this.totalData.forEach(x=>{
let time = x.DateYear+'-'+x.DateMonth+'-'+x.DateDay let time = x.DateYear+'-'+x.DateMonth+'-'+x.DateDay
if(this.fullDate == time){ if(this.fullDate == time){
this.subscribeList = x.PlanList this.subscribeList = x.PlanList
this.WeekStr = x.WeekStr
} }
}) })
}, },
...@@ -438,7 +437,8 @@ import tabbars from '@/components/tabbar/index'; ...@@ -438,7 +437,8 @@ import tabbars from '@/components/tabbar/index';
this.totalData.forEach(x=>{ this.totalData.forEach(x=>{
let time = x.DateYear+'-'+x.DateMonth+'-'+x.DateDay let time = x.DateYear+'-'+x.DateMonth+'-'+x.DateDay
if(this.fullDate == time){ if(this.fullDate == time){
this.subscribeList = x.PlanList this.subscribeList = x.PlanList;
this.WeekStr = x.WeekStr
} }
if(x.haveCourseCount>0){ if(x.haveCourseCount>0){
let obj = { let obj = {
...@@ -460,7 +460,7 @@ import tabbars from '@/components/tabbar/index'; ...@@ -460,7 +460,7 @@ import tabbars from '@/components/tabbar/index';
goconfirm(item){ goconfirm(item){
uni.navigateTo({ uni.navigateTo({
url: '/pages/appointment/confirmAppointment?CourseId='+item.ID url: '/pages/appointment/confirmAppointment?CourseId='+item.ID+'&WeekStr='+this.WeekStr
}); });
}, },
gostudent(item){//学员列表 gostudent(item){//学员列表
......
pages/appointment/confirmAppointment.vue
View file @ 1eeb1fa4
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</view> </view>
<view class="top-item" style="margin-top: 10px;"> <view class="top-item" style="margin-top: 10px;">
<text>上课时间</text> <text>上课时间</text>
<text class="t-item-r">{{data.StudyDateStr}} {{data.StudyStartDate}}-{{data.StudyEndDate}}</text> <text class="t-item-r">{{data.StudyDateStr}} 周{{WeekStr}} {{data.StudyStartDate}}-{{data.StudyEndDate}}</text>
</view> </view>
<view class="top-item"> <view class="top-item">
<text>上课老师</text> <text>上课老师</text>
...@@ -164,11 +164,16 @@ ...@@ -164,11 +164,16 @@
}, },
classDay:1, classDay:1,
ifvalue:1, ifvalue:1,
WeekStr:'',
} }
}, },
onLoad(options) { onLoad(options) {
console.log(options,'options') console.log(options,'options')
this.getPointCourseDetail(options.CourseId) this.getPointCourseDetail(options.CourseId)
if(options && options.WeekStr){
this.WeekStr = options.WeekStr
}
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
......
pages/appointment/personal/teacherOrderInfo.vue
View file @ 1eeb1fa4
...@@ -144,36 +144,41 @@ ...@@ -144,36 +144,41 @@
</view> </view>
<view class="orderInfo_List"> <view class="orderInfo_List">
<view class="stu_OrderRoom"> <view class="stu_OrderRoom">
<view>订单列表</view> <view>报名列表</view>
<view>订单数：{{dataList.OrderList.length}}</view> <view>报名数：{{dataList.OrderList.length}}</view>
</view> </view>
<view class="teacherOrder_List" v-for="(subItem,subIndex) in dataList.OrderList"> <view class="teacherOrder_List" v-for="(subItem,subIndex) in dataList.OrderList">
<view style="text-align: right;margin:10px 0;"> <view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;width: 100%;">
<text v-if="subItem.OrderStaus==2" class="teach_InfoBtn" @click="goSureOrder(subItem)">去确认</text> <view>
<text v-if="subItem.OrderStaus==3" style="color:#BBA16B;">{{subItem.OrderStausName}}</text> {{subItem.CreateDate}}
<text class="teach_InfoBtn" style="margin-left:10px;" v-if="subItem.OrderStaus==3" @click="sureWancheng(subItem)">确认完成</text> </view>
<text v-if="subItem.OrderStaus==4" style="color:#969696;">{{subItem.OrderStausName}}</text> <view style="text-align: right;margin:10px 0;">
<text v-if="subItem.OrderStaus==2" class="teach_InfoBtn" @click="goSureOrder(subItem)">去确认</text>
<text v-if="subItem.OrderStaus==3" style="color:#BBA16B;">{{subItem.OrderStausName}}</text>
<text class="teach_InfoBtn" style="margin-left:10px;" v-if="subItem.OrderStaus==3" @click="sureWancheng(subItem)">确认完成</text>
<text v-if="subItem.OrderStaus==4" style="color:#969696;">{{subItem.OrderStausName}}</text>
</view>
</view> </view>
<view class="Torder_InnerList"> <view class="Torder_InnerList">
<view style="display:flex;align-items: center;"> <view style="display:flex;align-items: center;">
<image mode="aspectFill" :src="subItem.UserPhoto" style="width: 28px; height: 28px;border-radius: 50%;" ></image> <image mode="aspectFill" :src="subItem.UserPhoto" style="width: 28px; height: 28px;border-radius: 50%;" ></image>
<text class="teacherName">{{subItem.UserName}}</text> <text class="teacherName">{{subItem.UserName}}</text>
</view> </view>
<view> <view>
<image style="width:12px;height:12px;margin-right:3px;" src="../../../static/images/tookie.png" alt=""></image> 支付点数：{{subItem.ActualPointNum}}
{{subItem.StudyDate}} ({{subItem.StudyDuration}}{{subItem.DurationUnit}})
</view> </view>
</view> </view>
<view class="Torder_InnerList"> <view class="Torder_InnerList">
<view> <view>
支付点数：{{subItem.ActualPointNum}} <image style="width:12px;height:12px;margin-right:3px;" src="../../../static/images/tookie.png" alt=""></image>
</view> {{subItem.StudyDate}} ({{subItem.StudyDuration}}{{subItem.DurationUnit}})
<view>
下单时间：{{subItem.CreateDate}}
</view> </view>
</view> </view>
<template v-if="subItem.OrderStaus==2"> <template v-if="subItem.OrderStaus==2">
<textarea style="height: 50px;width:100%;margin-bottom:10px;" placeholder="请输入房间信息" v-model="sureMsg.RoomInfo"/> <textarea style="height: 50px;width:calc(100vw - 65px);margin-bottom:10px;border: 1px solid #DFDDD8;padding: 5px;border-radius: 4px;" placeholder="请输入房间信息" v-model="sureMsg.RoomInfo"/>
</template> </template>
<view class="teacher_plateList" v-if="subItem.RoomInfo&&subItem.OrderStaus!=2"> <view class="teacher_plateList" v-if="subItem.RoomInfo&&subItem.OrderStaus!=2">
{{subItem.RoomInfo}} {{subItem.RoomInfo}}
......
pages/appointment/personal/teacherOrderList.vue
View file @ 1eeb1fa4
...@@ -65,13 +65,14 @@ ...@@ -65,13 +65,14 @@
<image src="../../../static/images/dzf.png" class="stu_StutasImg"></image> <image src="../../../static/images/dzf.png" class="stu_StutasImg"></image>
<view class="student_Title"> <view class="student_Title">
<view class="teacher_ClassName">{{item.CourseName}}</view> <view class="teacher_ClassName">{{item.CourseName}}</view>
<view style="font-size: 13px;color: #12D9B0;" v-if="item.ConfirmNum>0">未确认{{item.ConfirmNum}}人</view>
<!-- <text v-if="item.OrderStaus==2" style="color:#4699FC;">待确认</text> <!-- <text v-if="item.OrderStaus==2" style="color:#4699FC;">待确认</text>
<text v-if="item.OrderStaus==3" style="color:#BBA16B;">待上课</text> <text v-if="item.OrderStaus==3" style="color:#BBA16B;">待上课</text>
<text v-if="item.OrderStaus==4" style="color:#969696;">完成</text> --> <text v-if="item.OrderStaus==4" style="color:#969696;">完成</text> -->
</view> </view>
<view style="display: flex;align-items: center;margin:15px 0 8px 0;"> <view style="display: flex;align-items: center;margin:15px 0 8px 0;">
<view style="display:flex;align-items: center;"> <view style="display:flex;align-items: center;">
<text class="teacherName">{{item.OrderNum}}</text>人 <text class="teacherName">报名{{item.OrderNum}}</text>人
</view> </view>
<view class="stu_tookie" style="display: flex;align-items: center;margin:3px 0 0 20px;"> <view class="stu_tookie" style="display: flex;align-items: center;margin:3px 0 0 20px;">
<image style="width:12px;height:12px;margin-right:3px;" src="../../../static/images/tookie.png" alt=""></image> <image style="width:12px;height:12px;margin-right:3px;" src="../../../static/images/tookie.png" alt=""></image>
......
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