Browse Source

修改了发布排课时发布范围

master
unknown 8 months ago
parent
commit
24e9f3284c
  1. 4
      config/api.js
  2. 4
      pages/recordEntry/operate/mySchedule/comp/mySchedulePopup.vue
  3. 8
      pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue
  4. 12
      pages/recordEntry/operate/mySchedule/plan/plan.vue
  5. 18
      pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue
  6. 47
      pages/recordEntry/operate/todayStudent/todayStudent.vue
  7. 1
      pages/tabbar/statistics/comp/topUserInfo.vue
  8. 7
      pages/userCenter/scanCode/scanCode.vue
  9. BIN
      static/images/index/home_icon_zhuangtai@2x.png

4
config/api.js
File diff suppressed because it is too large
View File

4
pages/recordEntry/operate/mySchedule/comp/mySchedulePopup.vue

@ -25,12 +25,12 @@
<myRadio :radioData="radioData3" :value="form.appointmentSumCount" @changeRadio="(val)=>{form.appointmentSumCount=val}"/> <myRadio :radioData="radioData3" :value="form.appointmentSumCount" @changeRadio="(val)=>{form.appointmentSumCount=val}"/>
</view> </view>
</view> </view>
<view class="item">
<!-- <view class="item">
<view class="lab">开放范围</view> <view class="lab">开放范围</view>
<view class="val"> <view class="val">
<myRadio :radioData="radioData4" :value="form.openRange" @changeRadio="(val)=>{form.openRange=val}"/> <myRadio :radioData="radioData4" :value="form.openRange" @changeRadio="(val)=>{form.openRange=val}"/>
</view> </view>
</view>
</view> -->
<view class="btn_row"> <view class="btn_row">
<view class="btnBorder btn" @click="confirmPopup(0)">取消</view> <view class="btnBorder btn" @click="confirmPopup(0)">取消</view>
<view class="btnBg btn" @click="confirmPopup(1)">确认</view> <view class="btnBg btn" @click="confirmPopup(1)">确认</view>

8
pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue

@ -33,7 +33,7 @@
<view class="h2" v-if="timerArr.length">上午</view> <view class="h2" v-if="timerArr.length">上午</view>
<view class="time_box"> <view class="time_box">
<view class="time_item" v-for="(item,index) in timerArr" :key="index" @click="chooseCourse(item)" :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}" > <view class="time_item" v-for="(item,index) in timerArr" :key="index" @click="chooseCourse(item)" :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}" >
<view class="flex" v-if="item.status==0">
<view class="flex" v-if="item.status==0||item.status==3">
<view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{ item.appointmentSumCount}} </view> <view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{ item.appointmentSumCount}} </view>
<view class="iconArrowBg" v-if="item.appointmentAlreadyCount"> <view class="iconArrowBg" v-if="item.appointmentAlreadyCount">
<u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon> <u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon>
@ -46,7 +46,7 @@
<view class="h2" v-if="timerArr2.length">下午</view> <view class="h2" v-if="timerArr2.length">下午</view>
<view class="time_box"> <view class="time_box">
<view class="time_item" v-for="(item,index) in timerArr2" :key="index" @click="chooseCourse(item)" :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}"> <view class="time_item" v-for="(item,index) in timerArr2" :key="index" @click="chooseCourse(item)" :class="{active: courseIds.indexOf(item.classTime)!=-1, disable: item.status==2}">
<view class="flex" v-if="item.status==0">
<view class="flex" v-if="item.status==0||item.status==3">
<view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{ item.appointmentSumCount}} </view> <view class="lab">{{ item.appointmentAlreadyCount ||0 }} <text>/</text> {{ item.appointmentSumCount}} </view>
<view class="iconArrowBg" v-if="item.appointmentAlreadyCount"> <view class="iconArrowBg" v-if="item.appointmentAlreadyCount">
<u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon> <u-icon name="arrow-right" :size="10" :color="'#fff'"></u-icon>
@ -236,8 +236,8 @@
// return // return
if(this.step!=2) { if(this.step!=2) {
// //
console.log(item)
if(item.appointmentAlreadyCount&&item.status==0) {
console.log('如果有预约')
if(item.appointmentAlreadyCount) {
this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id) this.$goPage('/pages/recordEntry/operate/mySchedule/detail/detail?id='+ item.id)
} }
}else { }else {

12
pages/recordEntry/operate/mySchedule/plan/plan.vue

@ -75,12 +75,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="row">
<!-- <view class="row">
<view class="lab">开放范围</view> <view class="lab">开放范围</view>
<view class="rightCon"> <view class="rightCon">
<myRadio @changeRadio="changeRadioOpenRange" :radioData="radiolist3" :radioVal="{value: form.openRange}"></myRadio> <myRadio @changeRadio="changeRadioOpenRange" :radioData="radiolist3" :radioVal="{value: form.openRange}"></myRadio>
</view> </view>
</view>
</view> -->
</view> </view>
<view class="btnBg" @click="scheduleClassCreateFn">确认发布</view> <view class="btnBg" @click="scheduleClassCreateFn">确认发布</view>
@ -113,7 +113,7 @@
classDate: '', classDate: '',
carNumber: '', carNumber: '',
subject: 0, //:023 subject: 0, //:023
openRange: '1', //01
openRange: '0', //01
siteName: '', siteName: '',
siteId: '' siteId: ''
}, },
@ -218,9 +218,9 @@
changeRadio(val) { changeRadio(val) {
console.log(val) console.log(val)
}, },
changeRadioOpenRange(val) {
this.form.openRange = val
},
// changeRadioOpenRange(val) {
// this.form.openRange = val
// },
// //
changeRadioSubject(val) { changeRadioSubject(val) {
this.form.subject = val this.form.subject = val

18
pages/recordEntry/operate/todayStudent/comp/appointItem-operate.vue

@ -6,15 +6,15 @@
<view class="schoolName">{{item.studentName}} <text style="margin-left: 6px;">{{ item.studentPhone}}</text></view> <view class="schoolName">{{item.studentName}} <text style="margin-left: 6px;">{{ item.studentPhone}}</text></view>
</view> </view>
<view class="status"> <view class="status">
<view class="text" v-if="item.isOnTime">正在计时...</view>
<view class="changeBtn btnBg" v-else-if="item.loginStatus==1">计时切换</view>
<view class="" v-else>{{loginStatusTxt[item.loginStatus]}}</view>
<view class="text" v-if="item.studyStatus=='计时中'">正在计时...</view>
<view class="changeBtn btnBg" v-else-if="item.studyStatus=='已签到'">计时切换</view>
<view class="" v-else>{{ item.studyStatus }}</view>
</view> </view>
</view> </view>
<view class="target"> <view class="target">
<view class="row" v-if="item.isOnTime">
<view class="row" >
<view class="iconImg"> <view class="iconImg">
<image src="@/static/images/index/timerIcon.png" mode=""></image>
<image src="@/static/images/index/home_icon_zhuangtai@2x.png" mode="" style="width: 28rpx;height: 28rpx;"></image>
</view> </view>
<view class="name" style="color: red;">计时开始时间14: 50</view> <view class="name" style="color: red;">计时开始时间14: 50</view>
</view> </view>
@ -22,13 +22,13 @@
<view class="iconImg"> <view class="iconImg">
<image src="@/static/images/index/listIcon.png" mode=""></image> <image src="@/static/images/index/listIcon.png" mode=""></image>
</view> </view>
<view class="name">训练科目{{ subjectTxt[item.subject] }}</view>
<view class="name">训练科目{{ item.subject }}</view>
</view> </view>
<view class="row"> <view class="row">
<view class="iconImg"> <view class="iconImg">
<image src="@/static/images/index/site.png" mode=""></image> <image src="@/static/images/index/site.png" mode=""></image>
</view> </view>
<view class="name">预约场地{{item.siteName}}</view>
<view class="name">预约场地{{item.address}}</view>
</view> </view>
<view class="row"> <view class="row">
<view class="iconImg"> <view class="iconImg">
@ -40,7 +40,9 @@
<view class="iconImg"> <view class="iconImg">
<image src="@/static/images/index/timerIcon.png" mode=""></image> <image src="@/static/images/index/timerIcon.png" mode=""></image>
</view> </view>
<view class="name">预约时间 14:00 <text>-</text> 18:00</view>
<!-- <view class="name">预约时间 14:00 <text>-</text> 18:00</view> -->
<view class="name">预约时间 {{ item.bookingTimeStr }}</view>
<!-- <view class="name">预约时间{{item.classDate}} {{$u.timeFormat(item.startTime, 'hh:MM')}} <text>-</text> {{$u.timeFormat(item.endTime, 'hh:MM')}}</view> --> <!-- <view class="name">预约时间{{item.classDate}} {{$u.timeFormat(item.startTime, 'hh:MM')}} <text>-</text> {{$u.timeFormat(item.endTime, 'hh:MM')}}</view> -->
</view> </view>
</view> </view>

47
pages/recordEntry/operate/todayStudent/todayStudent.vue

@ -11,55 +11,14 @@
<script> <script>
import appointItem from './comp/appointItem-operate' import appointItem from './comp/appointItem-operate'
import { signStudentList, changeStudent } from '@/config/api.js'
import { signStudentList, changeStudent, } from '@/config/api.js'
export default { export default {
components: { components: {
appointItem appointItem
}, },
data() { data() {
return { return {
list: [
{
studentName: '王一一',
studentPhone: '18267103166',
loginStatus: '0',
subject: '2',
siteName: '长红驾校一号场地',
carNumber: '豫A888666',
classDate: '2024/02/28',
isOnTime: false
},
{
studentName: '王二二',
studentPhone: '18267103166',
loginStatus: '1',
subject: '2',
siteName: '长红驾校一号场地',
carNumber: '豫A888666',
classDate: '2024/02/28',
isOnTime: true
},
{
studentName: '王三三',
studentPhone: '18267103166',
loginStatus: '1',
subject: '2',
siteName: '长红驾校一号场地',
carNumber: '豫A888666',
classDate: '2024/02/28',
isOnTime: false
},
{
studentName: '王四四',
studentPhone: '18267103166',
loginStatus: '2',
subject: '2',
siteName: '长红驾校一号场地',
carNumber: '豫A888666',
classDate: '2024/02/28',
isOnTime: false
}
]
list: []
} }
}, },
onLoad() { onLoad() {
@ -71,7 +30,7 @@
methods: { methods: {
async signStudentListFn() { async signStudentListFn() {
const {data: res} = await signStudentList() const {data: res} = await signStudentList()
console.log(res)
this.list = res
} }
} }
} }

1
pages/tabbar/statistics/comp/topUserInfo.vue

@ -34,7 +34,6 @@
.schoolName { .schoolName {
font-size: 28rpx; font-size: 28rpx;
padding: 20rpx; padding: 20rpx;
max-width: 420rpx;
color: #fff; color: #fff;
} }

7
pages/userCenter/scanCode/scanCode.vue

@ -40,10 +40,11 @@
} }
}, },
onShow() { onShow() {
this.$nextTick(()=>{
this.refresh() this.refresh()
})
this.test()
// this.test()
},
onPullDownRefresh() {
this.refresh()
}, },
onHide() { onHide() {
console.log('清除了') console.log('清除了')

BIN
static/images/index/home_icon_zhuangtai@2x.png

After

Width: 28  |  Height: 28  |  Size: 597 B

Loading…
Cancel
Save