修改若干bug

components/datepicker/datepicker.vue

@@ -16,7 +16,7 @@
 							预约时间：
 						</view>
 						<view class="margin-top-sm">{{itm.start_time_period}} - {{itm.end_time_period}}</view>
-						<view class="margin-top-sm text-blue">
+						<view class="margin-top-sm text-blue text-sm">
 							可预约号源：{{itm.can_appoint_num}}
 						</view>
 					</u-grid-item>
@@ -33,9 +33,6 @@
 				type: Array,
 			}
 		},
-		onShow() {
-			console.log("hahah")
-		},
 		mounted() {
 
 		},
@@ -60,7 +57,18 @@
 				})
 			},
 			selectday(itm) {
-				// console.log(itm)
+				let arr = itm.year + " " + itm.end_time_period;
+				arr = arr.split(/[- :]/)
+				let nndate = new Date(arr[0], arr[1] - 1, arr[2], arr[3], arr[4]);
+				nndate = Date.parse(nndate)
+				let currentTime = Date.parse(new Date())
+				if (nndate < currentTime) {
+					uni.showToast({
+						title: "不可预约已过时间",
+						icon: "none"
+					})
+					return false
+				}
 				if (this.year != "") {
 					itm.year = this.year
 				}

pages/childcare/child_care.vue

@@ -27,6 +27,9 @@
 						</view>
 					</view>
 				</scroll-view>
+				<view class="">
+					<rich-text :nodes="doctor.nurse_notice"></rich-text>
+				</view>
 			</view>
 			<view class="cu-item arrow" @click="vaccinesList">
 				<view class="content">
@@ -84,6 +87,8 @@
 		<u-popup v-model="dateshow" mode="bottom" :safe-area-inset-bottom="true" border-radius="14" length="50%" height="700rpx">
 			<datepicker :date="multiSelector" @callbacktime="callbacktime" ref="date"></datepicker>
 		</u-popup>
+		<view class="cu-tabbar-height"></view>
+		<view class="cu-tabbar-height"></view>
 	</view>
 </template>
 
@@ -103,7 +108,7 @@
 				hasLogin: 'verifyJwt'
 			})
 		},
-		components:{
+		components: {
 			datepicker
 		},
 		onLoad() {
@@ -145,7 +150,8 @@
 				yimiaoInfo: "",
 				time: "",
 				childcare: [],
-				dateshow:false
+				dateshow: false,
+				is_Scheduling: true
 			}
 		},
 		methods: {
@@ -180,10 +186,14 @@
 					// })
 					// this.multiSelector.push(res.data.dates)
 					// this.multiSelector.push(res.data.list)
+					if (res.data.data.length == 0) {
+						this.is_Scheduling = false
+						return false
+					}
 					let nian = res.data.data.map(item => {
 						return {
-							date:item.schedule_date,
-							id:item.id
+							date: item.schedule_date,
+							id: item.id
 						}
 					})
 					res.data.data.forEach(item => {
@@ -191,7 +201,8 @@
 							if (item.id == itm.schedule_id) {
 								itm.organization.org_id = itm.organization['id']
 								return {
-									schedule_id:itm.schedule_id,
+									yeardate:itm.schedule_date,
+									schedule_id: itm.schedule_id,
 									can_appoint_num: itm.can_appoint_num,
 									...itm.organization,
 									...itm.time_period
@@ -205,9 +216,24 @@
 					// })
 					this.multiSelector.push(nian)
 					// time[0].sort((a,b)=> {return a.end_time_period>b.end_time_period?1:-1})
+					times.forEach(item => {
+						item.sort((a, b) => {
+							return a.end_time_period > b.end_time_period ? 1 : -1
+						})
+						// for (let i = item.length - 1; i >= 0; i--) {
+						// 	let arr = item[i].yeardate + " " + item[i].end_time_period;
+						// 	arr = arr.split(/[- :]/)
+						// 	let nndate = Date.parse(new Date(arr[0], arr[1] - 1, arr[2], arr[3], arr[4]));
+						// 	let currentTime = Date.parse(new Date())
+						// 	// console.log(nndate<currentTime,index)
+						// 	if (nndate < currentTime) {
+						// 		item.splice(i, 1)
+						// 	}
+						// }
+					})
 					this.multiSelector.push(times)
 					let arr = this.multiSelector[1][0]
-					arr.forEach(item=>{
+					arr.forEach(item => {
 						item.year = nian[0].date
 					})
 					this.$refs.date.rightday = arr
@@ -247,6 +273,13 @@
 				})
 			},
 			yuyuetime() {
+				if (!this.is_Scheduling) {
+					uni.showToast({
+						title: "尚未排班",
+						icon: "none"
+					})
+					return false
+				}
 				if (this.doctor == '') {
 					uni.showToast({
 						title: "请先选择机构",

pages/common_tools/collection/collection.vue

@@ -6,7 +6,7 @@
 				<view class="type">{{item.article.created_at}}</view>
 			</view>
 			<view class="img">
-				<image :src="item.article.banner_url" class="i" mode="aspectFit"></image>
+				<image :src="imghost+item.article.banner_url" class="i" mode="aspectFit"></image>
 			</view>
 		</view>
 		<u-empty text="暂无数据" mode="order" :show="show" margin-top="250"></u-empty>
@@ -19,10 +19,12 @@
 			return {
 				listArray: [],
 				pageindex: 1,
-				show: false
+				show: false,
+				imghost:""
 			}
 		},
 		mounted() {
+			this.imghost = this.$imgHost
 			this.getcollectionList()
 		},
 		methods: {

pages/common_tools/help_feedback/opinion1.vue

@@ -65,6 +65,11 @@
 							delta:1
 						})
 					},1500)
+				}else{
+					uni.showToast({
+						title:res.message,
+						icon:"none",
+					})
 				}
 			}
 		}

pages/common_tools/home_doctor.vue

@@ -118,7 +118,7 @@
 			},
 			clicklist(e) {
 				uni.navigateTo({
-					url: "../doctor_related/doctor_info?id=" + e.currentTarget.dataset.id
+					url: "../doctor_related/doctor_info?id=" + e.currentTarget.dataset.id+"&index=1"
 				})
 			}
 		}

pages/common_tools/my_consulting/consultingInfo.vue

@@ -44,8 +44,8 @@
 			<view class="text-gray margin-top-xs padding-tb-xs">
 				<text class="text-leftstyle">结束时间：</text><text class="font_style">{{outtime}}</text>
 			</view>
-			<view class="text-gray margin-top-xs padding-tb-xs">
-				<text class="text-leftstyle">咨询时长：</text><text class="font_style"></text>
+			<view class="text-gray margin-top-xs padding-tb-xs" v-if="orderInfo.product_type==1">
+				<text class="text-leftstyle">咨询时长：</text><text class="font_style">{{parseInt(orderInfo.consult_duration/60)}}分钟</text>
 			</view>
 			<view class="text-gray margin-top-xs padding-tb-xs">
 				<text class="text-leftstyle">咨询患者：</text><text class="font_style">{{orderInfo.order_patient.name}}</text>
@@ -93,7 +93,7 @@
 			}
 		},
 		onShow() {
-			
+
 		},
 		methods: {
 			gosuggest() {
@@ -119,7 +119,18 @@
 			},
 			gotochat() {
 				if (this.orderInfo.product_type == 1) {
-
+					if(this.orderInfo.callback_phone == ''){
+						uni.showModal({
+							title:"提示",
+							content:"回拨需等首次医生拨打后才可回拨",
+							showCancel:false,
+							confirmText:"知道了",
+						})
+						return false
+					}
+					uni.makePhoneCall({
+						phoneNumber: this.orderInfo.callback_phone
+					})
 				} else if (this.orderInfo.product_type == 2) {
 					uni.navigateTo({
 						url: "conversation?doctor=" + JSON.stringify(this.orderInfo.docter) + "&doctorstatus=" + this.orderInfo.order_status

pages/common_tools/my_consulting/conversation.vue

@@ -35,19 +35,20 @@
 				</view>
 			</view>
 		</view>
-		<view :class="InputBottom!=0?'cu-bar foot tab input cur':'cu-bar foot input'" v-if="doctorstatus!='4'" :style="'bottom:'+InputBottom+'px'">
+		<view :class="InputBottom!=0?'cu-bar foot tab input cur':'cu-bar foot input'" style="padding-bottom: 45rpx;padding-top: 45rpx;" v-if="doctorstatus!='4'" :style="'bottom:'+InputBottom+'px'">
 			<view class="action" @click="sendvoice">
 				<text class="cuIcon-sound text-grey"></text>
 			</view>
 			<input v-if="!isvoice" v-model="keyword" class="solid-bottom" @focus="InputFocus" @blur="InputBlur" :disabled="isinput"
 			 :adjust-position="false" :focus="false" maxlength="300" :placeholder="textinput" cursor-spacing="10"></input>
-			<button class="flex-sub" style="font-size: 30rpx; height: 64rpx;padding: 0;" @touchstart.stop="onRecordStart"
+			<button class="flex-sub" style="font-size: 30rpx; height: 64rpx;padding: 0;" @longpress="onRecordStart"
 			 @touchend.stop="onRecordEnd" v-else>{{audio.recording ? '松开发送':'按住发送语音'}}</button>
 			<view class="action" style="margin-right: 20rpx;" @click="sendImage">
 				<text class="cuIcon-picfill text-grey"></text>
 			</view>
 			<button class="cu-btn bg-green shadow" @click="sendMessage">发送</button>
 		</view>
+		<view class="record-loading" v-if="audio.recording"></view>
 	</view>
 </template>
 
@@ -269,10 +270,28 @@
 <style lang="scss">
 	page {
 		padding-bottom: 100rpx;
+		-webkit-touch-callout: none;
+		-webkit-user-select: none;
+		-khtml-user-select: none;
+		-moz-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
 	}
 
 	.time-lag {
 		font-size: 20rpx;
 		text-align: center;
 	}
+	.record-loading{
+		position: fixed;
+		top:50%;
+		left: 50%;
+		width: 300rpx;
+		height: 300rpx;
+		margin: -150rpx -150rpx;
+		background: #262628;
+		background: url("https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/recording-loading.gif") no-repeat center;
+		background-size: 100%;
+		border-radius: 40rpx;
+	}
 </style>

pages/common_tools/my_consulting/my_consulting.vue

@@ -232,6 +232,11 @@
 								this.ordersList.splice(index, 1)
 							}
 						})
+						this.ordersList.forEach((item, index) => {
+							if (item.product_type == 5) {
+								this.ordersList.splice(index, 1)
+							}
+						})
 						this.ordersList.forEach((item, index) => {
 							if (item.product_type != 1 && item.product_type != 2) {
 								this.ordersList.splice(index, 1)

pages/doctor_related/doctor_info.vue

@@ -73,7 +73,7 @@
 					 :range="multiSelector"></u-picker> -->
 				</view>
 			</view>
-			<view v-if="isjigou" bindtap="goAdrPostion" class="pr pt10 pb10 margin-lr-sm margin-top-sm m-bg-white" style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
+			<view v-if="isjigou" @click="goAdrPostion" class="pr pt10 pb10 margin-lr-sm margin-top-sm m-bg-white" style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
 				<view class="pr pt15 pb15">
 					<view class="f18 fb plr15">机构地址</view>
 					<view class="pr m-xcenter plr15 mt15">
@@ -189,7 +189,9 @@
 				ismenzhen: false,
 				loading: true,
 				is_can_appoint: "",
-				dateshow: false
+				dateshow: false,
+				is_date_obsolete: "",
+				location: {}
 
 			}
 		},
@@ -236,10 +238,11 @@
 			gettime: async function() {
 				this.multiSelector = []
 				let res = await this.$request.post("/api/v1/docter/schedulePeriodList", {
-					docter_id: this.doctorid
+					docter_id: this.doctorid,
+					latitude: uni.getStorageSync('latitude'),
+					longitude: uni.getStorageSync('longitude')
 				})
 				if (res.status == 0) {
-					console.log(res, "sssss")
 					if (res.data.data.length != 0) {
 						// let nian = res.data.data.map(item => {
 						// 	return item.schedule_date
@@ -284,6 +287,7 @@
 								if (item.id == itm.schedule_id) {
 									itm.organization.org_id = itm.organization['id']
 									return {
+										yeardate: itm.schedule_date,
 										schedule_id: itm.schedule_id,
 										can_appoint_num: itm.can_appoint_num,
 										...itm.organization,
@@ -294,15 +298,27 @@
 							times.push(time)
 						})
 						this.multiSelector.push(nian)
-						times.forEach(item => {
+						times.forEach((item, index) => {
 							item.sort((a, b) => {
 								return a.end_time_period > b.end_time_period ? 1 : -1
 							})
+							// for (let i = item.length - 1; i >= 0; i--) {
+							// 	let arr = item[i].yeardate + " " + item[i].end_time_period;
+							// 	arr = arr.split(/[- :]/)
+							// 	let nndate = Date.parse(new Date(arr[0], arr[1] - 1, arr[2], arr[3], arr[4]));
+							// 	let currentTime = Date.parse(new Date())
+							// 	// console.log(nndate<currentTime,index)
+							// 	if (nndate < currentTime) {
+							// 		item.splice(i, 1)
+							// 	}
+							// }
 						})
+						console.log(times)
 						this.multiSelector.push(times)
-						console.log(this.multiSelector)
 						this.daytime = this.multiSelector[0][0].date + " " + this.multiSelector[1][0][0].start_time_period + "-" + this.multiSelector[
 							1][0][0].end_time_period
+						this.is_date_obsolete = this.multiSelector[0][0].date + " " + this.multiSelector[
+							1][0][0].end_time_period
 						this.hospital = this.multiSelector[1][0][0].name
 						this.address = this.multiSelector[1][0][0].address
 						this.jigouid = this.multiSelector[1][0][0].org_id
@@ -310,14 +326,35 @@
 						this.year = this.multiSelector[0][0].date
 						this.yearid = this.multiSelector[1][0][0].id
 						this.distance = parseInt(this.multiSelector[1][0][0].distance) / 1000
+						this.location = {
+							latitude: this.multiSelector[1][0][0].latitude - 0,
+							longitude: this.multiSelector[1][0][0].longitude - 0,
+							name: this.multiSelector[1][0][0].name,
+							address: this.multiSelector[1][0][0].address,
+						}
 						let arr = this.multiSelector[1][0]
-						arr.forEach(item=>{
+						arr.forEach(item => {
 							item.year = nian[0].date
 						})
 						this.$refs.date.rightday = arr
+						console.log(this.multiSelector)
 					}
 				}
 			},
+			goAdrPostion() {
+				uni.openLocation({
+					latitude: Number(this.location.latitude),
+					longitude: Number(this.location.longitude),
+					name: this.location.name,
+					address: this.location.address,
+					success: (res) => {
+						console.log(res)
+					},
+					fail: (err) => {
+						console.log(err)
+					}
+				})
+			},
 			gotoxuanze(e) {
 				if (e.currentTarget.dataset.istrue == 0) {
 					uni.showToast({
@@ -335,6 +372,19 @@
 				}
 			},
 			phonezixun() {
+				let arr = this.is_date_obsolete.split(/[- :]/)
+				let nndate = new Date(arr[0], arr[1] - 1, arr[2], arr[3], arr[4]);
+				nndate = Date.parse(nndate)
+				let currentTime = Date.parse(new Date())
+				if (this.barindex == 3) {
+					if (nndate < currentTime) {
+						uni.showToast({
+							title: "不可预约已过时间",
+							icon: "none"
+						})
+						return false
+					}
+				}
 				uni.navigateTo({
 					url: "info_write?doctor=" + JSON.stringify(this.doctor) + "&type=" + this.barindex + "&time=" + this.daytime +
 						"&hospital=" + this.hospital + "&jigou=" + this.jigouid + "&year=" + this.year + "&yearid=" + this.yearid
@@ -362,7 +412,7 @@
 				// this.yearid = this.multiSelector[1][arr[1]].id
 				// console.log(this.yearid)
 				// this.distance = parseInt(this.multiSelector[1][arr[1]].distance) / 1000
-
+				this.is_date_obsolete = item.year + " " + item.end_time_period
 				this.daytime = item.year + " " + item.start_time_period + "-" + item.end_time_period
 				this.hospital = item.name
 				this.address = item.address
@@ -372,6 +422,7 @@
 				this.yearid = item.id
 				this.distance = parseInt(item.distance) / 1000
 				this.dateshow = false
+				this.location = item
 			}
 		}
 	};

pages/doctor_related/select_doctor.vue

@@ -57,7 +57,7 @@
 											</view>
 											<view class="text-sm" style="flex: 1; text-align: right;">
 												距离：
-												<text style="color: #FF7B72;">{{item.distance!='未知'?parseInt(doctor.distance/1000)+'km':'未知'}}</text>
+												<text style="color: #FF7B72;">{{item.distance!='未知'?parseInt(item.distance/1000)+'km':'未知'}}</text>
 											</view>
 										</view>
 										<view class="doctor_style margin-top-sm">

pages/index/book.vue

@@ -11,9 +11,9 @@
 				<view class="u-border-bottom padding-bottom-sm">
 					<view class="u-body-item u-flex u-col-between u-p-t-0 justify-between">
 						<view class="u-body-item-title u-line-2">{{item.title}}</view>
-						<image :src="imghost+item.banner_url"></image>
+						<u-image :src="imghost+item.banner_url" width="120" height="120" style="margin-left: 12rpx;"></u-image>
 					</view>
-					<!-- <u-tag text="情感咨询" size="mini" shape="circle" mode="dark" type="info" /> -->
+					<u-tag :text="item.type==1?'健康科普':item.type==2?'疫苗科普':'常见问题'" size="mini" shape="circle" mode="dark" type="info" />
 				</view>
 			</view>
 		</u-card>

pages/index/index.vue

@@ -132,7 +132,7 @@
 									</view>
 									<view class="text-sm" style="flex: 1; text-align: right;">
 										距离：
-										<text style="color: #FF7B72;">{{item.distance!='未知'?parseInt(doctor.distance/1000)+'km':'未知'}}</text>
+										<text style="color: #FF7B72;">{{item.distance!='未知'?parseInt(item.distance/1000)+'km':'未知'}}</text>
 									</view>
 								</view>
 								<view class="doctor_style margin-top-sm">

pages/order/payment.vue

@@ -88,12 +88,13 @@
 				</view>
 				<!-- 金额占30% -->
 				<view style="height: 30%;width: auto;border-bottom: 1rpx solid #EFEFEF;margin-left: 20rpx;margin-right: 20rpx;">
-					<text style="font-size: 78rpx;font-weight: 700;display: flex;justify-content: center;align-items: center;height: 100%;">¥{{norderAmount}}</text>
+					<text style="font-size: 78rpx;font-weight: 700;display: flex;justify-content: center;align-items: center;height: 100%;">¥{{value=='钱包余额支付'?norderAmount:'0'}}</text>
 				</view>
 				<!-- 支付方式占20% -->
 				<view style="height: 20%;width: auto;padding-left: 40rpx;">
 					<view style="font-size: 30rpx;display: flex;align-items: center;height: 100%;">
-						<text>余额支付 (余额¥{{info.balance/100}}元)</text>
+						<text v-if="value=='钱包余额支付'">余额支付 (余额¥{{info.balance/100}}元)</text>
+						<text v-else>服务包抵扣</text>
 						<!-- <text v-else>微信支付</text> -->
 					</view>
 				</view>
@@ -119,7 +120,7 @@
 					<text v-if="infodata.product_type == '6' ">服务包</text>
 				</view>
 				<view slot="footer" style="color:#FF4F61 ;font-weight: 500;">
-					{{orderAmount+'元'}}
+					{{infodata.total_amount+'元'}}
 				</view>
 			</uni-list-item>
 			<!-- 线条 -->
@@ -302,9 +303,11 @@
 				if (this.value == '服务包抵扣') {
 					if (this.serviceList.length == 0) {
 						uni.showToast({
-							title: "暂无服务包",
+							title: "暂无服务包可用",
 							icon: "none"
 						})
+						this.value = "钱包余额支付"
+						this.paytype = 2
 						return false
 					} else {
 						this.paytype = 3
@@ -316,6 +319,7 @@
 				}
 			},
 			collectCoupons(item, index) {
+				
 				this.norderAmount = this.infodata.total_amount
 				this.orderAmount = this.infodata.total_amount
 				if (item.type == 1) {

pages/personal/coupon/coupon.vue

@@ -153,6 +153,7 @@
 				}
 			},
 			gotoinfo(item) {
+				console.log(item)
 				uni.navigateTo({
 					url: "coupon_details?data=" + JSON.stringify(item)
 				})

pages/personal/coupon/couponList.vue

@@ -22,9 +22,12 @@
 								</view>
 								<button :data-index="index" @click="collectCoupons(item,index)" v-if="item.is_receive==0" class="couponItem-subject-right-btn">领取</button>
 								<button v-else class="iscouponItem-subject-right-btn">已领取</button>
-								<view class="closing-date">
+								<view class="closing-date" v-if="item.expire_type == 2">
 									{{item.start_time}} - {{item.end_time}}
 								</view>
+								<view class="" v-else>
+									有效期：{{item.effective_days}}天
+								</view>
 							</view>
 						</view>
 					</view>

pages/personal/coupon/coupon_details.vue

@@ -4,8 +4,11 @@
 			<view class="" style="font-size: 28rpx;color: #666;">
 				{{datainfo.title}}
 			</view>
-			<view class="" style="font-size: 56rpx;margin-top: 28rpx;margin-bottom: 10rpx;">
-				￥{{datainfo.max_reduce_amount/100}}
+			<view class="" style="font-size: 56rpx;margin-top: 28rpx;margin-bottom: 10rpx;" v-if="datainfo.type == 1">
+				￥{{datainfo.money/100}}
+			</view>
+			<view class="" style="font-size: 56rpx;margin-top: 28rpx;margin-bottom: 10rpx;" v-else>
+				{{datainfo.discount}}折
 			</view>
 			<view class="">
 				{{datainfo.name}}
@@ -40,8 +43,9 @@
 <script>
 	export default {
 		onLoad(op) {
-			this.datainfo = JSON.parse(op.data)
+			this.datainfo = op.data
 			console.log(this.datainfo)
+			this.datainfo = JSON.parse(this.datainfo)
 		},
 		data() {
 			return {

pages/vaccines/vaccinesList.vue

@@ -144,6 +144,13 @@
 				}
 			},
 			xuanzephone(item) {
+				if (item.stock <= 0) {
+					uni.showToast({
+						title: "该疫苗库存不足",
+						icon: "none"
+					})
+					return false
+				}
 				this.danxuan = item.id
 				let pages = getCurrentPages(); //获取所有页面栈实例列表
 				let nowPage = pages[pages.length - 1]; //当前页页面实例

pages/vaccines/vaccines_info.vue

@@ -27,6 +27,9 @@
 						</view>
 					</view>
 				</scroll-view>
+				<view class="">
+					<rich-text :nodes="doctor.vaccine_notice"></rich-text>
+				</view>
 			</view>
 			<view class="cu-item arrow" @click="vaccinesList">
 				<view class="content">
@@ -84,6 +87,8 @@
 		<u-popup v-model="dateshow" mode="bottom" :safe-area-inset-bottom="true" border-radius="14" length="50%" height="700rpx">
 			<datepicker :date="multiSelector" @callbacktime="callbacktime" ref="date"></datepicker>
 		</u-popup>
+		<view class="cu-tabbar-height"></view>
+		<view class="cu-tabbar-height"></view>
 	</view>
 </template>
 
@@ -94,7 +99,7 @@
 		onLoad() {
 
 		},
-		components:{
+		components: {
 			datepicker
 		},
 		onShow() {
@@ -125,7 +130,8 @@
 				yimiao: "请选择接种疫苗",
 				yimiaoInfo: "",
 				time: "",
-				dateshow:false
+				dateshow: false,
+				is_Scheduling: true
 			}
 		},
 		methods: {
@@ -161,10 +167,7 @@
 					// this.multiSelector.push(res.data.dates)
 					// this.multiSelector.push(res.data.list)
 					if (res.data.data.length == 0) {
-						uni.showToast({
-							title: "尚未排班",
-							icon: "none"
-						})
+						this.is_Scheduling = false
 						return false
 					}
 					// let nian = res.data.data.map(item => {
@@ -189,8 +192,8 @@
 					// console.log(this.multiSelector)
 					let nian = res.data.data.map(item => {
 						return {
-							date:item.schedule_date,
-							id:item.id
+							date: item.schedule_date,
+							id: item.id
 						}
 					})
 					res.data.data.forEach(item => {
@@ -198,7 +201,8 @@
 							if (item.id == itm.schedule_id) {
 								itm.organization.org_id = itm.organization['id']
 								return {
-									schedule_id:itm.schedule_id,
+									yeardate: itm.schedule_date,
+									schedule_id: itm.schedule_id,
 									can_appoint_num: itm.can_appoint_num,
 									...itm.organization,
 									...itm.time_period
@@ -212,13 +216,27 @@
 					// })
 					this.multiSelector.push(nian)
 					// time[0].sort((a,b)=> {return a.end_time_period>b.end_time_period?1:-1})
+					times.forEach(item => {
+						item.sort((a, b) => {
+							return a.end_time_period > b.end_time_period ? 1 : -1
+						})
+						// for (let i = item.length - 1; i >= 0; i--) {
+						// 	let arr = item[i].yeardate + " " + item[i].end_time_period;
+						// 	arr = arr.split(/[- :]/)
+						// 	let nndate = Date.parse(new Date(arr[0], arr[1] - 1, arr[2], arr[3], arr[4]));
+						// 	let currentTime = Date.parse(new Date())
+						// 	// console.log(nndate<currentTime,index)
+						// 	if (nndate < currentTime) {
+						// 		item.splice(i, 1)
+						// 	}
+						// }
+					})
 					this.multiSelector.push(times)
 					let arr = this.multiSelector[1][0]
-					arr.forEach(item=>{
+					arr.forEach(item => {
 						item.year = nian[0].date
 					})
 					this.$refs.date.rightday = arr
-					console.log(this.multiSelector)
 				}
 			},
 			callbacktime(item) {
@@ -254,6 +272,13 @@
 				})
 			},
 			yuyuetime() {
+				if (!this.is_Scheduling) {
+					uni.showToast({
+						title: "尚未排班",
+						icon: "none"
+					})
+					return false
+				}
 				if (this.doctor == '') {
 					uni.showToast({
 						title: "请先选择机构",