diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue
index ffcaa96..344e82d 100644
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@@ -206,7 +206,7 @@
¥{{ total_hotel_orginalprice*buy_num || goods_detail.spec[type_index].original_price*buy_num }}
- 酒店住房日期:{{live_date}}~{{leave_date}}
+ 酒店住房日期:{{live_date}}~{{leave_date}} 共{{totalLive}}晚
套餐类型
@@ -544,28 +544,37 @@
}
},
changeRange(e) {
- this.total_hotel_price = 0;
- this.total_hotel_orginalprice = 0;
- this.live_date = e.startDate;
- this.leave_date = e.endDate;
-
- let differrentList = this.goods_detail.spec[this.type_index].list;
- differrentList.forEach((item, index) => {
- if (item.date == this.live_date) {
- this.live_index = index;
- } else if (item.date == this.leave_date) {
- this.leave_index = index;
- }
- })
- let total_date = differrentList.slice(this.live_index, this.leave_index);
- this.hotel_specid = [];
- total_date.reduce((list, item) => {
- this.total_hotel_price += parseFloat(item.price);
- this.total_hotel_orginalprice += parseFloat(item.original_price);
- this.hotel_specid.push(item.id);
- console.log('当前价格',this.total_hotel_price);
- console.log('当前11',item.price);
- }, []);
+ if(e.startDate == e.endDate) {
+ this.$msg('不能选择同一天!');
+ return
+ }else {
+ this.total_hotel_price = 0;
+ this.total_hotel_orginalprice = 0;
+ this.live_date = e.startDate;
+ this.leave_date = e.endDate;
+ let live_date = new Date(new Date(this.live_date).toLocaleDateString()).getTime();
+ let leave_date = new Date(new Date(this.leave_date).toLocaleDateString()).getTime();
+ this.totalLive = parseInt(Math.abs(leave_date - live_date) / 1000 / 60 / 60 / 24);
+
+
+ let differrentList = this.goods_detail.spec[this.type_index].list;
+ differrentList.forEach((item, index) => {
+ if (item.date == this.live_date) {
+ this.live_index = index;
+ } else if (item.date == this.leave_date) {
+ this.leave_index = index;
+ }
+ })
+ let total_date = differrentList.slice(this.live_index, this.leave_index);
+ this.hotel_specid = [];
+ total_date.reduce((list, item) => {
+ this.total_hotel_price += parseFloat(item.price);
+ this.total_hotel_orginalprice += parseFloat(item.original_price);
+ this.hotel_specid.push(item.id);
+ console.log('当前价格',this.total_hotel_price);
+ console.log('当前11',item.price);
+ }, []);
+ }
},
change(e) {
console.log(e);
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 1dc3e6d..19730d6 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -113,7 +113,7 @@
酒店住房日期
- {{check_in_time}}~{{check_out_time}}
+ {{check_in_time}}~{{check_out_time}} 共{{totalLive}}晚
到店时间
diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue
index 1ef933e..3de5a33 100644
--- a/pages/order/order_details.vue
+++ b/pages/order/order_details.vue
@@ -27,18 +27,18 @@
-
+
订单编号
{{orderDetails.order_no}}
复制
-
+
下单时间
{{ orderDetails.created_at }}
-
+
付款时间
暂未付款
{{ orderDetails.paid_at }}
@@ -47,23 +47,22 @@
支付方式
{{orderDetails.pay_type_text}}
-
+
{{index}}
- {{item}}
-
-
-
-
-
-
-
-
-
-
-
+ {{item}}
+ {{item.value}}
+ {{item.value}}
+ {{item.value}}
+
+
+
+
+
@@ -163,6 +162,17 @@
}
},
methods: {
+ // 预览图片
+ showImg(url,index) {
+ this.$u.throttle(() => {
+ let goods_banner = url || [];
+ let banners = goods_banner.map(item => item);
+ uni.previewImage({
+ urls: banners,
+ current: index
+ })
+ }, 200);
+ },
refreshCode() {
this.getOrderDetails()
this.$msg('刷新成功')
@@ -225,6 +235,13 @@