|
|
@@ -19,14 +19,14 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="display-flex mt15 mb10" v-if="orderTimeFalg&&courseInfo.status!=9">
|
|
|
+ <view class="display-flex mt15 mb10" v-if="orderTimeFalg&&status!=9">
|
|
|
<view class="tubiao mr10">
|
|
|
</view>
|
|
|
<view class="title">
|
|
|
到店时间
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="list-item mt10" v-if="orderTimeFalg&&courseInfo.status!=9">
|
|
|
+ <view class="list-item mt10" v-if="orderTimeFalg&&status!=9">
|
|
|
<view class="display-flex-between" style="width: 100%">
|
|
|
<view class="display-flex-common">
|
|
|
<view v-for="(date, index) in futureDates" :key="index" @click="SetWeekSelect(date)" :class="[date.datetime==order_date?'list-item-week-Selected' :'list-item-week' ,'mr10','flex-center-column']" >
|
|
|
@@ -64,20 +64,20 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="list-item">
|
|
|
- <view class="display-flex-between" v-if="!orderTimeFalg||courseInfo.status==9" >
|
|
|
+ <view class="display-flex-between" v-if="!orderTimeFalg||status==9" >
|
|
|
<text class="left-title">预约时间</text>
|
|
|
<view class="h-view">
|
|
|
{{form.order_date+" "+form.order_time}}
|
|
|
</view>
|
|
|
</view>
|
|
|
- <u-divider v-if="!orderTimeFalg||courseInfo.status==9"></u-divider>
|
|
|
- <view class="display-flex-between" v-if="!orderTimeFalg||courseInfo.status==9" >
|
|
|
+ <u-divider v-if="!orderTimeFalg||status==9"></u-divider>
|
|
|
+ <view class="display-flex-between" v-if="!orderTimeFalg||status==9" >
|
|
|
<text class="left-title">预约状态</text>
|
|
|
<view class="h-view">
|
|
|
{{statusDisplay}}
|
|
|
</view>
|
|
|
</view>
|
|
|
- <u-divider v-if="!orderTimeFalg||courseInfo.status==9"></u-divider>
|
|
|
+ <u-divider v-if="!orderTimeFalg||status==9"></u-divider>
|
|
|
<view class="display-flex-between" >
|
|
|
<text class="left-title">预约人</text>
|
|
|
<view class="h-view">
|
|
|
@@ -147,10 +147,11 @@
|
|
|
</view>
|
|
|
<u-calendar :formatter="formatter" :defaultDate="order_date" :show="show" :show-title="false" mode="single" @confirm="confirm" monthNum="4" color="#E2B98E" @close="close"></u-calendar>
|
|
|
</view>
|
|
|
- <view class="bottom-navigation" v-if="orderTimeFalg&&courseInfo.status!=9">
|
|
|
+ <view class="bottom-navigation" v-if="orderTimeFalg&&status!=9">
|
|
|
<button v-if="type=='add'" class="activity-button" @click="onsubmit()">立即报名</button>
|
|
|
<view v-if="type=='set'" class="activity-button" :style="{background:'#F9F2E6',color:'#C29556',border: '1rpx solid #F9F2E6' ,width: '336rpx',margin:'0rpx 9rpx'}" @click="yvyueOrderCancel()">取消预约订单</view>
|
|
|
- <view v-if="type=='set'" class="activity-button" :style="{width: '336rpx' ,margin:'0rpx 9rpx'}" @click="setyvyueOrder()">修改预约信息</view>
|
|
|
+ <view v-if="type=='set'&&!(status==2||status==1)" class="activity-button" :style="{width: '336rpx' ,margin:'0rpx 9rpx'}" @click="setyvyueOrder()">修改预约信息</view>
|
|
|
+ <view v-if="type=='set'&&(status==2||status==1)" class="activity-button" :style="{width: '336rpx' ,margin:'0rpx 9rpx'}" @click="setyvyueOrder()">立即支付</view>
|
|
|
</view>
|
|
|
<!-- picker 内容 -->
|
|
|
<u-picker
|
|
|
@@ -224,36 +225,7 @@ export default {
|
|
|
this.getWorkers()
|
|
|
if (this.setid ){
|
|
|
this.orderId=this.setid
|
|
|
- getYvyueOrderInfo({id: this.orderId}). then(({data}) => {
|
|
|
- this.orderInfo = data
|
|
|
- this.order_no=data.order_no
|
|
|
- // 获取今天的日期
|
|
|
- const today = new Date(); // 当前日期时间
|
|
|
- today.setHours(0, 0, 0, 0); // 清除时间部分，只保留日期
|
|
|
- if (data.order_date >= today.toISOString().split('T')[0]) {
|
|
|
- this.orderTimeFalg = true;
|
|
|
- this.getFutureDates(data.order_date)
|
|
|
- this.getitemTimes()
|
|
|
- this.getYvyueOrderList()
|
|
|
- } else {
|
|
|
- this.orderTimeFalg = false;
|
|
|
- }
|
|
|
- this.status = data.status
|
|
|
- this.order_date=data.order_date
|
|
|
- this.dateTimeSelect = data.order_date+" "+data.order_time
|
|
|
- this.form.order_time = data.order_time
|
|
|
- this.form.order_date = data.order_date
|
|
|
- this.form.user_name = data.user_name
|
|
|
- this.workerName= data.tech_name
|
|
|
- this.form.user_phone = data.user_phone
|
|
|
- this.form.order_num = data.order_num
|
|
|
- this.form.order_remark = data.order_remark
|
|
|
- this.form.customer_id = data.customer_id
|
|
|
- this.form.id = data.id
|
|
|
- this.form.tech_uid = data.tech_uid
|
|
|
- this.setid=null
|
|
|
-
|
|
|
- });
|
|
|
+ this.getYvyueOrderInfo();
|
|
|
}else{
|
|
|
this.orderTimeFalg = true;
|
|
|
this.getFutureDates()
|
|
|
@@ -424,6 +396,11 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
CreateItem(this.form).then(({data})=>{
|
|
|
+ this.orderId=data.id
|
|
|
+ getYvyueOrderInfo({id: this.orderId}).then(({data}) => {
|
|
|
+ this.type="set"
|
|
|
+ this.status = data.status
|
|
|
+ });
|
|
|
toWechatPayPaymentSave(data.order_no, data.order_remark)
|
|
|
})
|
|
|
},
|
|
|
@@ -447,7 +424,7 @@ export default {
|
|
|
}
|
|
|
if (yvyueOrderList[item.date]&&yvyueOrderList[item.date][item.period_start]){
|
|
|
this.type="set"
|
|
|
- this.getYvyueOrderInfo(yvyueOrderList[item.date][item.period_start])
|
|
|
+ this.setYvyueOrderInfo(yvyueOrderList[item.date][item.period_start])
|
|
|
}else {
|
|
|
if (this.type=="set"){
|
|
|
this.form={order_num:1};
|
|
|
@@ -457,9 +434,10 @@ export default {
|
|
|
this.type="add"
|
|
|
}
|
|
|
},
|
|
|
- getYvyueOrderInfo(item) {
|
|
|
+ setYvyueOrderInfo(item) {
|
|
|
this.order_no=item.order_no
|
|
|
this.orderId=item.id
|
|
|
+ this.status=item.status
|
|
|
this.form.order_time = item.order_time
|
|
|
this.form.user_name = item.user_name
|
|
|
this.form.user_phone = item.user_phone
|
|
|
@@ -469,7 +447,6 @@ export default {
|
|
|
this.form.id = item.id
|
|
|
this.form.tech_uid = item.tech_uid
|
|
|
this.workerName= item.tech_name
|
|
|
-
|
|
|
},
|
|
|
getitemTimes(){
|
|
|
this.yvyueData=[]
|
|
|
@@ -532,7 +509,37 @@ export default {
|
|
|
console.log(data,"good=============")
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+ getYvyueOrderInfo() {
|
|
|
+ getYvyueOrderInfo({id: this.orderId}).then(({data}) => {
|
|
|
+ this.orderInfo = data
|
|
|
+ this.order_no = data.order_no
|
|
|
+ // 获取今天的日期
|
|
|
+ const today = new Date(); // 当前日期时间
|
|
|
+ today.setHours(0, 0, 0, 0); // 清除时间部分，只保留日期
|
|
|
+ if (data.order_date >= today.toISOString().split('T')[0]) {
|
|
|
+ this.orderTimeFalg = true;
|
|
|
+ this.getFutureDates(data.order_date)
|
|
|
+ this.getitemTimes()
|
|
|
+ this.getYvyueOrderList()
|
|
|
+ } else {
|
|
|
+ this.orderTimeFalg = false;
|
|
|
+ }
|
|
|
+ this.status = data.status
|
|
|
+ this.order_date = data.order_date
|
|
|
+ this.dateTimeSelect = data.order_date + " " + data.order_time
|
|
|
+ this.form.order_time = data.order_time
|
|
|
+ this.form.order_date = data.order_date
|
|
|
+ this.form.user_name = data.user_name
|
|
|
+ this.workerName = data.tech_name
|
|
|
+ this.form.user_phone = data.user_phone
|
|
|
+ this.form.order_num = data.order_num
|
|
|
+ this.form.order_remark = data.order_remark
|
|
|
+ this.form.customer_id = data.customer_id
|
|
|
+ this.form.id = data.id
|
|
|
+ this.form.tech_uid = data.tech_uid
|
|
|
+ this.setid = null
|
|
|
+ });
|
|
|
+ },
|
|
|
|
|
|
// 获取未来五天的日期
|
|
|
getFutureDates(startDateStr = null) {
|
suixueyan