找桩页修改

pages/searchPile/searchPile.vue

@@ -40,9 +40,10 @@
 						<u-icon name="arrow-down-fill" size="13" color="#c0c4cc"></u-icon>
 					</view>-->
 					<view style="margin-right: 20rpx;" @click="open">
-						<label class="arrow font2">{{ action }}</label>
-						<u-icon v-if="show" name="arrow-down-fill" size="13" color="#00B962"></u-icon>
-						<u-icon v-else name="arrow-down-fill" size="13" color="#c0c4cc"></u-icon>
+						<label v-if="show" class="arrow font2" style="color: #00b962;">{{ action }}</label>
+						<label v-else class="arrow font2" >{{ action }}</label>
+						<u-icon v-if="show" name="arrow-up-fill" size="13" color="#00B962"></u-icon>
+						<u-icon v-else name="arrow-down-fill" size="13" color="#999999"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -95,7 +96,7 @@
 				</view>
 
 				<view class="preference_group">
-					<view style="margin-left: 30rpx;"><u-checkbox shape="circle" v-model="preference.save_preference" @change="radioChange">保存偏好设置</u-checkbox></view>
+					<view style="margin-left: 30rpx;"><u-checkbox active-color="#00b962" shape="circle" v-model="preference.save_preference" @change="radioChange">保存偏好设置</u-checkbox></view>
 				</view>
 			
 				</view>
@@ -155,20 +156,6 @@
 							<text class="park-p" style="color: #FFFFFF;">p</text>
 							<text class="park-text">{{item.parkingDescription}}</text>
 						</view>	
-						<view class="park" v-else>
-							<text class="park-p" style="color: #FFFFFF;">p</text>
-							<text class="park-text">以实际停车场为准</text>
-						</view>	
-						<view class="park" >
-							<!-- <text class="park-p" style="color: #FFFFFF;">p</text> -->
-							<img src="@/assets/img/riFill-coupon-3-fill.svg">
-							<view class="park-text park-text2">
-								<view class="park-text3"> 
-									本站<span v-if="item.giveDiscount" >服务费{{item.discountRatio/10}}折，</span>支持包月卡、服务费代金券和超级代金券等优惠活动
-									
-								</view>
-							</view>
-						</view>	
 					</view>
 					<view class="img-box">
 						<img :src="item.image" alt="">
@@ -328,7 +315,7 @@ export default {
 			showRadius:false,
 			cities: [ '荆州市'], 			
 			radiuses:['1公里','2公里','5公里','10公里','20公里','50公里','100公里','200公里'],
-			types:['全部','交流快充','直流慢充'],			
+			types:['交流快充','直流慢充'],			
 			area: '荆州市',
 			raidus:'',
 			type:'',
@@ -380,7 +367,7 @@ export default {
 					{ distance: 100, text: '100公里' },
 					{ distance: 200, text: '200公里' }
 				],
-				obc_type: [{ value: '', text: '全部' }, { value: 0, text: '直流快充' }, { value: 1, text: '交流慢充' }],
+				obc_type: [{ value: 0, text: '直流快充' }, { value: 1, text: '交流慢充' }],
 				obc_status: [{ value: 0, text: '对外开放' }, { value: 1, text: '不对外开放' }],
 				obc_voltage: [{ value: 0, text: '低于700V' }, { value: 1, text: '700V及以上' }],
 				obc_power: { minValue: 0, maxValue: 1000 }
@@ -442,7 +429,6 @@ export default {
 		 for(let i = 0;i< this.info.obc_type.length;i++){
 			 this.types.push(this.info.obc_type[i].text);
 		 }
-		 console.log(this.types)
 		 this.radiuses = [];
 		 for(let i = 0;i< this.info.miles_type.length;i++){
 			 this.radiuses.push(this.info.miles_type[i].text);
@@ -870,29 +856,14 @@ export default {
 //									longitude: 112.28541 + i * 0.001,
 //									latitude: 30.308354 + i * 0.01
 									};
-						if(items[i].id != null){
-								obj.id = items[i].id;
-								obj=items[i];
-						}
-						
+						if(items[i].id != null)
+							obj.id = items[i].id;
 						else
 							continue;
-							
-						
 						if(items[i].type.indexOf("1")>=0 && items[i].type.indexOf("2")>=0)
 						{
 							obj.type = '快/慢'
 						}
-						if(items[i].type=="1" )
-						{
-							obj.type = '快充'
-						}
-						if(items[i].type=="2" )
-						{
-							obj.type = '慢充'
-						}
-						
-						
 						if(items[i].name!=null)
 							obj.name = items[i].name;
 						if(items[i].address!=null)
@@ -915,7 +886,6 @@ export default {
 						if(items[i].image != null){
 							obj.image = items[i].image;
 						}
-						
 						if(items[i].parkingDescription != null){
 							obj.parkingDescription = items[i].parkingDescription;
 						}
@@ -975,29 +945,14 @@ export default {
 	//									longitude: 112.28541 + i * 0.001,
 	//									latitude: 30.308354 + i * 0.01
 								};
-							if(items[i].id != null){
+							if(items[i].id != null)
 								obj.id = items[i].id;
-								obj = items[i];
-							}
-								
 							else
 								continue;
-								
-									
 							if(items[i].type.indexOf("1")>=0 && items[i].type.indexOf("2")>=0)
 							{
 								obj.type = '快/慢'
 							}
-							if(items[i].type=="1" )
-							{
-								obj.type = '快充'
-							}
-							if(items[i].type=="2" )
-							{
-								obj.type = '慢充'
-							}
-						
-							
 							if(items[i].name!=null)
 								obj.name = items[i].name;
 							if(items[i].address!=null)
@@ -1162,6 +1117,7 @@ export default {
 			this.show = false;			
 		},
 		open() {
+			
 			this.$refs.type.closeSelector();
 			this.$refs.raidus.closeSelector();
 			this.$refs.city.closeSelector();
@@ -1364,6 +1320,7 @@ export default {
 }
 .preference_group_item {
 	padding: 15rpx;
+	
 }
 .preference_group {
 	padding-bottom: 20rpx;
@@ -1382,7 +1339,7 @@ export default {
 	width: 20%;
 	height: 56rpx;
 	@include themeify{
-		font-size: themed('font-size1');
+		font-size: themed('font-size2');
 		line-height: themed('font-size2');
 	}
 /*	line-height: 14px;*/
@@ -1396,7 +1353,7 @@ export default {
 	width: 22%;
 	height: 56rpx;
 	@include themeify{
-		font-size: themed('font-size1');
+		font-size: themed('font-size2');
 		line-height: themed('font-size2');
 	}
 /*	line-height: 14px;*/
@@ -1411,7 +1368,7 @@ export default {
 	border-style: none;
 	height: 56rpx;
 	@include themeify{
-		font-size: themed('font-size1');
+		font-size: themed('font-size2');
 		line-height: themed('font-size2');
 	}
 /*	line-height: 14px;*/
@@ -1694,16 +1651,6 @@ font-weight: 600;
 		margin-top: 2px;
 	}
 	
-	.park-text2 {
-		    width: 140%;
-		}
-		.park-text3 {
-			    white-space: nowrap;
-			 
-			 
-			    text-overflow: ellipsis;
-			    overflow: hidden;
-			}
 	 .map {
 		width: 100%;