caoliancun/MP_XOIL_company_new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
李轩
2022-10-20 03:53:12 +00:00
parent f7f86e9b55 c15c690285
commit 70ad823ba2
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BagMoney/components/oil-card/oil-card.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<view > <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')+');'"> :style="'background-image: url('+imgURL+ (card.oilCardType==2?'card-zs.png':'card-other.png')+');'">
<view class="padding-xl text-white"> <view class="padding-xl text-white">
<view class="padding-xs text-bold"> <view class="padding-xs text-bold">
@@ -14,6 +14,7 @@
个人油卡 个人油卡
</text> </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 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>
<view class="padding-xs padding-top-lg padding-bottom text-xxl"> <view class="padding-xs padding-top-lg padding-bottom text-xxl">
{{card.accountCardCode|cardNoFormat}} {{card.accountCardCode|cardNoFormat}}
@@ -125,4 +126,7 @@
.hidden-2{ .hidden-2{
opacity: 0; opacity: 0;
} }
.swi-bg{
background-size: 770rpx;
}
</style> </style>

2
colorui/main.css
View File

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

12
pages/tabbar/station/stationList.vue
View File

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