diff --git a/components/user/cartSubmitSelect.vue b/components/user/cartSubmitSelect.vue
index b839e0d..e39a923 100644
--- a/components/user/cartSubmitSelect.vue
+++ b/components/user/cartSubmitSelect.vue
@@ -351,7 +351,8 @@
line-height: 50rpx;
&>view{
display: flex;
- justify-content: space-between;
+ // justify-content: space-between;
+ // gap: 20rpx;
}
}
.coupon{
diff --git a/components/user/productList.vue b/components/user/productList.vue
index 4da4826..84475eb 100644
--- a/components/user/productList.vue
+++ b/components/user/productList.vue
@@ -24,14 +24,14 @@
-->
- 租金￥{{ item.goodsSku.price }}元/起
+ 租金￥{{ item.depositPrice }}元/起
- 原价
+ 押金
- ￥{{ item.originalPrice }}
+ ￥{{ item.goodsSku.price }}
起
diff --git a/components/user/selectProductUnit.vue b/components/user/selectProductUnit.vue
index e50f589..e6056fb 100644
--- a/components/user/selectProductUnit.vue
+++ b/components/user/selectProductUnit.vue
@@ -5,7 +5,7 @@
颜色选择
-
{{ item }}
@@ -19,7 +19,7 @@
@@ -56,11 +56,11 @@
return map
},
- // 颜色列表
+ // 尺寸列表
sizeList(){
return [...new Set(this.list.map(n => n.title || defaultKey))]
},
- // 尺寸列表
+ // 颜色列表
colorList(){
return [...new Set(this.list.map(n => n.colour || defaultKey))]
},
@@ -101,18 +101,19 @@
},
getUnitClassDel(item, index, type){
let key = this.colorList[this.colorIndex] + ':' + item
- return this.unitMap[key] ? false : true
+ return !this.unitMap[key]
},
+ // 更新索引
updateIndexAll(){
let key = this.unitKey
this.colorList.forEach((n, i) => {
- if(key.startsWith(n)){
+ if(key.startsWith(n + ':')){
this.colorIndex = i
}
})
this.sizeList.forEach((n, i) => {
- if(key.endsWith(n)){
+ if(key.endsWith(':' + n)){
this.sizeIndex = i
}
})
diff --git a/config.js b/config.js
index 1f8c469..47ebb5d 100644
--- a/config.js
+++ b/config.js
@@ -13,8 +13,8 @@ const type = 'prod'
// 环境配置
const config = {
dev : {
- baseUrl : 'http://h5.xzaiyp.top/hotel',
- // baseUrl : 'http://dev.java996.icu/hotel',
+ // baseUrl : 'http://h5.xzaiyp.top/hotel',
+ baseUrl : 'http://dev.java996.icu/hotel',
},
prod : {
baseUrl : 'https://hotel.java996.icu/hotel',
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 105a418..6ee52c9 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -38,9 +38,16 @@
- ￥
- {{ item.depositPrice }}
- 元
+
+ 租金￥
+ {{ item.depositPrice }}
+ 元
+
+
+ 押金￥
+ {{ item.price }}
+ 元
+
@@ -58,7 +65,7 @@
-
+
{{ checkboxValue.length }}
@@ -93,14 +100,19 @@
-->
+
-
-
+
+
+
+
保存修改
@@ -164,7 +176,7 @@
let price = 0
this.list.records.forEach(n => {
if (this.checkboxValue.includes(n.id)) {
- price += n.depositPrice * n.num
+ price += n.price * n.num
}
})
@@ -185,14 +197,14 @@
for(let i = 0;i < len;i++){
let item = list[i]
- if(item.price == n.depositPrice){
+ if(item.price == n.price){
item.num += n.num
return
}
}
list.push({
- price : n.depositPrice,
+ price : n.price,
num : n.num,
})
}
@@ -438,12 +450,21 @@
.price {
color: $uni-color;
- font-size: 28rpx;
+ font-size: 26rpx;
padding: 10rpx 20rpx;
-
- text {
- font-size: 36rpx;
- font-weight: 900;
+ display: flex;
+ align-items: flex-end;
+ &>view:nth-child(1){
+ text {
+ font-size: 32rpx;
+ font-weight: 900;
+ }
+ }
+ &>view:nth-child(2){
+ font-size: 22rpx;
+ font-weight: 500;
+ margin-left: 10rpx;
+ margin-bottom: 4rpx;
}
}
}
diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue
index 5eafa13..d14587c 100644
--- a/pages_order/components/product/submitUnitSelect.vue
+++ b/pages_order/components/product/submitUnitSelect.vue
@@ -70,12 +70,12 @@
- 租金￥{{ unit.price }}元/天
+ 租金￥{{ detail.depositPrice }}元/天
押金￥{{ detail.depositPrice }}元
+ style="font-size: 22rpx;">{{ unit.price }}元
请选择规格
@@ -129,13 +129,13 @@
费用明细
-
+
应付款：￥{{ price }}
- 押金：￥{{ detail.depositPrice }}
+ 押金：￥{{ unit.price }}
x{{ num }}
@@ -222,7 +222,8 @@
computed : {
...mapState(['configList']),
price(){
- return (this.detail.depositPrice * this.num).toFixed(2)
+ return (this.unit.price * this.num).toFixed(2)
+ // return (this.detail.depositPrice * this.num).toFixed(2)
},
},
data() {
diff --git a/pages_order/order/createWash.vue b/pages_order/order/createWash.vue
index ae92551..d6cf5e9 100644
--- a/pages_order/order/createWash.vue
+++ b/pages_order/order/createWash.vue
@@ -88,7 +88,7 @@
-
+
{{ checkboxValue.length }}
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index bfca133..11389ef 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -18,8 +18,7 @@
租金￥
{{
- detail.hotelGoodsSkuList[0] &&
- detail.hotelGoodsSkuList[0].price
+ detail.depositPrice
}}
起
diff --git a/static/image/cart/1.png b/static/image/cart/1.png
deleted file mode 100644
index 9807f34..0000000
Binary files a/static/image/cart/1.png and /dev/null differ