zhangdan 4 years ago
parent
commit
e4e8c367fb
3 changed files with 37 additions and 4 deletions
  1. 1 1
      pages/index/userInfo.vue
  2. 35 2
      pages/index/yuyue.vue
  3. 1 1
      pages/order/index.vue

+ 1 - 1
pages/index/userInfo.vue

@@ -69,7 +69,7 @@
 					houseAddress:'', // 详细地址
 					houseAddress:'', // 详细地址
 					// imageHeader:'', // 门头照片
 					// imageHeader:'', // 门头照片
 				},
 				},
-				contactAddress:'' ,// 通讯地址
+				// contactAddress:'' ,// 通讯地址
 				isView: false ,// 是否是查看详情
 				isView: false ,// 是否是查看详情
 				itemId:'',
 				itemId:'',
 				submitBtn:{
 				submitBtn:{

+ 35 - 2
pages/index/yuyue.vue

@@ -24,7 +24,7 @@
 			<view class="form-data rubbishType">
 			<view class="form-data rubbishType">
 				<view class="rubbishType-title u-required:before">回收分类</view>
 				<view class="rubbishType-title u-required:before">回收分类</view>
 				<view class="rubbishType-tags">
 				<view class="rubbishType-tags">
-					<view :class="['item-tags', item.check ? 'active' : '']" v-for="item in rubbishTypeListData" :key="item.code" @click="itemRubbishChange(item)">{{item.dispName}}</view>
+					<view :class="['item-type', item.check ? 'active' : '']" v-for="(item,index) in rubbishTypeListData" :key="item.code" @click="itemRubbishChange(item)">{{item.dispName}}</view>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="form-data rubbishType">
 			<view class="form-data rubbishType">
@@ -85,6 +85,7 @@
 				form: {
 				form: {
 					info: '', 
 					info: '', 
 				},
 				},
+				curIndex:'', // 当前类型下标
 				rubbishTypeList:[], // 垃圾类型
 				rubbishTypeList:[], // 垃圾类型
 				reserveWeight:'',
 				reserveWeight:'',
 				hasRider:true, // 是否有骑手
 				hasRider:true, // 是否有骑手
@@ -508,13 +509,31 @@
 			.rubbishType-tags{
 			.rubbishType-tags{
 				display: flex;
 				display: flex;
 				justify-content: space-between;
 				justify-content: space-between;
-				.item-tags.active{
+				.item-type{
+					padding:10upx;
+					background-color:#f5f5f5;
+					opacity: 1;
+					border-radius: 100upx;
+					text-align: center;
+				}
+				.item-type.active{
 					padding: 10upx;
 					padding: 10upx;
+					border: 1px solid #4F88F7;
+					opacity: 1;
 					background-color:rgba(79, 136, 247, 0.2);
 					background-color:rgba(79, 136, 247, 0.2);
 					border-radius: 100px;
 					border-radius: 100px;
 				}
 				}
+				.item-weightTags{
+					padding:10upx;
+					opacity: 1;
+					border-radius: 100upx;
+					background-color:#f5f5f5;
+					text-align: center;
+				}
 				.item-weightTags.active{
 				.item-weightTags.active{
 					padding: 10upx;
 					padding: 10upx;
+					border: 1px solid #4F88F7;
+					opacity: 1;
 					background-color:rgba(79, 136, 247, 0.2);
 					background-color:rgba(79, 136, 247, 0.2);
 					border-radius: 100px;
 					border-radius: 100px;
 				}
 				}
@@ -571,6 +590,20 @@
 				}
 				}
 			}
 			}
 		}
 		}
+		// .item-type{
+		// 	padding:10upx;
+		// 	// border: 1px solid #979797;
+		// 	opacity: 1;
+		// 	border-radius: 100upx;
+		// 	// font-size: 30rpx;
+		// 	color: #999999;
+		// 	text-align: center;
+		// }
+		// .item-type.active{
+		// 	padding: 10upx;
+		// 	background-color:rgba(79, 136, 247, 0.2);
+		// 	border-radius: 100px;
+		// }
 		.btns{
 		.btns{
 			padding: 30upx 30upx 50upx;
 			padding: 30upx 30upx 50upx;
 			background-color: #fff;
 			background-color: #fff;

+ 1 - 1
pages/order/index.vue

@@ -110,7 +110,7 @@
 			// 取消订单
 			// 取消订单
 			chooseReason(e){
 			chooseReason(e){
 				console.log(e,'-------取消订单')
 				console.log(e,'-------取消订单')
-				cancelOrder({id:this.nowId,canReson:e}).then(res=>{
+				cancelOrder({id:this.nowId,cancelReason:e}).then(res=>{
 					if(res.status==200){
 					if(res.status==200){
 						uni.showToast({
 						uni.showToast({
 							title: res.message,
 							title: res.message,