|
|
|
@ -138,7 +138,7 @@ |
|
|
|
<image mode="heightFix" class="img" :src="staticImage.selectPet"/> |
|
|
|
<image mode="heightFix" class="img" :src="staticImage.selectPet"/> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="order-item pet-page-item row"> |
|
|
|
<view class="order-item pet-page-item row"> |
|
|
|
<PetPage class="pet-page" :showCancel="true" type="lists" @change="selectPet" @del="delPet"></PetPage> |
|
|
|
<PetPage ref="petPage" class="pet-page" :showCancel="true" type="lists" @change="selectPet" @del="delPet"></PetPage> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -222,7 +222,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class=""> |
|
|
|
<view class="" v-if="!is_worker"> |
|
|
|
<MzButton |
|
|
|
<MzButton |
|
|
|
title="立即下单" |
|
|
|
title="立即下单" |
|
|
|
button-color="#4DC3B8" |
|
|
|
button-color="#4DC3B8" |
|
|
|
@ -232,6 +232,16 @@ |
|
|
|
> |
|
|
|
> |
|
|
|
</MzButton> |
|
|
|
</MzButton> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="" v-else> |
|
|
|
|
|
|
|
<MzButton |
|
|
|
|
|
|
|
title="保存订单" |
|
|
|
|
|
|
|
button-color="#4DC3B8" |
|
|
|
|
|
|
|
font-color="#FFFFFF" |
|
|
|
|
|
|
|
button-width="200rpx" |
|
|
|
|
|
|
|
@click="setCacheOrder" |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
</MzButton> |
|
|
|
|
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<uv-calendar ref="calendar" mode="multiple" title="选择服务日期" color="#4DC3B8" round="40rpx"> |
|
|
|
<uv-calendar ref="calendar" mode="multiple" title="选择服务日期" color="#4DC3B8" round="40rpx"> |
|
|
|
<template #footer> |
|
|
|
<template #footer> |
|
|
|
@ -375,7 +385,7 @@ |
|
|
|
import {cardDetail} from "@/api/card"; |
|
|
|
import {cardDetail} from "@/api/card"; |
|
|
|
import {getAddressList} from "@/api/address"; |
|
|
|
import {getAddressList} from "@/api/address"; |
|
|
|
import image from "@/config/image"; |
|
|
|
import image from "@/config/image"; |
|
|
|
import {createOrderPrice, getOrderPrice, getStoreService} from "@/api/order"; |
|
|
|
import {createOrderPrice, getOrderPrice, getStoreService, orderGet, orderSave} from "@/api/order"; |
|
|
|
import pet from "@/pages/Pet/index.vue"; |
|
|
|
import pet from "@/pages/Pet/index.vue"; |
|
|
|
import {getConfig} from "@/api/other"; |
|
|
|
import {getConfig} from "@/api/other"; |
|
|
|
import log from "@/utils/log"; |
|
|
|
import log from "@/utils/log"; |
|
|
|
@ -477,22 +487,73 @@ |
|
|
|
isPay:false, |
|
|
|
isPay:false, |
|
|
|
type:1, |
|
|
|
type:1, |
|
|
|
add_time:0, |
|
|
|
add_time:0, |
|
|
|
|
|
|
|
is_worker:false, |
|
|
|
|
|
|
|
sign:'', |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
onLoad(options) { |
|
|
|
onLoad(options) { |
|
|
|
this.id = options.id; |
|
|
|
this.id = options.id; |
|
|
|
this.type = options.type || 1; |
|
|
|
this.type = options.type || 1; |
|
|
|
|
|
|
|
this.sign = options.sign || ''; |
|
|
|
|
|
|
|
if(this.sign!=='')this.getCacheOrder(); |
|
|
|
|
|
|
|
let workerToken = uni.getStorageSync('workerToken'); |
|
|
|
|
|
|
|
if(workerToken)this.is_worker = true; |
|
|
|
}, |
|
|
|
}, |
|
|
|
updated() { |
|
|
|
updated() { |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
onShow(){ |
|
|
|
onShow(){ |
|
|
|
if(!this.isPay){ |
|
|
|
if(!this.isPay && this.sign === ''){ |
|
|
|
this.getDefaultAddress(); |
|
|
|
this.getDefaultAddress(); |
|
|
|
this.getUserCoupons(); |
|
|
|
this.getUserCoupons(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onShareAppMessage() { |
|
|
|
|
|
|
|
return { |
|
|
|
|
|
|
|
title:'预约服务', |
|
|
|
|
|
|
|
path:'/pages/OrderPage/index?sign='+this.sign, |
|
|
|
|
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
|
|
|
|
setCacheOrder(){ |
|
|
|
|
|
|
|
let data = {}; |
|
|
|
|
|
|
|
data.type = this.type; |
|
|
|
|
|
|
|
data.address = this.address; |
|
|
|
|
|
|
|
data.timeList = this.timeList; |
|
|
|
|
|
|
|
data.addServiceList = this.addServiceList; |
|
|
|
|
|
|
|
data.addServiceChecked = this.addServiceChecked; |
|
|
|
|
|
|
|
data.petChecked = this.petChecked; |
|
|
|
|
|
|
|
data.coupons = this.coupons; |
|
|
|
|
|
|
|
data.add_time = this.add_time; |
|
|
|
|
|
|
|
data.basicServiceList = this.basicServiceList; |
|
|
|
|
|
|
|
data.basicServiceChecked = this.basicServiceChecked; |
|
|
|
|
|
|
|
orderSave({sign:this.sign,data:JSON.stringify(data)}).then((res) => { |
|
|
|
|
|
|
|
this.sign = res.data.sign; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
log('orderData',data); |
|
|
|
|
|
|
|
api.success('保存成功') |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
getCacheOrder(){ |
|
|
|
|
|
|
|
let data = {}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log('orderData',data); |
|
|
|
|
|
|
|
orderGet({sign:this.sign}).then(res => { |
|
|
|
|
|
|
|
data = JSON.parse(res.data.data); |
|
|
|
|
|
|
|
this.type = data.type; |
|
|
|
|
|
|
|
this.address = data.address; |
|
|
|
|
|
|
|
this.timeList = data.timeList; |
|
|
|
|
|
|
|
this.petChecked = data.petChecked; |
|
|
|
|
|
|
|
this.$refs.petPage.petCheckList = data.petChecked; |
|
|
|
|
|
|
|
this.addServiceList = data.addServiceList; |
|
|
|
|
|
|
|
this.addServiceChecked = data.addServiceChecked; |
|
|
|
|
|
|
|
this.coupons = data.coupons; |
|
|
|
|
|
|
|
this.add_time = data.add_time; |
|
|
|
|
|
|
|
this.basicServiceList = data.basicServiceList; |
|
|
|
|
|
|
|
this.basicServiceChecked = data.basicServiceChecked; |
|
|
|
|
|
|
|
this.sign = ''; |
|
|
|
|
|
|
|
this.checkOrderData(); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
addTimeConfirm(e){ |
|
|
|
addTimeConfirm(e){ |
|
|
|
this.add_time = e.value[0].value; |
|
|
|
this.add_time = e.value[0].value; |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -500,6 +561,9 @@ |
|
|
|
this.addServiceList[e].checked = !this.addServiceList[e].checked; |
|
|
|
this.addServiceList[e].checked = !this.addServiceList[e].checked; |
|
|
|
}, |
|
|
|
}, |
|
|
|
orderPay(){ |
|
|
|
orderPay(){ |
|
|
|
|
|
|
|
if(this.isPay){ |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
uni.showLoading('加载中'); |
|
|
|
uni.showLoading('加载中'); |
|
|
|
if( |
|
|
|
if( |
|
|
|
this.address |
|
|
|
this.address |
|
|
|
@ -517,14 +581,21 @@ |
|
|
|
order_type:this.type, |
|
|
|
order_type:this.type, |
|
|
|
address_id: this.address.id, |
|
|
|
address_id: this.address.id, |
|
|
|
do_date: this.timeList.map(res => [res.date,res.time]), |
|
|
|
do_date: this.timeList.map(res => [res.date,res.time]), |
|
|
|
services: this.addServiceChecked.map(res => res.id).join(','), |
|
|
|
services: this.addServiceChecked.map(res => { |
|
|
|
|
|
|
|
return { |
|
|
|
|
|
|
|
id:res.id, |
|
|
|
|
|
|
|
number:res.number |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}), |
|
|
|
basic_service:this.basicServiceChecked, |
|
|
|
basic_service:this.basicServiceChecked, |
|
|
|
pet_ids: this.petChecked.map(res => res.id).join(','), |
|
|
|
pet_ids: this.petChecked.map(res => res.id).join(','), |
|
|
|
store_id:this.addServiceList[0].store_id, |
|
|
|
store_id:this.addServiceList[0].store_id, |
|
|
|
user_coupon_id: coupons || 0 |
|
|
|
user_coupon_id: coupons || 0 |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
console.log(res) |
|
|
|
console.log(res) |
|
|
|
|
|
|
|
if(this.price.price>0){ |
|
|
|
api.payment(res.data).then(res => { |
|
|
|
api.payment(res.data).then(res => { |
|
|
|
|
|
|
|
this.isPay = false; |
|
|
|
uni.redirectTo({url:'/pages/Order/done?type=order'}); |
|
|
|
uni.redirectTo({url:'/pages/Order/done?type=order'}); |
|
|
|
uni.hideLoading(); |
|
|
|
uni.hideLoading(); |
|
|
|
}).catch(err => { |
|
|
|
}).catch(err => { |
|
|
|
@ -532,6 +603,10 @@ |
|
|
|
api.error('支付失败'); |
|
|
|
api.error('支付失败'); |
|
|
|
uni.hideLoading(); |
|
|
|
uni.hideLoading(); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
uni.redirectTo({url:'/pages/Order/done?type=order'}); |
|
|
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
uni.hideLoading(); |
|
|
|
uni.hideLoading(); |
|
|
|
@ -560,19 +635,28 @@ |
|
|
|
&&this.petChecked.length>0 |
|
|
|
&&this.petChecked.length>0 |
|
|
|
&&this.basicServiceChecked!=='' |
|
|
|
&&this.basicServiceChecked!=='' |
|
|
|
){ |
|
|
|
){ |
|
|
|
console.log(this.basicServiceChecked) |
|
|
|
let coupons = this.coupons.map(item => { |
|
|
|
|
|
|
|
return item.id; |
|
|
|
|
|
|
|
}).join(','); |
|
|
|
getOrderPrice({ |
|
|
|
getOrderPrice({ |
|
|
|
order_type:this.type, |
|
|
|
order_type:this.type, |
|
|
|
address_id: this.address.id, |
|
|
|
address_id: this.address.id, |
|
|
|
do_date: this.timeList.map(res => [res.date,res.time]), |
|
|
|
do_date: this.timeList.map(res => [res.date,res.time]), |
|
|
|
services: this.addServiceChecked.map(res => res.id).join(','), |
|
|
|
services: this.addServiceChecked.map(res => { |
|
|
|
|
|
|
|
return { |
|
|
|
|
|
|
|
id:res.id, |
|
|
|
|
|
|
|
number:res.number |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}), |
|
|
|
basic_service:this.basicServiceChecked, |
|
|
|
basic_service:this.basicServiceChecked, |
|
|
|
pet_ids: this.petChecked.map(res => res.id).join(','), |
|
|
|
pet_ids: this.petChecked.map(res => res.id).join(','), |
|
|
|
store_id:this.addServiceList[0].store_id, |
|
|
|
store_id:this.addServiceList[0].store_id, |
|
|
|
user_coupon_id:this.coupons.id || 0 |
|
|
|
user_coupon_id:coupons || 0 |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
console.log(res) |
|
|
|
console.log('res',res) |
|
|
|
this.price = res.data; |
|
|
|
this.price = res.data; |
|
|
|
|
|
|
|
}).catch(err => { |
|
|
|
|
|
|
|
log('err',err) |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
