上传

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{

components/user/productList.vue

@@ -24,14 +24,14 @@
 				</view> -->
 				
 				<view class="price">
-					租金<text>￥{{ item.goodsSku.price }}</text>元/起
+					租金<text>￥{{ item.depositPrice }}</text>元/起
 				</view>
 				<view class="favorable" v-if="item.goodsSku">
 					<view class="t">
-						原价
+						押金
 					</view>
 					<view class="p">
-						￥{{ item.originalPrice }}
+						￥{{ item.goodsSku.price }}
 					起
 					</view>
 				</view>

components/user/selectProductUnit.vue

@@ -5,7 +5,7 @@
 				颜色选择
 			</view>
 			<view class="list">
-				<view :class="{act : unitKey.startsWith(item)}" 
+				<view :class="{act : colorIndex == index}" 
 				v-for="(item, index) in colorList"
 					@click="selectUnit(item, index, 0)" :key="index">
 					{{ item }}
@@ -19,7 +19,7 @@
 			</view>
 			<view class="list">
 				<view 
-				:class="{act : unitKey.endsWith(item), 
+				:class="{act : sizeIndex == index, 
 				del : getUnitClassDel(item, index)}" 
 				v-for="(item, index) in sizeList"
 					@click="selectUnit(item, index, 1)" :key="index">
@@ -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
 					}
 				})

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',

pages/index/cart.vue

@@ -38,9 +38,16 @@
 										<uv-icon name="arrow-down"></uv-icon>
 									</view>
 									<view class="price">
-										￥
-										<text>{{ item.depositPrice }}</text>
-										元
+										<view class="">
+											租金￥
+											<text>{{ item.depositPrice }}</text>
+											元
+										</view>
+										<view class="">
+											押金￥
+											<text>{{ item.price }}</text>
+											元
+										</view>
 									</view>
 								</view>
 							</view>
@@ -58,7 +65,7 @@
 
 			<view class="action">
 				<view class="icon">
-					<image src="/static/image/cart/1.png" mode=""></image>
+					<image src="/static/image/cart/2.png" mode=""></image>
 					<view class="num">{{ checkboxValue.length }}</view>
 				</view>
 				<view class="price">
@@ -93,14 +100,19 @@
 				</view>
 			</view> -->
 			
+			
 			<!-- 多规格选择 -->
 			<view class="unit-box">
-				<selectProductUnit
-				:list="skuList"
-				ref="selectProductUnit"
-				@selectUnit="selectUnit"
-				/>
-				
+				<scroll-view
+				scroll-y="true" 
+				:style="{height: '50vh'}">
+					<selectProductUnit
+					:list="skuList"
+					ref="selectProductUnit"
+					@selectUnit="selectUnit"
+					/>
+				</scroll-view>
+					
 				<view class="uni-color-btn"
 				@click="selectUnitSubmit">
 					保存修改
@@ -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;
 					}
 				}
 			}

pages_order/components/product/submitUnitSelect.vue

@@ -70,12 +70,12 @@
 				
 						<view class="info">
 							<view class="price">
-								租金￥<text>{{ unit.price }}</text>元/天
+								租金￥<text>{{ detail.depositPrice }}</text>元/天
 							</view>
 							<view class="price"
 							style="font-size: 22rpx;">
 								押金￥<text
-							style="font-size: 22rpx;">{{ detail.depositPrice }}</text>元
+							style="font-size: 22rpx;">{{ unit.price }}</text>元
 							</view>
 							<view class="unit">
 								请选择规格
@@ -129,13 +129,13 @@
 					<view class="title">
 						费用明细
 					</view>
-					<view class="detail" v-if="detail.depositPrice">
+					<view class="detail" v-if="unit.price">
 						<view>
 							应付款：￥{{ price }}
 						</view>
 						<view>
 							<view class="">
-								押金：￥{{ detail.depositPrice }}
+								押金：￥{{ unit.price }}
 							</view>
 							<view class="">
 								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() {

pages_order/order/createWash.vue

@@ -88,7 +88,7 @@
 		
 		<view class="action">
 			<view class="icon">
-				<image src="/static/image/cart/1.png" mode=""></image>
+				<image src="/static/image/cart/2.png" mode=""></image>
 				<view class="num">{{ checkboxValue.length }}</view>
 			</view>
 			<view class="price">

pages_order/product/productDetail.vue

@@ -18,8 +18,7 @@
 				<view class="price">
 					租金￥<text>
 						{{ 
-							detail.hotelGoodsSkuList[0] && 
-							detail.hotelGoodsSkuList[0].price 
+							detail.depositPrice 
 						}}
 					</text>起
 				</view>