Merge pull request 'xiugai' (#1) from lixuan into master

Reviewed-on: #1

BagMoney/components/oil-card/oil-card.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<view class="bg-img boxsingForCard  flex align-center"
+		<view class="bg-img boxsingForCard  flex align-center swi-bg"
 			:style="'background-image: url('+imgURL+ (card.oilCardType==2?'card-zs.png':'card-other.png')+');'">
 			<view class="padding-xl text-white">
 				<view class="padding-xs  text-bold">
@@ -14,6 +14,7 @@
 						个人油卡
 					</text>
 					<text style="margin-left: 15rpx;padding: 10rpx 15rpx;border-radius: 15rpx;color: #FF6700;background-color: #FFFFFF;font-size: 20rpx;">{{card.companyType|companyType}}</text>
+					<text v-show="card.plateNumberCompany" style="margin-left: 15rpx;padding: 10rpx 15rpx;border-radius: 15rpx;color: #FF6700;background-color: #FFFFFF;font-size: 20rpx;">{{card.plateNumberCompany?card.plateNumberCompany:''}}</text>
 				</view>
 				<view class="padding-xs padding-top-lg padding-bottom text-xxl">
 					{{card.accountCardCode|cardNoFormat}}
@@ -125,4 +126,7 @@
 	.hidden-2{
 		opacity: 0;
 	}
+	.swi-bg{
+		background-size: 770rpx;
+	}
 </style>

colorui/main.css

@@ -2578,7 +2578,7 @@ swiper.round-dot .uni-swiper-dot.uni-swiper-dot-active {
 }
 
 .screen-swiper {
-	min-height: 375upx;
+	min-height: 385upx;
 }
 
 .screen-swiper image,

pages/tabbar/station/stationList.vue

@@ -482,13 +482,17 @@
 						siteName: this.siteName,
 						...uni.getStorageSync('location'),
 						// ...this.filterData
-						siteBrand: this.siteName ? '' : this.filterDatas
+						// siteBrand: this.siteName ? '' : this.filterDatas
+						siteBrand: this.filterDatas
 						.siteBrand, //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
-						channelCode: this.siteName ? '' : this.filterDatas
+						// channelCode: this.siteName ? '' : this.filterDatas
+						channelCode: this.filterDatas
 						.channelCode, //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
-						oilProductCode: this.siteName ? '' : this.filterDatas
+						// oilProductCode: this.siteName ? '' : this.filterDatas
+						oilProductCode:this.filterDatas
 							.oilProductCode ,//   备注：// 油号选择 ( 0# 92# 92#)
-						siteLevel: this.siteName ? '' : this.filterDatas
+						// siteLevel: this.siteName ? '' : this.filterDatas
+						siteLevel: this.filterDatas
 							.siteLevel ,
 						provinceCode:this.filterDatas.provinceCode,
 						cityCode:this.filterDatas.cityCode,