diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 76282f3..8e93891 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -89,7 +89,7 @@
-
+
@@ -117,19 +117,6 @@
},
}
},
- onLoad() {
- uni.$on('changeHotelDate', data => {
- if(data) {
- this.judgeHotelTime(data)
- console.log(data)
- } else {
- this.$refs.calendarPopup.close();
- }
- })
- },
- onUnload() {
- uni.$off('changeHotelDate')
- },
onShow() {
this.getList()
},
@@ -146,20 +133,32 @@
// })
let shopSelectIds = []
- let skuSelectIds = []
+ let skuSelectIds = [] // skus 酒店要赋值时间
+ let skus = [] // skus skus 酒店要赋值时间
this.cartList.forEach(v=>{
if (v.is_seld) {shopSelectIds.push(v.id)}
v.goods.forEach(x=>{
if(x.is_seld) {skuSelectIds.push(x.sku_id)}
+ if (x.product.type == 'hotel') {
+ skus.push(x)
+ }
})
})
resData.forEach(v=>{
v.is_seld = shopSelectIds.includes(v.id)
- // v.show = true
+
v.goods.forEach(x=>{
x.is_seld = skuSelectIds.includes(x.sku_id)
- // v.show = true
+ if (x.product.type == 'hotel') {
+ let xData = skus.find(s=>s.sku_id == x.sku_id)
+ if (xData) {
+ x.startDay = xData.startDay
+ x.endDay = xData.endDay
+ x.differDays = xData.differDays
+ }
+
+ }
})
})
this.cartList = resData
@@ -319,26 +318,31 @@
},
judgeHotelTime (data) {
- this.$set(this.selectHotel, "startDay", data.startDay)
- this.$set(this.selectHotel, "endDay", data.endDay)
- this.$set(this.selectHotel, "differDays", data.differDays)
- this.$refs.calendarPopup.close();
- return
+ if(!data) {
+ this.$refs.calendarPopup.close();
+ return
+ }
+ // this.$set(this.selectHotel, "startDay", data.startDay)
+ // this.$set(this.selectHotel, "endDay", data.endDay)
+ // this.$set(this.selectHotel, "differDays", data.differDays)
+ // this.$refs.calendarPopup.close();
+ // return
this.Post({
sku_id: this.selectHotel.sku_id,
start_date: data.startDay,
end_date: data.endDay
}, "/api/product/product_date_buy").then(res=>{
- if (res && res.code && res.data) {
- this.$set(this.selectHotel, "startDay", data.startDay)
- this.$set(this.selectHotel, "endDay", data.endDay)
- this.$set(this.selectHotel, "differDays", data.differDays)
- this.$refs.calendarPopup.close();
- } else {
+ if (res.data === false) {
uni.showToast({
title:'当前时间不可预定',
icon:"none"
})
+ } else {
+ this.$set(this.selectHotel, "startDay", data.startDay)
+ this.$set(this.selectHotel, "endDay", data.endDay)
+ this.$set(this.selectHotel, "differDays", data.differDays)
+ this.selectHotel.sku.price = res.data
+ this.$refs.calendarPopup.close();
}
})
},
diff --git a/subPackages/order/cartOrder.vue b/subPackages/order/cartOrder.vue
index cc6ba58..9683ce9 100644
--- a/subPackages/order/cartOrder.vue
+++ b/subPackages/order/cartOrder.vue
@@ -2,6 +2,31 @@
酒店
+
+
+
+
+ {{item.sku_name}}
+
+
+
+ {{new Date(item.selectDate.startDay).Format("MM-dd") }}至{{new Date(item.selectDate.startDay).Format("MM-dd")}}
+ |
+ {{item.sku_name}}
+
+
+
+
+
+ 入住人:
+ {{item.roomNames.join(" ")}}
+
+
+ 联系电话:
+ {{item.phone}}
+
+
+
小计: {{priceParam.hotelPrice/100}}
@@ -185,23 +210,24 @@ export default {
methods: {
handleOrderGoods () {
// 特产处理
- // let techanOrderList = this.$store.state.user.techanOrderList;
- let techanOrderList = JSON.parse(uni.getStorageSync("techanOrderList"))
+ let techanOrderList = this.$store.state.user.techanOrderList;
+ // let techanOrderList = JSON.parse(uni.getStorageSync("techanOrderList"))
// console.log(techanOrderList)
// 邮寄
this.postOrderList = techanOrderList.filter(v=>v.is_user_post == 1)
// 自提
this.pickupOrderList = techanOrderList.filter(v=>v.is_user_post == 2)
// 游玩处理 采摘 农家烟火
- // let ticketOrderList = this.$store.state.user.ticketOrderList;
- // let foodOrderList = this.$store.state.user.foodOrderList;
- let ticketOrderList = (uni.getStorageSync("ticketOrderList")) || []
- let foodOrderList = (uni.getStorageSync("foodOrderList")) || []
+ let ticketOrderList = this.$store.state.user.ticketOrderList;
+ let foodOrderList = this.$store.state.user.foodOrderList;
+ // let ticketOrderList = (uni.getStorageSync("ticketOrderList")) || []
+ // let foodOrderList = (uni.getStorageSync("foodOrderList")) || []
console.log(ticketOrderList, foodOrderList)
this.playOrderList = ticketOrderList.concat(foodOrderList)
// 酒店
// let hotelOrderList = this.$store.state.user.hotelOrderList;
-
+ let hotelOrderList = JSON.parse(uni.getStorageSync("hotelOrderList"))
+ this.hotelOrderList = hotelOrderList
this.calPrice()
},
@@ -221,7 +247,8 @@ export default {
skuIds.push(v.sInfo.id)
})
this.hotelOrderList.forEach(v=>{
- // price4+= v.sInfo.price * v.sInfo.buyNum
+ price4+= v.price * v.buyNum
+ skuIds.push(v.id)
})
this.skuIds = skuIds
@@ -266,16 +293,33 @@ export default {
// 下单
order() {
let goods = []
- // 邮寄
- this.postOrderList.forEach(item=>{
+ // 酒店
+ this.playOrderList.forEach(item=>{
+ let param = {
+ // type: item.pInfo.type,
+ // product_id: item.pInfo.id,
+ // sku_id: item.sInfo.id,
+ // product_num: item.sInfo.buyNum,
+ // phone: item.phone,
+ // remark: item.remark,
+ }
+ goods.push(param)
+ })
+
+ // 游玩
+ this.playOrderList.forEach(item=>{
let param = {
type: item.pInfo.type,
product_id: item.pInfo.id,
sku_id: item.sInfo.id,
product_num: item.sInfo.buyNum,
+ phone: item.phone,
remark: item.remark,
- use_type:1,
- post: item.contacts.id
+ }
+ if (item.showDate) {
+ param.use_date= item.showDate.date ||'';
+ param.start_time = item.showDate.start_time || '';
+ param.end_time = item.showDate.end_time || '';
}
goods.push(param)
})
@@ -293,23 +337,21 @@ export default {
}
goods.push(param)
})
- // 游玩
- this.playOrderList.forEach(item=>{
+ // 邮寄
+ this.postOrderList.forEach(item=>{
let param = {
type: item.pInfo.type,
product_id: item.pInfo.id,
sku_id: item.sInfo.id,
product_num: item.sInfo.buyNum,
- phone: item.phone,
remark: item.remark,
- }
- if (item.showDate) {
- param.use_date= item.showDate.date ||'';
- param.start_time = item.showDate.start_time || '';
- param.end_time = item.showDate.end_time || '';
+ use_type:1,
+ post: item.contacts.id
}
goods.push(param)
})
+
+
let data = {
product_list: goods,