上传

components/user/cartSubmitSelect.vue

@@ -32,6 +32,19 @@
 				isLink>
 				</uv-cell>
 			</view> -->
+			
+			
+			<view class="payInfoMessage">
+				<view style="font-weight: 900;">
+					下单说明：
+				</view>
+				<view class="">
+					租金：从物品确认收货开始计算￥{{ configList.depositPrice }}元/天
+				</view>
+				<view class="">
+					押金：将按照面积计算每平方厘米￥1元
+				</view>
+			</view>
 
 			<!-- 费用明细 -->
 			<view class="expense-detail">
@@ -108,16 +121,6 @@
 						</view>
 					</template>
 				</uv-cell>
-				
-				<view class="payInfoMessage">
-					下单说明：
-					<view class="">
-						租金：从物品确认收货开始计算￥{{ configList.depositPrice }}元/天
-					</view>
-					<view class="">
-						押金：将按照面积计算每平方厘米￥1元
-					</view>
-				</view>
 			</view>
 
 			<!-- 提交按钮 -->
@@ -323,6 +326,12 @@
 				margin-left: auto;
 			}
 		}
+		
+		.payInfoMessage{
+			line-height: 50rpx;
+			padding: 20rpx;
+			background-color: #fff;
+		}
 
 		.expense-detail {
 			padding: 30rpx;
@@ -348,10 +357,6 @@
 				text-align: center;
 				color: #5c5;
 			}
-			
-			.payInfoMessage{
-				line-height: 50rpx;
-			}
 		}
 
 		.submit-btn {

config.js

@@ -13,7 +13,8 @@ const type = 'prod'
 // 环境配置
 const config = {
 	dev : {
-		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

@@ -83,6 +83,7 @@
 					<view :class="{act : unitIndex == index}" v-for="(item, index) in skuList"
 						@click="selectUnit(item, index)" :key="index">
 						{{ item.title }}
+						<text v-if="item.colour">,{{ item.colour }}</text>
 					</view>
 				</view>
 			</view>

pages/index/center.vue

@@ -46,12 +46,12 @@
 			
 					<uv-grid-item @click="bindWx"
 					v-if="!userInfo.appOpenid">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
+						<image class="image" src="/static/image/center/wx.png" mode=""></image>
 						<text class="grid-text">绑定微信</text>
 					</uv-grid-item>
 			
 					<uv-grid-item @click="logout">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
+						<image class="image" src="/static/image/center/logout.png" mode=""></image>
 						<text class="grid-text">退出登录</text>
 					</uv-grid-item>
 			
@@ -112,7 +112,7 @@
 					</uv-grid-item>
 
 					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/refundsOrExchange?index='+0)">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
+						<image class="image" src="/static/image/center/t.png" mode=""></image>
 						<text class="grid-text">退货</text>
 					</uv-grid-item>
 
@@ -142,17 +142,17 @@
 					</uv-grid-item> -->
 
 					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/applyLaundryStore')">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
+						<image class="image" src="/static/image/center/2.png" mode=""></image>
 						<text class="grid-text">申请成为水洗店</text>
 					</uv-grid-item>
 
 					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/applyLaundryStore')">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
+						<image class="image" src="/static/image/center/g.png" mode=""></image>
 						<text class="grid-text">申请成为供应商</text>
 					</uv-grid-item>
 
 					<uv-grid-item @click="logout">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
+						<image class="image" src="/static/image/center/logout.png" mode=""></image>
 						<text class="grid-text">退出登录</text>
 					</uv-grid-item>
 				</uv-grid>

pages/index/index.vue

@@ -160,7 +160,7 @@
 				statisticsKey : [
 					{
 						key : 'user',
-						title : '我的客户',
+						title : '桌布库存',
 					},
 					{
 						key : 'wash',

pages/index/order.vue

@@ -38,8 +38,21 @@
 						<image mode="aspectFill" :src="p.pic"></image>
 					</view>
 	
-					<view class="right">
-						
+					<view class="right"
+					v-if="userShop && item.type == 1">
+						<view class="text-hidden-1">
+							订单号：{{p.goodsName}}
+						</view>
+						<view class="text-hidden-1">
+							产品名称：{{p.goodsName}}
+						</view>
+						<view class="text-hidden-1">
+							产品规格：{{p.sku}} x{{ p.num }}
+						</view>
+					</view>
+					
+					<view class="right"
+					v-else>
 						<view class="text-hidden-1">
 							产品名称：{{p.goodsName}}
 						</view>
@@ -49,17 +62,21 @@
 						<view class="text-hidden-1">
 							数量：{{ p.num }}
 						</view>
-						
 					</view>
 	
 				</view>
 				
 				<view class="userInfo"
-				v-if="!userShop">
+				v-if="!userShop || item.type == 0">
 					<text>{{ item.userName }}</text>
 					<text>{{ item.userPhone }}</text>
 					<text>{{ item.userAddress }}</text>
 				</view>
+				
+				<!-- <view class="userInfo">
+					<text>订单号：</text>
+					<text>{{ item.id }}</text>
+				</view> -->
 				<view class="userInfo">
 					<text>下单时间：</text>
 					<text>{{ item.createTime }}</text>
@@ -295,6 +312,7 @@
 			this.getData()
 			if(this.userShop){
 				this.tabs[1].name = '租赁订单'
+				this.tabs[2].name = '水洗订单'
 				this.$forceUpdate()
 			}
 		},

pages_order/components/product/submitUnitSelect.vue

@@ -45,10 +45,12 @@
 				</view>
 			</view> -->
 			
-							
+			
 			<view class="payInfoMessage"
 			v-if="buyIndex == 0">
-				下单说明：
+				<view style="font-weight: 900;">
+					下单说明：
+				</view>
 				<view class="">
 					租金：从物品确认收货开始计算￥{{ configList.depositPrice }}元/天
 				</view>
@@ -96,6 +98,7 @@
 						<view :class="{act : unitIndex == index}" v-for="(item, index) in detail.hotelGoodsSkuList"
 							@click="selectUnit(item, index)" :key="index">
 							{{ item.title }}
+							<text v-if="item.colour">,{{ item.colour }}</text>
 						</view>
 					</view>
 				</view>
@@ -347,6 +350,10 @@
 						num: this.num,
 					}
 				]
+				
+				if(this.unit.colour){
+					data[0].sku = data[0].sku + ',' + this.unit.colour
+				}
 
 
 				if (this.$utils.verificationAll(data[0], {

pages_order/order/createWash.vue

@@ -121,6 +121,7 @@
 			color="#fff"
 			size="40rpx"
 			></uv-icon>
+			水洗店内桌布
 		</view>
 		
 		<addLease ref="addLease" @submit="getData"/>
@@ -545,12 +546,14 @@
 			bottom: 30vh;
 			background-color: $uni-color;
 			color: #FFF;
-			width: 100rpx;
-			height: 100rpx;
+			width: 140rpx;
+			height: 140rpx;
 			border-radius: 50%;
 			display: flex;
 			justify-content: center;
 			align-items: center;
+			flex-direction: column;
+			font-size: 20rpx;
 		}
 	}
 </style>

pages_order/order/orderDetail.vue

@@ -22,10 +22,10 @@
 					
 					<!-- 水洗订单：水洗店选择收货方式 -->
 					<template v-if="[4, 6].includes(order.status)">
-						<view @click.stop="orderConfirmAccept(order, {logisticsFlag : 0}, 1)" class="b2">
+						<view @click.stop="orderConfirmAccept(order, {logisticsFlag : 0})" class="b2">
 							{{ order.status == 4 ? '快递取货' : '快递寄回' }}
 						</view>
-						<view @click.stop="orderConfirmAccept(order, {logisticsFlag : 1}, 1)" class="b1">
+						<view @click.stop="orderConfirmAccept(order, {logisticsFlag : 1})" class="b1">
 							自行配送
 						</view>
 					</template>
@@ -82,7 +82,22 @@
 					<uv-steps-item 
 					:title="item.name" 
 					:key="index" 
-					v-for="(item, index) in steps">
+					v-for="(item, index) in steps.slice(0, 5)">
+					</uv-steps-item>
+				</uv-steps>
+				
+				<view 
+				v-if="steps.length > 5"
+				style="margin-top: 30rpx;">
+				</view>
+				
+				<uv-steps activeColor="#FD5100"
+				v-if="steps.length > 5"
+				:current="stepsCurrent - 5" dot>
+					<uv-steps-item 
+					:title="item.name" 
+					:key="index" 
+					v-for="(item, index) in steps.slice(5)">
 					</uv-steps-item>
 				</uv-steps>
 			</view>
@@ -189,7 +204,7 @@
 			</view> -->
 
 			<view class="line address"
-			v-if="!userShop">
+			v-if="!userShop || order.type == 0">
 				<view class="address-top">
 					<view class="">
 						收货地址
@@ -303,12 +318,15 @@
 
 			<!-- 下单须知 -->
 			<view class="line">
-				<view class="t min_tips">
+				<view class="t min_tips"
+				v-if="!userShop">
 					<view class="">
 						下单须知
 					</view>
 				</view>
-				<view class="min_tips" style="line-height: 40rpx;">
+				<view class="min_tips" 
+				v-if="!userShop"
+				style="line-height: 40rpx;">
 					<view class="">
 						<view class="">
 							租金：从物品确认收货开始计算￥{{ configList.depositPrice }}元/天

uni_modules/uv-notice-bar/components/uv-column-notice/props.js

@@ -28,7 +28,7 @@ export default {
 		// 字体大小，单位px
 		fontSize: {
 			type: [String, Number],
-			default: 14
+			default: 28
 		},
 		// 水平滚动时的滚动速度，即每秒滚动多少px(px)，这有利于控制文字无论多少时，都能有一个恒定的速度
 		speed: {

uni_modules/uv-notice-bar/components/uv-column-notice/uv-column-notice.vue

@@ -11,7 +11,7 @@
 				<uv-icon
 					:name="icon"
 					:color="color"
-					size="19"
+					size="40rpx"
 				></uv-icon>
 			</view>
 		</slot>

uni_modules/uv-notice-bar/components/uv-notice-bar/props.js

@@ -43,7 +43,7 @@ export default {
 		// 字体大小
 		fontSize: {
 			type: [String, Number],
-			default: 14
+			default: 28
 		},
 		// 滚动一个周期的时间长，单位ms
 		duration: {

uni_modules/uv-notice-bar/components/uv-row-notice/props.js

@@ -28,7 +28,7 @@ export default {
 		// 字体大小，单位px
 		fontSize: {
 			type: [String, Number],
-			default: 14
+			default: 28
 		},
 		// 水平滚动时的滚动速度，即每秒滚动多少px(rpx)，这有利于控制文字无论多少时，都能有一个恒定的速度
 		speed: {

uni_modules/uv-notice-bar/components/uv-row-notice/uv-row-notice.vue

@@ -11,7 +11,7 @@
 				<uv-icon
 					:name="icon"
 					:color="color"
-					size="19"
+					size="40rpx"
 				></uv-icon>
 			</view>
 		</slot>