From 7c901bce9f3b67ca6e07c62ce90fe96b061fd6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 31 Oct 2024 10:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E9=97=B2=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=A7=86=E9=A2=91=E5=9C=88=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/mangshi.vue            | 1115 +++++++++++++++++--------------
 pages/my/scrollbarEndPicker.vue |  125 ++++
 pages/my/scrollbarPicker.vue    |  125 ++++
 pages/video/index.vue           |   36 +-
 4 files changed, 892 insertions(+), 509 deletions(-)
 create mode 100644 pages/my/scrollbarEndPicker.vue
 create mode 100644 pages/my/scrollbarPicker.vue

diff --git a/pages/my/mangshi.vue b/pages/my/mangshi.vue
index ffbfa4a..ea8dac7 100644
--- a/pages/my/mangshi.vue
+++ b/pages/my/mangshi.vue
@@ -2,28 +2,32 @@
 	<view>
 		<view class="timeView">
 			<view class="timeView-top">
-				<span class="dx_title">是否接单 <!-- <text class="switchTxt">{{switchTxt=='true'?'接单':'不接单'}}</text> --></span>
-				<switch  :checked='isTrue' style="transform:scale(0.7)" color="#029d88" @change="switch1Change"/>
+				<span class="dx_title">是否接单
+					<!-- <text class="switchTxt">{{switchTxt=='true'?'接单':'不接单'}}</text> --></span>
+				<switch :checked='isTrue' style="transform:scale(0.7)" color="#029d88" @change="switch1Change" />
 			</view>
 			<view class="selectTimt">
 				<view class="dx_title">选择接单时间</view>
-				<view class="selectTimt-bottom">
-					<hTimePicker class="selectTimt-time" dayNum='0' sTime="0" cTime="23" interval="30" @changeTime="bindTimeChange">
-					  <view slot="pCon" class="changeTime">
-					    <view class="selectTimt-time-title">开始时间</view>
-					    <view class="uni-input">{{starTime}}</view>
-					  </view>
-					</hTimePicker>
-					<hTimePickerEnd class="selectTimt-time" dayNum='0' sTime="0" cTime="23" interval="30" @changeTime="bindTimeChangeEndTime">
-					  <view slot="pCon" class="changeTime">
-					    <view class="selectTimt-time-title">结束时间</view>
-					    <view class="uni-input">
-					    	<span>{{endTime}}</span>
-					    </view>
-					  </view>
-					</hTimePickerEnd>
+				<view class="listTime">
+					<view class="selectTimt-bottom">
+						<view @click="showPopup">
+							<uni-title type="h4" title="开始时间" align="center" ></uni-title>
+							<view class="uni-input">{{starTime}}</view>
+						</view>
+						<!-- 弹出层本身 -->
+						<scrollbarPicker :visibleShow.sync="pickerVisible" @Time='bindTimeChange'/>
+					</view>
+					<view class="selectTimt-bottom">
+						<view @click="showEndPopup">
+							<uni-title type="h4" title="结束时间" align="center" ></uni-title>
+							<view class="uni-input">
+								<span>{{endTime}}</span>
+							</view>
+						</view>
+						<!-- 弹出层本身 -->
+						<scrollbarEndPicker :visibleShow.sync="pickerEndVisible" @Time='bindTimeChangeEndTime'/>
+					</view>
 				</view>
-				
 			</view>
 			<view class="container-top">
 				<span>设置不可接单时间</span>
@@ -47,7 +51,7 @@
 					</view>
 				</view>
 			</view>
-			 <view class="sub" @click="sub()">保存选择</view>
+			<view class="sub" @click="sub()">保存选择</view>
 			<!-- <view class="push-button">
 				<view class="detail-btn" @click="sub()">
 					保存选择
@@ -58,8 +62,9 @@
 </template>
 
 <script>
-	import hTimePicker from "@/components/h-timePicker/h-timePicker.vue";
-	import hTimePickerEnd from "@/components/h-timePicker/h-timePickerEnd.vue";
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	import scrollbarPicker from '@/pages/my/scrollbarPicker.vue'
+	import scrollbarEndPicker from '@/pages/my/scrollbarEndPicker.vue'
 	import {
 		tomorrow,
 		dayAfterTomorrow,
@@ -72,410 +77,430 @@
 	import times from '@/components/pretty-times/pretty-times.vue'
 	export default {
 		components: {
+			uniPopup,
+			scrollbarPicker,
+			scrollbarEndPicker,
 			times,
-			hTimePicker,
-			hTimePickerEnd
 		},
 		data() {
 			return {
-				today: [
-					{
-						artificerTime: '00:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-						
-					}, {
-						artificerTime: '00:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '01:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '01:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '02:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '02:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '03:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '03:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '04:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '04:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '05:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '05:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '06:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '06:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '07:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '07:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '08:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '08:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '09:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '09:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '10:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '10:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '11:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '11:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '12:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '12:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '13:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '13:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '14:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '14:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '15:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '15:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '16:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '16:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '17:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '17:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '18:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '18:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '19:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '19:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '20:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '20:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '21:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '21:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '22:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '22:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '23:00',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}, {
-						artificerTime: '23:30',
-						isSelected: false,
-						disable:false,
-						title:'可预约',
-						createTime:currentTime().date
-					}
-				],
+				isPopupShow: false,
+				pickerVisible:false,
+				pickerEndVisible:false,
+				today: [{
+					artificerTime: '00:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+
+				}, {
+					artificerTime: '00:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '01:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '01:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '02:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '02:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '03:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '03:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '04:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '04:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '05:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '05:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '06:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '06:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '07:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '07:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '08:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '08:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '09:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '09:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '10:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '10:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '11:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '11:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '12:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '12:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '13:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '13:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '14:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '14:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '15:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '15:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '16:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '16:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '17:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '17:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '18:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '18:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '19:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '19:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '20:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '20:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '21:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '21:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '22:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '22:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '23:00',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}, {
+					artificerTime: '23:30',
+					isSelected: false,
+					disable: false,
+					title: '可预约',
+					createTime: currentTime().date
+				}],
 				checkbox1: [],
-				selectedTabColor:'rgb(40, 186, 146)',
+				selectedTabColor: 'rgb(40, 186, 146)',
 				dateActive: 0, //选中的日期索引
 				dateArr: [], //日期数据
 				multiSelector: '',
 				isTrue: true,
-				starTime:'00:00',
-				endTime: '23:59',
-				appointTime:[],
-				disableTimeSlot:[],
+				starTime: '00:00',
+				endTime: '23:30',
+				appointTime: [],
+				disableTimeSlot: [],
 				newmsList: [],
 				msList: [],
 				startTime: '',
 				yearsDate: '',
-				switchTxt:'',
-				timeCurrent:'',
-				tomorrowTime:'',
-				selected:[],
-				timeData:[],
-				timeList:''
+				switchTxt: '',
+				timeCurrent: '',
+				tomorrowTime: '',
+				selected: [],
+				timeData: [],
+				timeList: ''
 			}
 		},
 		onLoad() {
-			
-			if(this.timeCurrent==''){
-				this.timeCurrent=tomorrow().tomorrow+' '+this.endTime;
+
+			if (this.timeCurrent == '') {
+				this.timeCurrent = currentTime().date + ' ' + this.starTime;
+			}
+			if (this.tomorrowTime == '') {
+				this.tomorrowTime = currentTime().date + ' ' + this.endTime;
 			}
 			// this.tomorrowTime=currentTime().date+' '+currentTime().times;
-			this.timeList=currentTime().date;
+			this.timeList = currentTime().date;
 			this.getMsTime(currentTime().date);
 			this.initOnload();
 			this.getTimeMs(currentTime().myDate)
 		},
 		methods: {
-			isToday(date){
-				const today = new Date();
-			    return date.getDate() === today.getDate() // 比较日期
-				&& date.getMonth() === today.getMonth() // 比较月份
-				&& date.getFullYear() === today.getFullYear(); // 比较年份
+			showPopup() {
+				this.pickerVisible = true;
 			},
-			getTimeMs(someDate){
+			showEndPopup(){
+				this.pickerEndVisible = true;
+			},
+			selectItem(item) {
+				console.log('选中的项目:', item);
+				// 处理选中项逻辑
+				// ...
+				this.isPopupShow = false;
+			},
+
+			isToday(date) {
+				const today = new Date();
+				return date.getDate() === today.getDate() // 比较日期
+					&&
+					date.getMonth() === today.getMonth() // 比较月份
+					&&
+					date.getFullYear() === today.getFullYear(); // 比较年份
+			},
+			getTimeMs(someDate) {
 				// const someDate = new Date(); // 假设你有一个日期对象
-				var data=[];
+				var data = [];
 				if (this.isToday(someDate)) {
-					var time=currentTime().times
-					for(var i=0;i<this.today.length;i++){
-						if(time<=this.today[i].artificerTime){
+					var time = currentTime().times
+					for (var i = 0; i < this.today.length; i++) {
+						if (time <= this.today[i].artificerTime) {
 							data.push({
 								artificerTime: this.today[i].artificerTime,
 								isSelected: true,
-								disable:true,
-								title:'可预约',
-								createTime:currentTime().date
+								disable: true,
+								title: '可预约',
+								createTime: currentTime().date
 							})
-						}else{
+						} else {
 							data.push({
 								artificerTime: this.today[i].artificerTime,
 								isSelected: false,
-								disable:false,
-								title:'不可预约',
-								createTime:currentTime().date
+								disable: false,
+								title: '不可预约',
+								createTime: currentTime().date
 							})
 						}
 					}
-					this.today=data
+					this.today = data
 				} else {
-					for(var i=0;i<this.today.length;i++){
+					for (var i = 0; i < this.today.length; i++) {
 						data.push({
 							artificerTime: this.today[i].artificerTime,
 							isSelected: true,
-							disable:true,
-							title:'可预约',
-							createTime:this.timeList
+							disable: true,
+							title: '可预约',
+							createTime: this.timeList
 						})
 					}
-					this.today=data;
-				  console.log("这个日期不是今天");
+					this.today = data;
+					console.log("这个日期不是今天");
 				}
-				
+
 			},
-			selectTime(index,item){
+			selectTime(index, item) {
 				var data = [];
-				if(item.disable==true){
-					if(item.isSelected==true){
-						item.isSelected=false;
-						item.title='不可预约';
-						
-					}else{
-						item.isSelected=true;
-						item.title='可预约';
+				if (item.disable == true) {
+					if (item.isSelected == true) {
+						item.isSelected = false;
+						item.title = '不可预约';
+
+					} else {
+						item.isSelected = true;
+						item.title = '可预约';
 					}
 					var index = this.selected.indexOf(item);
-					if(item.huixian==false){//回显的时候反选
-						item.huixian=true
+					if (item.huixian == false) { //回显的时候反选
+						item.huixian = true
 						this.selected.splice(index, 1);
-					}else{
+					} else {
 						if (index === -1) {
 							this.selected.push(item);
 						} else {
 							this.selected.splice(index, 1);
 						}
 					}
-					
-					this.timeData=this.selected;
-					console.log("this.timeData",this.timeData)
-				}else{
+
+					this.timeData = this.selected;
+					console.log("this.timeData", this.timeData)
+				} else {
 					console.log("时间过了")
 				}
 			},
@@ -484,67 +509,70 @@
 				const today = new Date();
 				this.dateActive = index
 				this.selectDate = item.week
-				if(item.week=='明天'){
-					this.selected=[];
-					this.timeList=tomorrow().tomorrow;
+				if (item.week == '明天') {
+					this.selected = [];
+					this.timeList = tomorrow().tomorrow;
 					this.getTimeMs(tomorrow().todayT)
-				}else if(item.week=='后天'){
-					this.selected=[];
-					this.timeList=dayAfterTomorrow().dayAfterTomorrow;
+				} else if (item.week == '后天') {
+					this.selected = [];
+					this.timeList = dayAfterTomorrow().dayAfterTomorrow;
 					this.getTimeMs(dayAfterTomorrow().todayD)
-				}else{
-					this.selected=[];
-					this.timeList=currentTime().date;
+				} else {
+					this.selected = [];
+					this.timeList = currentTime().date;
 					this.getTimeMs(today)
 				}
 				this.initOnload()
 				this.getMsTime(this.timeList)
 			},
 			initOnload() {
-				var danqian=initData() // 日期栏初始化
+				var danqian = initData() // 日期栏初始化
 				// this.dateArr = initData() // 日期栏初始化
 				let newObj = [];
 				for (let i = 0; i < 3; i++) {
 					let key = danqian[i];
 					if (key.week == '今天') {
 						key.week = "今天"
-					} else if (key.week ==  "明天") {
+					} else if (key.week == "明天") {
 						key.week = "明天"
-						
-					} else if (key.week ==  '后天') {
+
+					} else if (key.week == '后天') {
 						key.week = "后天";
-						
-					} 
-					  newObj.push(key)
+
+					}
+					newObj.push(key)
 				}
 				this.dateArr = newObj
-				
+
 			},
-			bindTimeChange: function(e) {// 当天接单开始时间
+			bindTimeChange: function(e) { // 当天接单开始时间
+				console.log(e);
 				this.starTime = e;
-				this.tomorrowTime=currentTime().date+' '+this.starTime;
+				this.timeCurrent = currentTime().date + ' ' + this.starTime;
+				console.log(this.timeCurrent);
 			},
-			bindTimeChangeEndTime(e){//次日接单结束时间
+			bindTimeChangeEndTime(e) { //次日接单结束时间
 				this.endTime = e;
-				this.timeCurrent=tomorrow().tomorrow+' '+this.endTime;
+				this.tomorrowTime = currentTime().date + ' ' + this.endTime;
+				console.log(this.tomorrowTime);
 			},
-			switch1Change: function (e) {
-				this.switchTxt=e.detail.value
-				var time=''
-				if(this.switchTxt==true){
-					time='1'
-				}else{
-					time='2'
+			switch1Change: function(e) {
+				this.switchTxt = e.detail.value
+				var time = ''
+				if (this.switchTxt == true) {
+					time = '1'
+				} else {
+					time = '2'
 				}
 				this.sfJdan(time)
-				
+
 			},
-			sfJdan(time){//是否接单
-				var data={
-					flag:time,
-					artificerId:uni.getStorageSync('artificerId')
+			sfJdan(time) { //是否接单
+				var data = {
+					flag: time,
+					artificerId: uni.getStorageSync('artificerId')
 				}
-				this.$Request.postT('/app/artificerTime/setArtificerAccept',data).then(res => {
+				this.$Request.postT('/app/artificerTime/setArtificerAccept', data).then(res => {
 					if (res.code == 0) {
 						this.$queue.showToast('设置成功！')
 						this.getMsTime(this.timeList)
@@ -553,15 +581,21 @@
 					}
 				});
 			},
-			getTime(time){
-				this.msList=time;
+			getTime(time) {
+				this.msList = time;
+			},
+			scrollTo(titleNo) {
+				let index = this.list.indexOf(titleNo);
+				index -= 2;
+				let num = index * this.itemHeight;
+				this.$refs.scrollMenuRef.wrap.scrollTop = num;
 			},
 			sub() {
-				if(this.endTime>=this.starTime){
+				if (this.endTime >= this.starTime) {
 					this.saveMangShi();
-				}else{
+				} else {
 					this.$queue.showToast('开始时间需早于结束时间！');
-				}	
+				}
 				// if (this.msList.length == 0) {
 				// if(this.yearsDate === ''){
 				// 	this.$queue.showToast('请先添加待选时间！');
@@ -598,23 +632,30 @@
 				}
 			},
 			saveMangShi() {
-				var time=[];
-				for(var i=0;i<this.timeData.length;i++){
+				console.log(this.starTime);
+				console.log(this.endTime);
+				console.log(this.timeCurrent);
+				console.log(this.tomorrowTime);
+				this.$queue.showLoading('设置中...');
+				var time = [];
+				for (var i = 0; i < this.timeData.length; i++) {
 					time.push(
-						this.timeData[i].createTime+' '+this.timeData[i].artificerTime
+						this.timeData[i].createTime + ' ' + this.timeData[i].artificerTime
 					)
 				}
-				var data={
-					idleTime:this.tomorrowTime+','+this.timeCurrent,
-					busyTime:time.toString(),
-					artificerId:uni.getStorageSync('artificerId')
+				var data = {
+					idleTime: this.timeCurrent + ',' + this.tomorrowTime,
+					busyTime: time.toString(),
+					artificerId: uni.getStorageSync('artificerId')
 				}
-				if(this.selectDate=='明天'){
-					data.idleTime=(this.timeList+' '+this.starTime)+','+(dayAfterTomorrow().dayAfterTomorrow+' '+this.endTime);
-				}else if(this.selectDate=='后天'){
-					data.idleTime=(this.timeList+' '+this.starTime)+','+(dayAfterTomorrowD().dayAfterTomorrowD+' '+this.endTime);
+				if (this.selectDate == '明天') {
+					data.idleTime = (this.timeList + ' ' + this.starTime) + ',' + (dayAfterTomorrow().dayAfterTomorrow +
+						' ' + this.endTime);
+				} else if (this.selectDate == '后天') {
+					data.idleTime = (this.timeList + ' ' + this.starTime) + ',' + (dayAfterTomorrowD().dayAfterTomorrowD +
+						' ' + this.endTime);
 				}
-				this.$Request.postT('/app/artificerTime/setArtificerTime',data).then(res => {
+				this.$Request.postT('/app/artificerTime/setArtificerTime', data).then(res => {
 					if (res.code == 0) {
 						this.$queue.showToast('设置成功！')
 						this.getMsTime(this.timeList)
@@ -625,45 +666,46 @@
 			},
 			getMsTime(artificerDate) {
 				// this.yearsDate = artificerDate;
-				this.$Request.getT('/app/artificerTime/selectArtificerTimeByArtificerId?artificerId=' + uni.getStorageSync('artificerId') + '&artificerDate=' + artificerDate).then(res => {
+				this.$Request.getT('/app/artificerTime/selectArtificerTimeByArtificerId?artificerId=' + uni.getStorageSync(
+					'artificerId') + '&artificerDate=' + artificerDate).then(res => {
 					if (res.code == 0) {
-						if(res.data!=''){
-							var data=[];
-							for(var i=0;i<res.data.length;i++){
+						if (res.data != '') {
+							var data = [];
+							for (var i = 0; i < res.data.length; i++) {
 								data.push({
 									artificerTime: res.data[i].artificerTime,
 									isSelected: false,
-									disable:true,
-									title:'不可预约',
-									createTime:res.data[i].artificerDate,
+									disable: true,
+									title: '不可预约',
+									createTime: res.data[i].artificerDate,
 								})
 							}
 							this.today.forEach(item1 => {
-							  let item2 = data.find(item => item.artificerTime == item1.artificerTime);
-								if(item2){
-									item1.isSelected=false;
-									item1.title='不可预约';
-									item1.huixian=false;
-								}else{
-									item1.isSelected=true
-									item1.title='可预约'
-									item1.huixian=true;
+								let item2 = data.find(item => item.artificerTime == item1.artificerTime);
+								if (item2) {
+									item1.isSelected = false;
+									item1.title = '不可预约';
+									item1.huixian = false;
+								} else {
+									item1.isSelected = true
+									item1.title = '可预约'
+									item1.huixian = true;
 								}
 							});
 						}
-						
-						var jintian=currentTime().date;//今天
-						var mingtian=tomorrow().tomorrow;//明天
-						var houtian=dayAfterTomorrow().dayAfterTomorrow;//后天
+
+						var jintian = currentTime().date; //今天
+						var mingtian = tomorrow().tomorrow; //明天
+						var houtian = dayAfterTomorrow().dayAfterTomorrow; //后天
 						if (res.acceptOrders == 1) {
 							this.isTrue = true
 						} else if (res.acceptOrders == 2) {
 							this.isTrue = false
 						}
-						if(res.startTime){
-							this.starTime=res.startTime.slice(11,16);
-							this.tomorrowTime=jintian+' '+this.starTime;
-						}else{
+						if (res.startTime) {
+							this.starTime = res.startTime.slice(0, 5);
+							this.timeCurrent = jintian + ' ' + this.starTime;
+						} else {
 							// 获取当前时间
 							const now = new Date();
 							// 格式化时间为时分
@@ -672,16 +714,16 @@
 							// 将分钟划分为半小时
 							let halfHour = false;
 							if (minutes >= 30) {
-							  halfHour = true;
+								halfHour = true;
 							}
 							// 格式化输出
 							this.starTime = `${hours.toString().padStart(2, '0')}:${halfHour ? '30' : '00'}`;
-							this.tomorrowTime=jintian+' '+this.starTime;
-						}
-						this.endTime=res.endTime.slice(11,16);
-					}else {
-							this.isTrue = false
+							this.timeCurrent = jintian + ' ' + this.starTime;
 						}
+						this.endTime = res.endTime.slice(0, 5);
+					} else {
+						this.isTrue = false
+					}
 				});
 			},
 		}
@@ -689,43 +731,50 @@
 </script>
 
 <style lang="scss" scoped>
-	.container-top span:nth-child(1){
+	.container-top span:nth-child(1) {
 		font-size: 14px;
 		font-weight: bold;
 		margin-right: 5px;
 		margin-left: 20rpx;
 	}
-	.container-top span:nth-child(2){
+
+	.container-top span:nth-child(2) {
 		font-size: 13px;
 		color: #ccc;
 	}
-	.container-top{
-		width:100%;
+
+	.container-top {
+		width: 100%;
 		display: flex;
 		flex-direction: row;
 		background: #fff;
 		padding-top: 10px;
 		padding-left: 5px;
 	}
-	.active{
-	    border: 1px solid #28ba92;
-	    font-weight: bold;
+
+	.active {
+		border: 1px solid #28ba92;
+		font-weight: bold;
 		color: rgb(40, 186, 146);
 	}
-	.disable{
+
+	.disable {
 		border: 1px solid #EEEEEE;
-	    background: #F1F3F6 !important;
-	    color: #999;
+		background: #F1F3F6 !important;
+		color: #999;
 	}
-	/deep/.checkbox__inner{
-			display: none;
+
+	/deep/.checkbox__inner {
+		display: none;
 	}
-	.all{
+
+	.all {
 		white-space: nowrap;
 		font-size: 10px;
 		padding-top: 5px;
 	}
-	.item-box{
+
+	.item-box {
 		width: 100%;
 		height: 50px;
 		padding: 0 21px;
@@ -737,71 +786,79 @@
 		align-items: center;
 		justify-content: center;
 	}
-	.item{
+
+	.item {
 		width: 25%;
 		padding: 0 4px;
 		margin: 6px 0;
 	}
-	.time-box{
-		width:100%;
+
+	.time-box {
+		width: 100%;
 		padding: 13px 5px 12px;
 		display: flex;
 		flex-wrap: wrap;
 		background-color: #fff;
 	}
-	.flex-box .date-box{
-	    border: none;
-	    display: flex;
-	    height: 50px;
-	    flex-direction: column;
-	    align-items: center;
-	    justify-content: space-around;
-	    font-size: 14px;
-	    color: #818181;
+
+	.flex-box .date-box {
+		border: none;
+		display: flex;
+		height: 50px;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-around;
+		font-size: 14px;
+		color: #818181;
 	}
-	.flex-box{
+
+	.flex-box {
 		display: inline-block;
 		height: 60px;
 		width: 33%;
 		margin: 0 3px 0 3px;
 		box-sizing: border-box;
 	}
-	/deep/.uni-scroll-view-content{
-		display:flex;
+
+	/deep/.uni-scroll-view-content {
+		display: flex;
 	}
-	/deep/.scroll-view_H{
-	    width: 100%;
-	    white-space: nowrap;
-	    height: 75px;
-	    background-color: #fff;
-	    position: relative;
-	    padding-top: 10px;
+
+	/deep/.scroll-view_H {
+		width: 100%;
+		white-space: nowrap;
+		height: 75px;
+		background-color: #fff;
+		position: relative;
+		padding-top: 10px;
 	}
+
 	.borderb {
 		border-bottom: 2px solid rgb(40, 186, 146);
 	}
-	.selectTimt-time-title{
+
+	.selectTimt-time-title {
 		text-align: center;
 		margin-bottom: 5px;
 	}
-	/deep/.uni-input{
+
+	/deep/.uni-input {
 		text-align: center;
 		color: #28BA92;
 	}
-	.selectTimt-time{
+
+	.selectTimt-time {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
-	.selectTimt-bottom{
-		margin-top:10px;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-around;
+
+	.selectTimt-bottom {
+		margin-top: 10px;
 		width: 100%;
 	}
-	.selectTimt{
+
+	.selectTimt {
 		display: flex;
 		flex-direction: column;
 		width: 100%;
@@ -809,18 +866,21 @@
 		background: #fff;
 		margin: 10px auto;
 	}
-	.dx_title{
+
+	.dx_title {
 		font-size: 14px;
 		font-weight: bold;
-		margin-left:20rpx;
+		margin-left: 20rpx;
 	}
-	.switchTxt{
+
+	.switchTxt {
 		font-size: 13px;
 		font-weight: 400;
 		margin-left: 5px;
 		color: #28BA92;
 	}
-	.timeView-top{
+
+	.timeView-top {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -830,6 +890,7 @@
 		background: #fff;
 		margin: 10px auto;
 	}
+
 	page {
 		background: #f7f7f7;
 	}
@@ -897,7 +958,7 @@
 		margin-right: 25rpx;
 	}
 
-	
+
 
 	.topView {
 		width: 750rpx;
@@ -941,12 +1002,13 @@
 		height: 80rpx;
 		line-height: 80rpx;
 		border-radius: 50rpx;
-		margin: 20rpx auto  20rpx auto;
+		margin: 20rpx auto 20rpx auto;
 		color: #FFFFFF;
 		font-size: 30rpx;
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 	}
-	.push-button{
+
+	.push-button {
 		width: 100%;
 		height: 48px;
 		position: fixed;
@@ -955,8 +1017,9 @@
 		flex-direction: column;
 		align-items: center;
 		margin: 0 auto;
-		}
-	.detail-btn{
+	}
+
+	.detail-btn {
 		display: inline-block;
 		width: 92%;
 		text-align: center;
@@ -967,5 +1030,41 @@
 		line-height: 40px;
 		margin-top: 4px;
 		font-size: 34rpx;
+	}
+
+	.list {
+		background-color: #fff;
+
+		/deep/ .uni-scroll-view-content {
+			display: flex;
+			flex-flow: column;
+			align-items: center;
+			overflow-x: hidden;
 		}
-</style>
+
+	}
+
+	.list-item {
+		height: 40px;
+		box-sizing: border-box;
+		line-height: 40px;
+		color: #bfc2c9;
+	}
+
+	.active_li {
+		color: #000;
+		border-top: 1px solid #bfc2c9;
+		border-bottom: 1px solid #bfc2c9;
+	}
+
+	.popup-content {
+		display: flex;
+		justify-content: space-between;
+	}
+	.listTime{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/scrollbarEndPicker.vue b/pages/my/scrollbarEndPicker.vue
new file mode 100644
index 0000000..6e5ea85
--- /dev/null
+++ b/pages/my/scrollbarEndPicker.vue
@@ -0,0 +1,125 @@
+<template>
+	<div>
+		<VuePicker :data="pickData" :showToolbar="true" @cancel="cancel" @confirm="confirm"
+			:visible.sync="pickerVisible" />
+	</div>
+</template>
+
+<script>
+	import VuePicker from 'vue-pickers'
+	const tdata = [{
+			label: '00',
+		},
+		{
+			label: '01',
+		},
+		{
+			label: '02',
+		},
+		{
+			label: '03',
+		},
+		{
+			label: '04',
+		},
+		{
+			label: '05',
+		},
+		{
+			label: '06',
+		},
+		{
+			label: '07',
+		},
+		{
+			label: '08',
+		},
+		{
+			label: '09',
+		},
+		{
+			label: '10',
+		},
+		{
+			label: '11',
+		},
+		{
+			label: '12',
+		},
+		{
+			label: '13',
+		},
+		{
+			label: '14',
+		},
+		{
+			label: '15',
+		},
+		{
+			label: '16',
+		},
+		{
+			label: '17',
+		},
+		{
+			label: '18',
+		},
+		{
+			label: '19',
+		},
+		{
+			label: '20',
+		},
+		{
+			label: '21',
+		},
+		{
+			label: '22',
+		},
+		{
+			label: '23',
+		},
+	]
+	var tdata2 = [{
+			label: '00',
+		},
+		{
+			label: '30',
+		},
+	]
+
+	export default {
+		components: {
+			VuePicker
+		},
+		props: {
+			visibleShow: Boolean,
+		},
+		data() {
+			return {
+				pickData: [
+					tdata,
+					tdata2
+				],
+				pickerVisible: false,
+				result: ''
+			}
+		},
+		watch: {
+			visibleShow(val) {
+				this.pickerVisible = val
+			}
+		},
+		methods: {
+			cancel() {
+				this.result = 'click cancel result: null'
+				this.$emit('update:visibleShow', false);
+			},
+			confirm(res) {
+				//console.log("this.result",res[0].label)
+				this.$emit('update:visibleShow', false);
+				this.$emit('Time', `${res[0].label}:${res[1].label}`);
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/my/scrollbarPicker.vue b/pages/my/scrollbarPicker.vue
new file mode 100644
index 0000000..6e5ea85
--- /dev/null
+++ b/pages/my/scrollbarPicker.vue
@@ -0,0 +1,125 @@
+<template>
+	<div>
+		<VuePicker :data="pickData" :showToolbar="true" @cancel="cancel" @confirm="confirm"
+			:visible.sync="pickerVisible" />
+	</div>
+</template>
+
+<script>
+	import VuePicker from 'vue-pickers'
+	const tdata = [{
+			label: '00',
+		},
+		{
+			label: '01',
+		},
+		{
+			label: '02',
+		},
+		{
+			label: '03',
+		},
+		{
+			label: '04',
+		},
+		{
+			label: '05',
+		},
+		{
+			label: '06',
+		},
+		{
+			label: '07',
+		},
+		{
+			label: '08',
+		},
+		{
+			label: '09',
+		},
+		{
+			label: '10',
+		},
+		{
+			label: '11',
+		},
+		{
+			label: '12',
+		},
+		{
+			label: '13',
+		},
+		{
+			label: '14',
+		},
+		{
+			label: '15',
+		},
+		{
+			label: '16',
+		},
+		{
+			label: '17',
+		},
+		{
+			label: '18',
+		},
+		{
+			label: '19',
+		},
+		{
+			label: '20',
+		},
+		{
+			label: '21',
+		},
+		{
+			label: '22',
+		},
+		{
+			label: '23',
+		},
+	]
+	var tdata2 = [{
+			label: '00',
+		},
+		{
+			label: '30',
+		},
+	]
+
+	export default {
+		components: {
+			VuePicker
+		},
+		props: {
+			visibleShow: Boolean,
+		},
+		data() {
+			return {
+				pickData: [
+					tdata,
+					tdata2
+				],
+				pickerVisible: false,
+				result: ''
+			}
+		},
+		watch: {
+			visibleShow(val) {
+				this.pickerVisible = val
+			}
+		},
+		methods: {
+			cancel() {
+				this.result = 'click cancel result: null'
+				this.$emit('update:visibleShow', false);
+			},
+			confirm(res) {
+				//console.log("this.result",res[0].label)
+				this.$emit('update:visibleShow', false);
+				this.$emit('Time', `${res[0].label}:${res[1].label}`);
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/video/index.vue b/pages/video/index.vue
index 1904026..156f639 100644
--- a/pages/video/index.vue
+++ b/pages/video/index.vue
@@ -25,13 +25,18 @@
 			</view>	
 		</view>	
 		<scroll-view :style="'width: 100%; height: '+ (windowHeight) +'px; background-color: #fff;'" :scroll-y="true" @scrolltolower="scrolltolower" :lower-threshold="lowerThreshold">
-			<view style="display: flex; flex-direction: row; flex-wrap: wrap;padding-top: 46px;">
+			<view style="display: flex; flex-direction: row; flex-wrap: wrap;padding-top: 60px;">
 				<checkbox-group class="checkbox-group" @change="checkboxChange">
 					<view class="checkbox-group-list" v-for="(list,index) in dataList" :key="index">
 						<view class="data-list">
 							<image v-if="checkboxShow==1" @click="towxh5Video(list)" :src="list.picPath" mode="aspectFill" style="width: 100%; height: 100%;border-radius: 10rpx;"></image>
 							<image v-if="checkboxShow==0" :src="list.picPath" mode="aspectFill" style="width: 100%; height: 100%; border-radius: 10rpx;"></image>
 							<checkbox v-if="checkboxShow==0" class="check-list" style="border-radius:50%;" activeBackgroundColor="#029d88" color="#029d88" :value="list.id.toString()" :checked="checkbox"/>
+							<view class="index-card-view-title-right">
+								<view v-if="list.status ==0" class="index-card-view-title-right-text-dsp">待审批</view>
+								<view v-if="list.status ==1" class="index-card-view-title-right-text-tg">通过</view>
+								<view v-if="list.status ==2" class="index-card-view-title-right-text-jj">拒绝</view>
+							</view>
 						</view>
 					</view>
 				</checkbox-group>
@@ -493,4 +498,33 @@
 	.service-deleimg{
 		width: 40rpx;
 		height:40rpx;}
+		
+	.index-card-view-title-right{
+		width: 65px;
+		height: 47rpx;
+		line-height: 47rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #fff;
+		position: absolute;
+		top:10rpx;
+		left:10rpx;
+		/* margin-left: 85px; */
+	}
+	.index-card-view-title-right-text-dsp{
+		border-top-left-radius: 10px;
+		border-bottom-right-radius: 10px;
+		background: linear-gradient(90deg, #2794ff, #65aff7, #9accfd);
+	}
+	.index-card-view-title-right-text-tg{
+		border-top-left-radius: 10px;
+		border-bottom-right-radius: 10px;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.index-card-view-title-right-text-jj{
+		border-top-left-radius: 10px;
+		border-bottom-right-radius: 10px;
+		background: linear-gradient(90deg, #e54d42, #e1766f, #dda39f);
+	}
 </style>