diff --git a/components/appointItem-operate/appointItem-operate.vue b/components/appointItem-operate/appointItem-operate.vue index 85fff8b..8248cf0 100644 --- a/components/appointItem-operate/appointItem-operate.vue +++ b/components/appointItem-operate/appointItem-operate.vue @@ -5,9 +5,9 @@ {{item.studentName}} {{ item.studentPhone}} - + {{loginStatusTxt[item.loginStatus]}} - + @@ -33,9 +33,25 @@ - + + + 预约时间:{{item.classDate}} + + + + + + + 预约时段: + + + + + {{item2.classTime}} + {{loginStatusTxt[item2.loginStatus]}} + + - 预约时间:{{item.classDate}} {{$u.timeFormat(item.startTime, 'hh:MM')}} - {{$u.timeFormat(item.endTime, 'hh:MM')}} @@ -108,5 +124,27 @@ } } } - + .leftBox { + display: flex; + align-items: center; + // width: 200rpx; + } + .rightBox { + flex: 1; + } + .timer_row { + display: flex; + align-items: center; + color: $themC; + margin-bottom: 20rpx; + &.hui { + color: #999; + } + &.black { + color: #333; + } + .time { + margin-right: 40rpx; + } + } \ No newline at end of file diff --git a/config/site.config.js b/config/site.config.js index 9caa4ef..e0f9e02 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,7 +2,7 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; // localIp = false module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 - WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.18:8318/',//非代理地址 + WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.43:8318/',//非代理地址 TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48082/', httpPrefix: 'app-api/', imgUrl: 'http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/admin/bigImg/' diff --git a/pages/recordEntry/operate/detail/detail.vue b/pages/recordEntry/operate/detail/detail.vue index c56a22f..df43a20 100644 --- a/pages/recordEntry/operate/detail/detail.vue +++ b/pages/recordEntry/operate/detail/detail.vue @@ -6,9 +6,9 @@ 提交预约时间:{{$u.timeFormat(info.createTime, 'yyyy/mm/dd MM:ss')}} - 取消预约时间:{{$u.timeFormat(info.updateTime, 'yyyy/mm/dd MM:ss')}} + @@ -32,6 +32,7 @@ async bookingMasterDetailFn() { const {data: res} = await bookingMasterDetail({id: this.id}) this.info = res + console.log(this.info.loginStatus) } } } diff --git a/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue b/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue index ccba62c..3b5f36e 100644 --- a/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue +++ b/pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue @@ -5,18 +5,24 @@ {{item.studentName}} {{ item.studentPhone}} - + 正在计时... - 计时切换 - {{ item.studyStatus }} + 计时切换 + {{ item.studyStatus||'状态没返回' }} - + - 计时开始时间:14: 50 + 计时开始时间:{{item.startTime}} + + + + + + 计时时段: {{ item.startTime }} @@ -36,14 +42,12 @@ 预约车辆:{{item.carNumber}} + - 预约时间: {{ item.bookingTimeStr }} - - @@ -58,6 +62,11 @@ subjectTxt: ['不限', '科目二', '科目三'],//:0:不限;2:科目二;3:科目三 loginStatusTxt: ['未签到', '已签到', '已签退', '已过期', '已取消'],//0:未签到,1:已签到,2:已签退,3:已过期,9:已取消 } + }, + methods: { + timekeeping(item) { + this.$emit('timekeeping', item) + } } } diff --git a/pages/recordEntry/operate/todayStudent/todayStudent.vue b/pages/recordEntry/operate/todayStudent/todayStudent.vue index 2848fe7..1898e18 100644 --- a/pages/recordEntry/operate/todayStudent/todayStudent.vue +++ b/pages/recordEntry/operate/todayStudent/todayStudent.vue @@ -1,24 +1,73 @@