diff --git a/subPackages/homestay/detail.vue b/subPackages/homestay/detail.vue
index 00364fe..fdcda2c 100644
--- a/subPackages/homestay/detail.vue
+++ b/subPackages/homestay/detail.vue
@@ -183,6 +183,14 @@
+
+
+
+
+
+
+
@@ -214,13 +222,14 @@
calendarParam: {
stratDate:'',endDate: '', selected: []
},
-
+ cartNum: 0,
}
},
onLoad(options) {
this.id = options.id;
this.getInfo();
this.getGoodsList()
+ this.getCartList()
uni.$on('changeHotelDate', data => {
if(data) {
this.selectDate = data
@@ -233,6 +242,12 @@
uni.$off('changeHotelDate')
},
methods: {
+ // 获取购物车数量
+ getCartList () {
+ this.Post({},'/api/cart/get_cart_count').then(res=>{
+ this.cartNum = res.data || 0
+ })
+ },
swiperChange (e) {
this.swiperCurrent = e.detail.current+1
},
@@ -333,6 +348,7 @@
this.Post({sku_id: item.id,num: 1 },'/api/cart/add_sku').then(res => {
if (res.code == 1) {
uni.showToast({title: res.msg,icon: 'none'});
+ this.getCartList()
}
});
},
@@ -770,4 +786,23 @@
}
}
+ .add-cart-icon{
+ width: 80rpx;
+ height: 80rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(0,0,0,0.2);
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: fixed;
+ bottom: 140rpx;
+ right: 20rpx;
+ z-index: 10;
+ image{
+ width: 43.33rpx;
+ height: 42rpx;
+ }
+ }
+
\ No newline at end of file
diff --git a/subPackages/homestay/index.vue b/subPackages/homestay/index.vue
index 6870f80..abd2679 100644
--- a/subPackages/homestay/index.vue
+++ b/subPackages/homestay/index.vue
@@ -6,8 +6,8 @@
{{item.title}}
-
- {{tagItem}}
+
+ {{tagItem}}
{{item.province_name}}{{item.city_name}}{{item.area_name}}{{item.address}}
{{item.price / 100}}
diff --git a/subPackages/homestay/order.vue b/subPackages/homestay/order.vue
index 0e0e66b..6fcaa48 100644
--- a/subPackages/homestay/order.vue
+++ b/subPackages/homestay/order.vue
@@ -372,9 +372,9 @@ export default {
end_date: sku.selectDate.endDay,
}, '/api/product/product_date_price').then(res => {
let seldDate = res.data || [];
- if (seldDate.length > 1) {
- seldDate.pop();
- }
+ // if (seldDate.length > 1) {
+ // seldDate.pop();
+ // }
sku.allSeldDate = seldDate;
this.total()
diff --git a/subPackages/line/order.vue b/subPackages/line/order.vue
index 33eb19e..9b556a1 100644
--- a/subPackages/line/order.vue
+++ b/subPackages/line/order.vue
@@ -157,6 +157,7 @@
}, '/api/product/get_product_sku_price_by_date').then(res => {
const prices = this.processPriceData(res.data);
this.prices = prices;
+ console.log('prices',this.prices)
const {
selectDate,
selectMonth
@@ -219,7 +220,7 @@
}
const info = this.getPriceInfo(selectMonth, day);
console.log(info)
- if (info && info.stock !== 0) {
+ if (info && info.product_price !== null) {
info.selectMonth = selectMonth;
info.selectDate = day;
this.selectDate = info;
@@ -321,11 +322,16 @@
let selectDate;
let selectMonth;
for (const key in prices) {
- const [month, day] = key.split('-');
- if (!selectDate) {
- selectDate = parseInt(day);
- selectMonth = parseInt(month);
+ if(prices[key].product_price != null) {
+ const [month, day] = key.split('-');
+ if (!selectDate) {
+ selectDate = parseInt(day);
+ selectMonth = parseInt(month);
+ }
+
+ break;
}
+ console.log(prices[key])
}
return {
selectDate,
diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue
index f4e566c..8dfd187 100644
--- a/subPackages/order/orderDetail.vue
+++ b/subPackages/order/orderDetail.vue
@@ -9,11 +9,11 @@
{{info.state_text}}
-
+
订单将在{{info.close_time.slice(-8)}}自动取消
- 系统将在1-7个工作日内原路退回您的原支付账户
+ 系统将在1-7个工作日内原路退回您的原支付账户
您的退款金额已退还到您的原支付账户
@@ -70,11 +70,11 @@
- 出行时间：{{item.use_date}}
+ 出行时间：{{item.use_date}}
开放时间：{{item.scene_detail.open_time}}
-
+
{{item.sku_name}}
@@ -306,6 +306,9 @@
商品总额：￥{{info.total_money / 100}}
+
+ 邮费：￥{{info.total_post_fee / 100}}
+
优惠券：-￥{{info.preference_money / 100}}
@@ -683,6 +686,7 @@
font-weight: 500;
font-size: 27rpx;
color: #000000;
+ margin-top: 10rpx;
span {
color: #C3282E;
@@ -738,7 +742,7 @@
flex-shrink: 0;
}
- .line {
+ .lines {
width: 643rpx;
height: 1rpx;
background: #D8D8D8;
diff --git a/subPackages/user/myAddressAdd.vue b/subPackages/user/myAddressAdd.vue
index ce569a7..c1351d8 100644
--- a/subPackages/user/myAddressAdd.vue
+++ b/subPackages/user/myAddressAdd.vue
@@ -309,7 +309,7 @@
district_id: this.areaId,
detail_addr: this.detailAddr,
id: this.id || null
- },'/api/uservice/user/' + (this.id > 0 ? 'edit' : 'add') + 'Consignee').then(res => {
+ },'/api/uservice/user/' + (this.id > 0 ? 'edit' : 'addNew') + 'Consignee').then(res => {
if(res.code == 1){
uni.setStorageSync('addressNow',JSON.stringify(res.data))
uni.showModal({