111

pages/checkout/checkout.vue

@@ -2516,188 +2516,6 @@
 		height: 70rpx;
 	}
 
-	/* 选择时间 */
-	/* view.popup-wrapper {
-		color: #333;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		height: 100%;
-		z-index: 999;
-		overflow: hidden;
-	} */
-
-	/* .popup-wrapper view {
-		color: #888;
-		font-size: 30rpx;
-	}
-
-	.popup-title {
-		font-weight: bold;
-		height: 96rpx;
-		line-height: 96rpx;
-		padding-left: 24rpx;
-	}
-
-	.popup-content {
-		display: flex;flex: 1;
-	} */
-	/* 
-	.time-select-left {
-		border-right: 1rpx solid #ddd;
-		padding: 0 8rpx 0 20rpx;
-		width: 370rpx;
-	}
-
-	.time-select-right {
-		flex: 1.6;
-		height: 900rpx;
-		overflow-y: hidden;
-	}
-
-	.popup-content-special .time-select-right {
-		flex: 1;
-	}
-
-	.time-select-left-item {
-		height: 108rpx;
-		display: flex;
-		flex-direction: column;
-		padding: 4rpx 0;
-	}
-
-	.date-line-wrapper {
-		flex: 1;
-		display: flex;
-		align-items: center;
-	} */
-	/* 
-	.time-select-left-item .date-msg {
-		height: 36rpx;
-		line-height: 36rpx;
-		color: #888;
-		font-size: 24rpx;
-	}
-
-	.time-select-left-item .date-msg.avail-date {
-		color: #3fa10d;
-		font-weight: bold;
-	}
-
-	.popup-wrapper .popup-content .current-date {
-		color: #d77958;
-		font-weight: bold;
-	}
-
-	view.popup-wrapper .time-select-right-item {
-		height: 104rpx;
-		border-bottom: 1rpx solid #d1d1d1;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 24rpx;
-	}
-
-	.time-select-right-item view {
-		color: #6d7278;
-	}
-
-	view.popup-btn-wrapper {
-		margin: 20rpx 0 0;
-		padding: 0 24rpx 20rpx;
-	}
-
-	view.popup-btn-wrapper button>view {
-		color: #fff;
-	} */
-
-	/* 	view.popup-wrapper .date-tag {
-		color: #d77958;
-		height: 44rpx;
-		line-height: 42rpx;
-		width: 76rpx;
-		border: 2rpx solid #d77958;
-		border-radius: 44rpx;
-		text-align: center;
-		font-weight: normal;
-		font-size: 22rpx;
-		display: inline-block;
-		margin-left: 8rpx;
-	}
-
-	view.popup-wrapper .time-select-right-item.invalid-time text {
-		color: #999;
-	}
-
-	view.popup-wrapper .time-select-right-item.invalid-time {
-		background: #eee;
-	}
-
-	.time-select-right-item view.time-msg {
-		height: 40rpx;
-		line-height: 38rpx;
-		border-radius: 40rpx;
-		padding: 0 8rpx;
-		font-size: 22rpx;
-		border: 2rpx solid #999;
-		color: #999;
-		font-weight: normal;
-		white-space: nowrap;
-	} */
-
-	/* view.popup-wrapper .full-time {
-		color: #d77958;
-		font-size: 24rpx;
-		margin: 0 0 0 20rpx;
-		height: 44rpx;
-		line-height: 44rpx;
-		float: right;
-		padding-right: 40rpx;
-	}
-
-	.first-appoint-date-item {
-		height: 108rpx;
-		display: flex;
-		align-items: center;
-		padding: 0 0 0 240rpx;
-	}
-
-	.first-time-selected {
-		margin: 0 0 0 60rpx;
-	}
-
-	.select-week-times {
-		border-top: 1rpx solid #ddd;
-	}
-
-	.week-select-left {
-		flex: 1.2;
-	}
-
-	.week-select-left>view.time-select-left-item {
-		padding: 0 0 0 60rpx;
-		display: flex;
-		align-items: flex-start;
-		justify-content: flex-start;
-		flex-direction: row;
-		padding: 10rpx 0 0 60rpx;
-	}
-
-	.week-select-left>view.time-select-left-item .week-str {
-		padding: 12rpx 0 0 0;
-	}
-
-	view.popup-wrapper view.select-num-tag {
-		width: 32rpx;
-		height: 32rpx;
-		line-height: 32rpx;
-		background: #d77958;
-		border-radius: 34rpx;
-		font-size: 20rpx;
-		color: #fff;
-		text-align: center;
-		margin: 0 0 0 6rpx;
-	} */
 
 	/* 支付失败弹框 */
 	.overlay-wrapper {
@@ -2834,24 +2652,6 @@
 		font-size: 24rpx;
 	}
 
-
-	/* .popup-title-special {
-		position: absolute;
-		left: 0rpx;
-		background: #fff;
-	}
-
-	.popup-content-special {
-		position: relative;
-		height: 900rpx;
-		margin-top: 116rpx;
-	}
-
-	.popup-content-special .time-select-left {
-		height: 900rpx;
-		overflow-y: scroll;
-	} */
-
 	.stock-text {
 		font-size: 20rpx;
 		font-weight: normal;
@@ -2915,40 +2715,6 @@
 		font-weight: bold;
 	}
 
-	/* 	.noon-select {
-		height: 64rpx;
-		display: flex;
-		border-bottom: 1rpx solid #ddd;
-	} */
-
-	/* 	.time-select-right .noon-item {
-		flex: 1;
-		text-align: center;
-		line-height: 64rpx;
-		color: #979797;
-		font-size: 26rpx;
-	}
-
-	.time-select-right view.noon-item.active-noon {
-		color: #fff;
-		background: #d77958;
-	}
-
-	view.popup-wrapper .time-select-right-item .date-tag {
-		width: 80rpx;
-		height: 40rpx;
-		line-height: 38rpx;
-		margin-left: 0;
-	} */
-
-	/* 	.popup-title-new.popup-title {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		height: 116rpx;
-		line-height: normal;
-	} */
 
 	.popup-title-new view {
 		color: #333;
@@ -3105,17 +2871,12 @@
 	}
 
 	.time-select-left {
-		/* flex: 2; */
-		/* border-right: 1rpx solid #ddd; */
 		padding: 0 8rpx 0 20rpx;
 		width: 370rpx;
 	}
 
 	.time-select-right {
 		flex: 1;
-		/* padding: 0 8rpx; */
-		/* height: 900rpx; */
-		/* overflow-y: hidden; */
 		display: flex;
 		justify-content: space-between;
 	}
@@ -3304,7 +3065,11 @@
 		display: flex;
 		align-items: center;
 		padding: 0 0 0 240rpx;
+		font-family: AlibabaPuHuiTi_2_85_Bold;
 	}
+		.first-appoint-date-item view{
+			font-family: AlibabaPuHuiTi_2_85_Bold;
+		}
 
 	.first-time-selected {
 		margin: 0 0 0 60rpx;

pages/ucenter/appointOrder/appointOrder.vue

@@ -661,91 +661,9 @@
 				});
 			},
 
-			getDayTime(params) {
-				uni.showLoading({
-					title: '加载中'
-				});
-				util.request(api.everyDayTime, params, 'GET')
-					.then((res) => {
-						uni.hideLoading();
-						if (res.errno == 0) {
-							this.setData({
-								dateList: res.data,
-								dateIndex: 0,
-								timeIndex: -1,
-								noonType: 1
-							});
-							let period = res.data[0].period;
-							let list = period.filter((item) => {
-								return item.ofTime == '上午';
-							});
-							this.setData({
-								timeList: list
-							});
-						} else {
-							uni.showToast({
-								title: res.errmsg,
-								icon: 'none',
-								duration: 2000
-							});
-							this.setData({
-								timeList: [],
-								timeIndex: ''
-							});
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						uni.hideLoading();
-						uni.showToast({
-							title: err.errMsg,
-							icon: 'none'
-						});
-						this.setData({
-							timeList: [],
-							timeIndex: ''
-						});
-					});
-			},
-
-			dateCheck(e) {
-				let index = e.currentTarget.dataset.index;
-				let date = e.currentTarget.dataset.date;
-				let week = e.currentTarget.dataset.week;
-				let isbook = e.currentTarget.dataset.isbook;
-				this.setData({
-					dateIndex: index
-				});
-				let period = this.dateList[this.dateIndex].period;
-				let current = this.noonType == 1 ? '上午' : '下午';
-				let list = period.filter((item) => {
-					return item.ofTime == current;
-				});
-				this.setData({
-					timeList: list
-				});
-				let isNoTime = list.every((item) => {
-					return item.timeMsg && item.timeMsg != null;
-				});
-				if (isNoTime) {
-					this.setData({
-						timeIndex: -1,
-						selectTimeValue: ''
-					});
-				}
-			},
+		
 
-			timeCheck(e) {
-				let index = e.currentTarget.dataset.index;
-				let msg = e.currentTarget.dataset.msg;
-				if (msg == null || msg == '') {
-					let time = this.timeList[index].begin.split(':')[0];
-					this.setData({
-						timeIndex: index,
-						selectTimeValue: Number(time)
-					});
-				}
-			},
+			
 
 			submitBook() {
 				//提交预约
@@ -809,20 +727,7 @@
 				});
 			},
 
-			confirmTime() {
-				if (this.timeIndex === '' || this.timeIndex < 0) {
-					util.showErrorToast('请选择服务时间');
-					return false;
-				}
-				let date = this.dateList[this.dateIndex].bookdate;
-				let week = this.dateList[this.dateIndex].weekOfDay;
-				let time = this.timeList[this.timeIndex].begin + '-' + this.timeList[this.timeIndex].end;
-				this.setData({
-					choosePopup: false,
-					appointDate: date + ' ' + week + ' ' + time
-				});
-			},
-
+		
 			selectAddress() {
 				//已经输入过地址的订单 不允许再次选择地址
 				if (this.order.addressId > 0) {