|
@@ -112,6 +112,23 @@
|
|
<text style="display: block;font-size: 29;color: #999;">选择您想选择的服务时间</text>
|
|
<text style="display: block;font-size: 29;color: #999;">选择您想选择的服务时间</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ <view class="appoint-server"
|
|
|
|
+ >
|
|
|
|
+ <view class="server-tip" >优先匹配上一单的服务者</view>
|
|
|
|
+
|
|
|
|
+ <!-- <image mode="aspectFit"
|
|
|
|
+ src="https://mall.zhaijieshi.cc/file/wx-huawang/dian2.png" class="radio-img"
|
|
|
|
+ ></image> -->
|
|
|
|
+
|
|
|
|
+ <image mode="aspectFit"
|
|
|
|
+ src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-unselect-popup.png"
|
|
|
|
+ class="radio-img" ></image>
|
|
|
|
+ </view>
|
|
<!-- 预约服务时间 -->
|
|
<!-- 预约服务时间 -->
|
|
<view class="appoint-main-module">
|
|
<view class="appoint-main-module">
|
|
<view class="appoint-block" @tap="showAppoint" style="height: 132rpx;line-height: 132rpx;">
|
|
<view class="appoint-block" @tap="showAppoint" style="height: 132rpx;line-height: 132rpx;">
|
|
@@ -163,12 +180,11 @@
|
|
</view>
|
|
</view>
|
|
|
|
|
|
<view class="appoint-overlay-wrapper" v-if="choosePopup" @tap="onClose"></view>
|
|
<view class="appoint-overlay-wrapper" v-if="choosePopup" @tap="onClose"></view>
|
|
- <view class="popup-wrapper popup-wrapper-special" v-if="choosePopup">
|
|
|
|
- <!-- 标题 -->
|
|
|
|
|
|
+ <timeSelect v-if="choosePopup" :timeParams='timeParams' @timeShow='setTimeshow'/>
|
|
|
|
+ <!-- <view class="popup-wrapper popup-wrapper-special" v-if="choosePopup">
|
|
<view class="popup-title popup-title-special popup-title-new">
|
|
<view class="popup-title popup-title-special popup-title-new">
|
|
<view>选择服务开始时间</view>
|
|
<view>选择服务开始时间</view>
|
|
<view v-if="selectTimeValue >= 17" class="fee-tips">您选的时间段可能会加收夜间服务费,具体以与商家的沟通为准</view>
|
|
<view v-if="selectTimeValue >= 17" class="fee-tips">您选的时间段可能会加收夜间服务费,具体以与商家的沟通为准</view>
|
|
- <!-- 选择服务者上门时段(具体服务时长以实际服务为准) -->
|
|
|
|
</view>
|
|
</view>
|
|
|
|
|
|
<block>
|
|
<block>
|
|
@@ -201,11 +217,11 @@
|
|
<view :class="'time-select-right-item ' + (item.timeMsg ? 'invalid-time' : '')"
|
|
<view :class="'time-select-right-item ' + (item.timeMsg ? 'invalid-time' : '')"
|
|
@tap="timeCheck" :data-stock="item.stock" :data-index="index" :data-msg="item.timeMsg"
|
|
@tap="timeCheck" :data-stock="item.stock" :data-index="index" :data-msg="item.timeMsg"
|
|
v-for="(item, index) in timeList" :key="index">
|
|
v-for="(item, index) in timeList" :key="index">
|
|
- <!-- <view class="{{item.stock<=0?'zero-stock':''}}"> -->
|
|
|
|
|
|
+
|
|
|
|
|
|
<view class="time-line">
|
|
<view class="time-line">
|
|
<text :class="timeIndex === index ? 'current-date' : ''">{{ item.begin }}</text>
|
|
<text :class="timeIndex === index ? 'current-date' : ''">{{ item.begin }}</text>
|
|
- <!-- <text class="stock-text">(库存:{{item.stock}})</text> -->
|
|
|
|
|
|
+
|
|
<text v-if="selectTimeValue >= 17 && timeIndex == index && !item.timeMsg"
|
|
<text v-if="selectTimeValue >= 17 && timeIndex == index && !item.timeMsg"
|
|
class="extra-tips">收夜间服务费</text>
|
|
class="extra-tips">收夜间服务费</text>
|
|
<text v-if="timeIndex === index" class="date-tag">已选</text>
|
|
<text v-if="timeIndex === index" class="date-tag">已选</text>
|
|
@@ -213,19 +229,17 @@
|
|
{{ item.timeMsg }}
|
|
{{ item.timeMsg }}
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
-
|
|
|
|
- <!-- <view wx:if="{{timeIndex===index&&item.value>=17}}" style="font-size: 11px;line-height: 12px;">您选的时间段可能会加收夜间服务费,具体以与商家的沟通为准</view> -->
|
|
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</block>
|
|
</block>
|
|
|
|
|
|
- <!-- 确认按钮 -->
|
|
|
|
|
|
+
|
|
<view class="popup-btn-wrapper">
|
|
<view class="popup-btn-wrapper">
|
|
<view @tap="confirmTime" class="confirm-btn">确定</view>
|
|
<view @tap="confirmTime" class="confirm-btn">确定</view>
|
|
</view>
|
|
</view>
|
|
- </view>
|
|
|
|
|
|
+ </view> -->
|
|
|
|
|
|
<!-- 地址弹框 -->
|
|
<!-- 地址弹框 -->
|
|
<view class="appoint-overlay-wrapper address-overlay" v-if="addressShow" @tap="onAddressClose">
|
|
<view class="appoint-overlay-wrapper address-overlay" v-if="addressShow" @tap="onAddressClose">
|
|
@@ -260,7 +274,7 @@
|
|
<view class="wrapper"
|
|
<view class="wrapper"
|
|
style="width: 652rpx;height: 627rpx;background-color:#fff;position: absolute;top: 400rpx;left: 49rpx;border-radius: 16rpx;">
|
|
style="width: 652rpx;height: 627rpx;background-color:#fff;position: absolute;top: 400rpx;left: 49rpx;border-radius: 16rpx;">
|
|
<view class="title-icon"
|
|
<view class="title-icon"
|
|
- style="padding: 60rpx 260rpx; height: 255rpx; background: #d77958; border-radius: 16rpx 16rpx 0 0; background: url('https://mall.zhaijieshi.cc/file/wx-huawang/bj3.png') no-repeat center center;">
|
|
|
|
|
|
+ style="padding: 60rpx 260rpx; height: 255rpx; background: #d77958; border-radius: 16rpx 16rpx 0 0; background: url('https://mall.zhaijieshi.cc/file/wx-huawang/bj3.png') no-repeat ;background-size: cover;">
|
|
<image src="https://mall.zhaijieshi.cc/file/wx-huawang/cc.png" mode=""
|
|
<image src="https://mall.zhaijieshi.cc/file/wx-huawang/cc.png" mode=""
|
|
style="height:161rpx;width: 161rpx;"></image>
|
|
style="height:161rpx;width: 161rpx;"></image>
|
|
</view>
|
|
</view>
|
|
@@ -286,7 +300,7 @@
|
|
<view class="remark-value">{{ item }}</view>
|
|
<view class="remark-value">{{ item }}</view>
|
|
|
|
|
|
<image mode="aspectFit"
|
|
<image mode="aspectFit"
|
|
- src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-select-popup.png" class="radio-img"
|
|
|
|
|
|
+ src="https://mall.zhaijieshi.cc/file/wx-huawang/dian2.png" class="radio-img"
|
|
v-if="remarkActive == item"></image>
|
|
v-if="remarkActive == item"></image>
|
|
|
|
|
|
<image mode="aspectFit"
|
|
<image mode="aspectFit"
|
|
@@ -305,10 +319,17 @@
|
|
var util = require('../../../utils/util.js');
|
|
var util = require('../../../utils/util.js');
|
|
var api = require('../../../config/api.js');
|
|
var api = require('../../../config/api.js');
|
|
var check = require('../../../utils/check.js');
|
|
var check = require('../../../utils/check.js');
|
|
|
|
+ import timeSelect from '@/components/time-select.vue'
|
|
var app = getApp();
|
|
var app = getApp();
|
|
export default {
|
|
export default {
|
|
|
|
+ components: {
|
|
|
|
+
|
|
|
|
+ timeSelect
|
|
|
|
+ },
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ appointmentTime:{},
|
|
|
|
+ timeParams:{},
|
|
gender: '2',
|
|
gender: '2',
|
|
|
|
|
|
address: {
|
|
address: {
|
|
@@ -463,6 +484,15 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ setTimeshow(params){
|
|
|
|
+ this.setData({
|
|
|
|
+ choosePopup:false,
|
|
|
|
+ appointDate:params.appointDate,
|
|
|
|
+ futureDays:params.futureDays,
|
|
|
|
+ appointmentTime:params.Time
|
|
|
|
+ })
|
|
|
|
+ console.log('params',params);
|
|
|
|
+ },
|
|
getOrderDetail: function() {
|
|
getOrderDetail: function() {
|
|
uni.showLoading({
|
|
uni.showLoading({
|
|
title: '加载中'
|
|
title: '加载中'
|
|
@@ -591,7 +621,11 @@
|
|
productId: this.orderInfo.productId,
|
|
productId: this.orderInfo.productId,
|
|
serviceDuration: this.orderInfo.serviceDuration
|
|
serviceDuration: this.orderInfo.serviceDuration
|
|
};
|
|
};
|
|
- this.getDayTime(params);
|
|
|
|
|
|
+ this.setData({
|
|
|
|
+ timeParams:params
|
|
|
|
+ })
|
|
|
|
+ console.log('123456',this.timeParams);
|
|
|
|
+ // this.getDayTime(params);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
@@ -772,16 +806,17 @@
|
|
return false;
|
|
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;
|
|
|
|
- console.log(date, week, time);
|
|
|
|
|
|
+ // 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;
|
|
|
|
+ // console.log(date, week, time);
|
|
|
|
+ console.log("appointmentTime",this.appointmentTime);
|
|
let params = {
|
|
let params = {
|
|
detail_id: this.serviceId == null || this.serviceId == 'undefined' || this.serviceId == '' ? this
|
|
detail_id: this.serviceId == null || this.serviceId == 'undefined' || this.serviceId == '' ? this
|
|
.orderId : this.serviceId,
|
|
.orderId : this.serviceId,
|
|
- date: date,
|
|
|
|
- startTime: time.split('-')[0],
|
|
|
|
- endTime: time.split('-')[1],
|
|
|
|
|
|
+ date: this.appointmentTime.date,
|
|
|
|
+ startTime: this.appointmentTime.time.split('-')[0],
|
|
|
|
+ endTime: this.appointmentTime.time.split('-')[1],
|
|
addressId: this.addressId == 0 || this.addressId == null ? this.addressIdSave : this.checkedAddress
|
|
addressId: this.addressId == 0 || this.addressId == null ? this.addressIdSave : this.checkedAddress
|
|
.id,
|
|
.id,
|
|
// orderId: this.data.orderId,
|
|
// orderId: this.data.orderId,
|
|
@@ -1579,28 +1614,9 @@
|
|
flex: 1;
|
|
flex: 1;
|
|
}
|
|
}
|
|
|
|
|
|
- .popup-title {
|
|
|
|
- height: 96rpx;
|
|
|
|
- line-height: 96rpx;
|
|
|
|
- text-align: center;
|
|
|
|
- border-bottom: 1rpx solid #ddd;
|
|
|
|
- font-size: 15px !important;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- .popup-content {
|
|
|
|
- display: flex;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- .time-select-left {
|
|
|
|
- /* flex: 2; */
|
|
|
|
- border-right: 1rpx solid #ddd;
|
|
|
|
- padding: 0 8rpx 0 20rpx;
|
|
|
|
- width: 370rpx;
|
|
|
|
- }
|
|
|
|
|
|
|
|
.time-select-right {
|
|
.time-select-right {
|
|
flex: 1;
|
|
flex: 1;
|
|
- /* padding: 0 8rpx; */
|
|
|
|
height: 900rpx;
|
|
height: 900rpx;
|
|
overflow-y: hidden;
|
|
overflow-y: hidden;
|
|
}
|
|
}
|
|
@@ -1615,7 +1631,6 @@
|
|
.date-line-wrapper {
|
|
.date-line-wrapper {
|
|
flex: 1;
|
|
flex: 1;
|
|
display: flex;
|
|
display: flex;
|
|
- /* justify-content: space-between; */
|
|
|
|
align-items: center;
|
|
align-items: center;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1642,7 +1657,6 @@
|
|
border-bottom: 1rpx solid #ddd;
|
|
border-bottom: 1rpx solid #ddd;
|
|
display: flex;
|
|
display: flex;
|
|
align-items: flex-start;
|
|
align-items: flex-start;
|
|
- /*justify-content: space-between; */
|
|
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
padding: 0 24rpx;
|
|
padding: 0 24rpx;
|
|
justify-content: center;
|
|
justify-content: center;
|
|
@@ -1650,7 +1664,6 @@
|
|
|
|
|
|
.time-select-right-item view {
|
|
.time-select-right-item view {
|
|
color: #6d7278;
|
|
color: #6d7278;
|
|
- /* font-weight: bold; */
|
|
|
|
}
|
|
}
|
|
|
|
|
|
view.popup-btn-wrapper {
|
|
view.popup-btn-wrapper {
|
|
@@ -1744,7 +1757,6 @@
|
|
|
|
|
|
.popup-content-special {
|
|
.popup-content-special {
|
|
height: 900rpx;
|
|
height: 900rpx;
|
|
- /* margin-top: 96rpx; */
|
|
|
|
margin-top: 116rpx;
|
|
margin-top: 116rpx;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1773,14 +1785,14 @@
|
|
z-index: 999;
|
|
z-index: 999;
|
|
}
|
|
}
|
|
|
|
|
|
- /* 选择时间 */
|
|
|
|
|
|
+
|
|
view.popup-wrapper {
|
|
view.popup-wrapper {
|
|
- /* padding: 0 0 20rpx; */
|
|
|
|
|
|
+
|
|
color: #333;
|
|
color: #333;
|
|
display: flex;
|
|
display: flex;
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
- /* height: 80%; */
|
|
|
|
|
|
+
|
|
position: fixed;
|
|
position: fixed;
|
|
left: 0;
|
|
left: 0;
|
|
right: 0;
|
|
right: 0;
|
|
@@ -1793,14 +1805,14 @@
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
}
|
|
}
|
|
|
|
|
|
- view.popup-wrapper view.confirm-btn {
|
|
|
|
|
|
+ /* view.popup-wrapper view.confirm-btn {
|
|
background: #d77958;
|
|
background: #d77958;
|
|
height: 88rpx;
|
|
height: 88rpx;
|
|
line-height: 88rpx;
|
|
line-height: 88rpx;
|
|
border-radius: 88rpx;
|
|
border-radius: 88rpx;
|
|
text-align: center;
|
|
text-align: center;
|
|
color: #fff;
|
|
color: #fff;
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
.go-pay-wrapper {
|
|
.go-pay-wrapper {
|
|
padding-bottom: constant(safe-area-inset-bottom);
|
|
padding-bottom: constant(safe-area-inset-bottom);
|
|
@@ -2148,7 +2160,7 @@
|
|
font-size: 24rpx;
|
|
font-size: 24rpx;
|
|
}
|
|
}
|
|
|
|
|
|
- .noon-select {
|
|
|
|
|
|
+ /* .noon-select {
|
|
height: 64rpx;
|
|
height: 64rpx;
|
|
display: flex;
|
|
display: flex;
|
|
border-bottom: 1rpx solid #ddd;
|
|
border-bottom: 1rpx solid #ddd;
|
|
@@ -2165,14 +2177,13 @@
|
|
.time-select-right view.noon-item.active-noon {
|
|
.time-select-right view.noon-item.active-noon {
|
|
color: #fff;
|
|
color: #fff;
|
|
background: #d77958;
|
|
background: #d77958;
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
- view.popup-wrapper .time-select-right-item .date-tag {
|
|
|
|
|
|
+ /* view.popup-wrapper .time-select-right-item .date-tag {
|
|
width: 80rpx;
|
|
width: 80rpx;
|
|
height: 40rpx;
|
|
height: 40rpx;
|
|
line-height: 38rpx;
|
|
line-height: 38rpx;
|
|
margin-left: 0;
|
|
margin-left: 0;
|
|
- /* margin-left:120rpx; */
|
|
|
|
}
|
|
}
|
|
|
|
|
|
.popup-title-new.popup-title {
|
|
.popup-title-new.popup-title {
|
|
@@ -2196,30 +2207,29 @@
|
|
|
|
|
|
.time-select-right-item text {
|
|
.time-select-right-item text {
|
|
color: #888;
|
|
color: #888;
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
- .time-select-right .time-item-wrapper {
|
|
|
|
|
|
+ /* .time-select-right .time-item-wrapper {
|
|
height: 836rpx;
|
|
height: 836rpx;
|
|
overflow-y: scroll;
|
|
overflow-y: scroll;
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
- .time-line {
|
|
|
|
|
|
+ /* .time-line {
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
width: 100%;
|
|
width: 100%;
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
- view.popup-wrapper .time-select-right-item.invalid-time text {
|
|
|
|
|
|
+/* view.popup-wrapper .time-select-right-item.invalid-time text {
|
|
color: #999;
|
|
color: #999;
|
|
}
|
|
}
|
|
|
|
|
|
view.popup-wrapper .time-select-right-item.invalid-time {
|
|
view.popup-wrapper .time-select-right-item.invalid-time {
|
|
- /* background: #E1E1E1; */
|
|
|
|
background: #eee;
|
|
background: #eee;
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
- .time-select-right-item view.time-msg {
|
|
|
|
|
|
+/* .time-select-right-item view.time-msg {
|
|
height: 40rpx;
|
|
height: 40rpx;
|
|
line-height: 38rpx;
|
|
line-height: 38rpx;
|
|
border-radius: 40rpx;
|
|
border-radius: 40rpx;
|
|
@@ -2234,7 +2244,7 @@
|
|
.time-select-right-item text.extra-tips {
|
|
.time-select-right-item text.extra-tips {
|
|
color: #ff5735;
|
|
color: #ff5735;
|
|
font-size: 22rpx;
|
|
font-size: 22rpx;
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
.notice-block {
|
|
.notice-block {
|
|
background: #fff;
|
|
background: #fff;
|
|
@@ -2280,4 +2290,26 @@
|
|
text-align: center;
|
|
text-align: center;
|
|
font-size: 29rpx;
|
|
font-size: 29rpx;
|
|
}
|
|
}
|
|
|
|
+ .appoint-server{
|
|
|
|
+ border-radius: 18rpx;
|
|
|
|
+ background-color: #fff;
|
|
|
|
+ height: 80rpx;
|
|
|
|
+ line-height: 80rpx;
|
|
|
|
+ padding: 0 24rpx;
|
|
|
|
+ color: #999;
|
|
|
|
+ display: flex;
|
|
|
|
+ margin-top: 28rpx;
|
|
|
|
+ justify-content: space-between;
|
|
|
|
+ align-items: center;
|
|
|
|
+ }
|
|
|
|
+ .appoint-server .server-tip{
|
|
|
|
+ color: #999;
|
|
|
|
+ font-size: 26rpx;
|
|
|
|
+ flex: 1;
|
|
|
|
+ text-align: left;
|
|
|
|
+ }
|
|
|
|
+ .appoint-server .radio-img{
|
|
|
|
+ width: 26rpx;
|
|
|
|
+ height: 26rpx;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|