zhengkaixin 1 سال پیش
والد
کامیت
c979149fba
3فایلهای تغییر یافته به همراه70 افزوده شده و 37 حذف شده
  1. 34 13
      pages/index/index.vue
  2. 16 6
      pages/search/search.vue
  3. 20 18
      pages/searchPile/searchPile.vue

+ 34 - 13
pages/index/index.vue

@@ -447,7 +447,10 @@
 							</view>
 							<view class="num">
-								{{stationData.fastAvailableNum}}/{{stationData.fastNum}}
+								{{stationData.fastAvailableNum}}
+							</view>
+							<view class="num1">
+								/{{stationData.fastNum}}
 							</view>
 						</view>
 						<view class="slow oldTextjp2" oldstyle="margin-left: 1px;" v-if="stationData.slowNum">
@@ -455,7 +458,10 @@
 							</view>
 							<view class="num">
-								{{stationData.slowAvailableNum}}/{{stationData.slowNum}}
+								{{stationData.slowAvailableNum}}
+							</view>
+							<view class="num1">
+								/{{stationData.slowNum}}
 							</view>
 						</view>
 					</view>
@@ -590,7 +596,10 @@
 						</view>
 						<view class="num">
-							{{stationData.fastAvailableNum}}/{{stationData.fastNum}}
+							{{stationData.fastAvailableNum}}
+						</view>
+						<view class="num">
+							/{{stationData.fastNum}}
 						</view>
 					</view>
 					<view class="slow oldTextjp2" oldstyle="margin-left: 1px;" v-if="stationData.slowNum">
@@ -598,7 +607,10 @@
 						</view>
 						<view class="num">
-							{{stationData.slowAvailableNum}}/{{stationData.slowNum}}
+							{{stationData.slowAvailableNum}}
+						</view>
+						<view class="num1">
+							/{{stationData.slowNum}}
 						</view>
 					</view>
 				</view>
@@ -2218,8 +2230,10 @@
 					height: 40rpx;
 					line-height: 40rpx;
 					border-radius: 8rpx;
-					background-color: rgba(186, 240, 215, 100);
-					color: rgba(0, 130, 69, 100);
+					// background-color: rgba(186, 240, 215, 100);
+					// color: rgba(0, 130, 69, 100);
+					background-color: #1677FF;
+					color: rgba(255, 255, 255, 1);
 					font-size: 28rpx;
 					text-align: center;
 					margin-right: 8rpx;
@@ -2230,18 +2244,25 @@
 					height: 40rpx;
 					line-height: 40rpx;
 					border-radius: 8rpx;
-					background-color: rgba(226, 226, 226, 100);
-					color: rgba(128, 128, 128, 100);
+					// background-color: rgba(226, 226, 226, 100);
+					// color: rgba(128, 128, 128, 100);
+					background-color: #00B962;
+					color: rgba(255, 255, 255, 1);
 					font-size: 28rpx;
 					text-align: center;
 					margin-right: 8rpx;
 				}
-
-				.num {
-					font-size: 32rpx;
-					color: rgba(0, 145, 67, 100);
-					line-height: 40rpx;
+				.num {
+					font-size: 32rpx;
+					color: #666;
+					line-height: 40rpx;
+				}
+				.num1 {
+					font-size: 32rpx;
+					color: #bbb;
+					line-height: 40rpx;
 				}
+				
 			}
 
 			.slow {

+ 16 - 6
pages/search/search.vue

@@ -573,8 +573,10 @@ font-weight: 600;
  			height: 40rpx;
  			line-height: 40rpx;
  			border-radius: 4px;
- 			background-color: rgba(186, 240, 215, 100);
- 			color: rgba(0, 130, 69, 100);
+ 			// background-color: rgba(186, 240, 215, 100);
+ 			// color: rgba(0, 130, 69, 100);
+			background-color: #1677FF;
+			color: rgba(255, 255, 255, 1);
  			font-size: 28rpx;
  			text-align: center;
  			margin-right: 2rpx;
@@ -584,14 +586,22 @@ font-weight: 600;
  			height: 40rpx;
  			line-height: 40rpx;
  			border-radius: 4px;
- 			background-color: rgba(226, 226, 226, 100);
- 			color: rgba(128, 128, 128, 100);
+ 			// background-color: rgba(226, 226, 226, 100);
+ 			// color: rgba(128, 128, 128, 100);
+			background-color: #00B962;
+			color: rgba(255, 255, 255, 1);
  			font-size: 28rpx;
  			text-align: center;
  			margin-right: 2rpx;
  		}
- 		.num{
- 			font-size: 32rpx;color: rgba(0, 145, 67, 100);
+ 		.num {
+ 			font-size: 32rpx;
+ 			color: #666;
+ 			line-height: 40rpx;
+ 		}
+ 		.num1 {
+ 			font-size: 32rpx;
+ 			color: #bbb;
  			line-height: 40rpx;
  		}
  	}

+ 20 - 18
pages/searchPile/searchPile.vue

@@ -260,7 +260,9 @@
 									
 									<view class="price-3 "  v-if="item.tagList&&item.tagList.length&&item.tagList.indexOf('6折卡')>-1">
 										<view class="num1">
-											<u-image width="88rpx" mode="scaleToFill" height="16px" src="@/assets/img/9-4/6折卡价.svg" />
+											
+											<img  src="@/assets/img/9-4/6折卡价.svg" />
+											
 										</view>
 										<text
 											class="num">{{ (item.electricityPrice+(item.servicePrice*0.6)).toFixed(2)}}元/度</text>
@@ -276,7 +278,7 @@
 									</view>
 									<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
 										<text class="num1">
-											<u-image width="88rpx" mode="scaleToFill" height="16px" src="@/assets/img/9-4/会员价.svg" />
+											<img  src="@/assets/img/9-4/会员价.svg" />
 											
 											
 										</text>
@@ -1319,20 +1321,20 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		.distance {
-			color: rgba(102, 102, 102, 100);
-			text-align: end;
-			font-size: 30rpx;
-			width: 180rpx;
-			min-width: 180rpx;
-		
-			.iconfont {
-				font-size: 12px;
-				margin-right: 2px;
-			}
-		}
+		
+	}
+	.distance {
+		color: rgba(102, 102, 102, 100);
+		text-align: end;
+		font-size: 30rpx;
+		width: 180rpx;
+		min-width: 180rpx;
+	
+		.iconfont {
+			font-size: 12px;
+			margin-right: 2px;
+		}
 	}
-
 	.price {
 		display: flex;
 		align-items: center;
@@ -1380,13 +1382,13 @@
 			height: 16px;
 			min-height: 16px;
 			    margin-left: 32rpx;
-				align-items: center;
+			//	align-items: center;
 			//line-height: 40rpx;
 			.num1{
 				img{
 					// width: 88rpx;
-					
-					 min-height: 16px;
+					//width: 34px;
+					height: 16px;
 				}
 				/deep/.u-image{
 					 min-height: 16px;