上传

components/user/cartSubmitSelect.vue

@@ -331,6 +331,7 @@
 			line-height: 50rpx;
 			padding: 20rpx;
 			background-color: #fff;
+			font-size: 28rpx;
 		}
 
 		.expense-detail {

pages/index/cart.vue

@@ -9,10 +9,14 @@
 					<view v-for="(item, index) in list.records" :key="index">
 						<view style="margin-top: 20rpx;"></view>
 						<uv-swipe-action-item :options="options" @click="delCart(item, index)">
-							<view class="item">
+							<view class="item" @click="selectItem(item)">
 								<view class="checkbox">
-									<uv-checkbox :name="item.id" activeColor="#FA5A0A" size="40rpx"
-										icon-size="35rpx"></uv-checkbox>
+									<uv-checkbox 
+									:name="item.id" 
+									activeColor="#FA5A0A" 
+									size="40rpx"
+									@click.stop
+									icon-size="35rpx"></uv-checkbox>
 								</view>
 
 								<image class="image"
@@ -29,7 +33,7 @@
 												@change="e => valChange(item, e)"></uv-number-box>
 										</view>
 									</view>
-									<view class="unit" @click="toggleDropdown(item)">
+									<view class="unit" @click.stop="toggleDropdown(item)">
 										规格：{{ item.title }}
 										<uv-icon name="arrow-down"></uv-icon>
 									</view>
@@ -192,6 +196,15 @@
 			}
 		},
 		methods: {
+			// 选择物品
+			selectItem(item){
+				let index = this.checkboxValue.indexOf(item.id)
+				if(index == -1){
+					this.checkboxValue.push(item.id)
+					return
+				}
+				this.checkboxValue.splice(index, 1)
+			},
 
 			// 修改商品规格弹框
 			toggleDropdown(item) {
@@ -365,7 +378,6 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				padding: 0 10rpx;
 				flex-shrink: 0;
 			}
 

pages/index/index.vue

@@ -207,21 +207,9 @@
 		},
 		methods: {
 			toUrl(index){
-				if(index == 0){
-					
-				}else if(index == 1){
-					uni.reLaunch({
-						url: '/pages/index/order?current=2'
-					})
-				}else if(index == 2){
-					uni.reLaunch({
-						url: '/pages/index/order?current=4'
-					})
-				}else{
-					uni.reLaunch({
-						url: '/pages/index/order?current=3'
-					})
-				}
+				uni.reLaunch({
+					url: '/pages/index/order?current' + index + 1
+				})
 			},
 			banner(){
 				this.$api('bannerList', res => {

pages/index/order.vue

@@ -38,7 +38,7 @@
 						<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}}
@@ -49,10 +49,9 @@
 						<view class="text-hidden-1">
 							产品规格：{{p.sku}} x{{ p.num }}
 						</view>
-					</view>
+					</view> -->
 					
-					<view class="right"
-					v-else>
+					<view class="right">
 						<view class="text-hidden-1">
 							产品名称：{{p.goodsName}}
 						</view>
@@ -67,16 +66,24 @@
 				</view>
 				
 				<view class="userInfo"
-				v-if="!userShop || item.type == 0">
+				v-if="!userShop">
 					<text>{{ item.userName }}</text>
 					<text>{{ item.userPhone }}</text>
 					<text>{{ item.userAddress }}</text>
 				</view>
 				
-				<!-- <view class="userInfo">
+				<view class="userInfo"
+				v-if="userShop">
+					<text>用户：</text>
+					<text>{{ item.id }}</text>
+				</view>
+				
+				<view class="userInfo"
+				v-if="userShop">
 					<text>订单号：</text>
 					<text>{{ item.id }}</text>
-				</view> -->
+				</view>
+				
 				<view class="userInfo">
 					<text>下单时间：</text>
 					<text>{{ item.createTime }}</text>
@@ -311,7 +318,7 @@
 		onShow() {
 			this.getData()
 			if(this.userShop){
-				this.tabs[1].name = '租赁订单'
+				this.tabs[1].name = '桌布库存'
 				this.tabs[2].name = '水洗订单'
 				this.$forceUpdate()
 			}

pages_order/components/product/addLease.vue

@@ -1,5 +1,9 @@
 <template>
 	<uv-popup ref="addPopup" :round="30">
+		
+		<view class="title">
+			添加我的物品 进行水洗下单
+		</view>
 
 		<!-- 地址 -->
 		<view class="address" @click="openAddress">
@@ -95,6 +99,13 @@
 
 <style scoped lang="scss">
 	
+	.title{
+		background-color: #fff;
+		padding: 20rpx;
+		text-align: center;
+		font-weight: 900;
+	}
+	
 	.address {
 		display: flex;
 		padding: 20rpx;

pages_order/order/createWash.vue

@@ -20,14 +20,18 @@
 			
 			<!-- <uv-checkbox-group shape="circle" v-model="checkboxValue"
 			> -->
-				<view v-for="(item, index) in list" :key="index"  class="item">
+				<view 
+				v-for="(item, index) in list" 
+				:key="index" 
+				@click="selectItem(item)"
+				class="item">
 					<view class="checkbox">
-						
 						<uv-radio
 						:name="item.id" 
 						:disabled="!!item.statusInfo" 
 						activeColor="#FA5A0A" 
 						size="40rpx" 
+						@click.stop
 						icon-size="35rpx"></uv-radio>
 					</view>
 
@@ -121,7 +125,6 @@
 			color="#fff"
 			size="40rpx"
 			></uv-icon>
-			水洗店内桌布
 		</view>
 		
 		<addLease ref="addLease" @submit="getData"/>
@@ -240,6 +243,14 @@
 			this.getRentPrice()
 		},
 		methods: {
+			// 选择物品
+			selectItem(item){
+				if(this.radiovalue == item.id){
+					this.radiovalue = 0
+					return
+				}
+				this.radiovalue = item.id
+			},
 			//点击tab栏
 			clickTabs({
 				index,
@@ -546,8 +557,8 @@
 			bottom: 30vh;
 			background-color: $uni-color;
 			color: #FFF;
-			width: 140rpx;
-			height: 140rpx;
+			width: 100rpx;
+			height: 100rpx;
 			border-radius: 50%;
 			display: flex;
 			justify-content: center;