caoliancun/MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-07-24 10:11:16 +08:00
parent 9d07f97783
commit 152794b45e
3 changed files with 153 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
BagStation/pages/components/price-tab.vue
View File

@@ -32,9 +32,15 @@
<view class="padding-top-sm">
<text class="cu-tag line-yellow margin-right-xs" v-for="(itemy,index) in tagList" :key="index">{{itemy}}</text>
</view>
<view class="activity" v-if="siteInfo.activitySwitch">
<view class="content">
{{siteInfo.activityContent}}
</view>
</view>
</view>
</view>
</view>
</template>
<script>
@@ -43,6 +49,12 @@
channelList: {
type: Array,
default () {}
},
siteInfo:{
type: Object,
default: () => {
return {}
}
}
},
data() {
@@ -124,7 +136,7 @@
}
</script>
<style scoped>
<style scoped lang="scss">
.site-icon {
width: 2rem;
vertical-align: middle;
@@ -133,4 +145,19 @@
.my-tag {
padding: 0 12rpx;
}
.activity {
margin-top: 15rpx;
display: flex;
width: 45%;
border:2rpx solid #fbbd0850;
// border-radius: 10rpx;
.content {
flex: 1;
padding: 10rpx 20rpx;
line-height: 36rpx;
// min-height: 80rpx;
color: #fbbd08;
}
}
</style>

2
BagStation/pages/stationDetail/stationDetail.vue
View File

@@ -65,7 +65,7 @@
</view>
<!-- 价格 -->
<price-tab @onChangeChannelCode="getChannelCode" @onChangePayQr="onChangePayQr" @onChangePay="onChangePay"
:channel-list="siteInfo.oilSiteChannelDetailsVos"></price-tab>
:channel-list="siteInfo.oilSiteChannelDetailsVos" :siteInfo="siteInfo"></price-tab>
<!-- 客户评价 -->

110
components/site-item/site-item.vue
View File

@@ -1,15 +1,23 @@
<template>
<view class="cu-item cur padding no-mr-border site-item" :style="{height:siteItem.oilProductCodeAndPrices?siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':'': ''}">
<view class="cu-avatar radius lg "
<!-- :style="{height:siteItem.oilProductCodeAndPrices?siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':'': ''}" -->
<view class="site-item">
<view class="radius"
:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
</view>
<view class="content">
<view class="action">
<view class="text-grey text-sm " style="padding-top: 6rpx;">
<!-- <my-icon iconName="sy-der-icon.png" class="padding-right-xs text-sm"></my-icon> -->
{{siteItem.juli|distanceFilter}}
</view>
</view>
<view>
<view class="text-cut text-black text-lg padding-right-sm ">{{siteItem.siteName}}</view>
</view>
<view class="listTages">
<!-- <view v-if="siteItem.siteLevel" class=" cu-tag round bg-self--dark-yellow yu-tag text-xs">{{siteItem.siteLevel}}级</view> -->
<view class="cu-tag round bg-self-yellow yu-tag text-xs" :class="siteItem.channelCode=='XOIL'?'tag-red':''">{{siteItem.listTag|channelCodeFamt}}
<view class="cu-tag round bg-self-yellow yu-tag text-xs"
:class="siteItem.channelCode=='XOIL'?'tag-red':''">{{siteItem.listTag|channelCodeFamt}}
</view>
<view class="cu-tag round bg-self--dark-yellow yu-tag text-xs" v-show="first">距离最近</view>
</view>
@@ -18,8 +26,9 @@
{{siteItem.address}}
</view>
</view>
<view class="text-gray flex" style="width: calc(100% + 30%);display: flex;flex-wrap: wrap;">
<view v-if="listHeight" class="youpin" style="" v-for="(item,index) in siteItem.oilProductCodeAndPrices">
<view class="text-gray flex" style="display: flex;flex-wrap: wrap;">
<view v-if="listHeight" class="youpin" style=""
v-for="(item,index) in siteItem.oilProductCodeAndPrices">
<view class="text-bold yellow-oil text-xl padding-right-xs">
{{item.oilProductCode}}
</view>
@@ -44,18 +53,18 @@
<!-- <my-icon iconName="￥.png" class="padding-right-xs icon-rectangle"></my-icon>
<my-icon iconName="f.png" class="padding-right-xs "></my-icon> -->
</view>
</view>
<view class="activity" v-if="siteItem.activitySwitch">
<view class="title">活动</view>
<view class="content">
{{siteItem.activityContent}}
</view>
</view>
<view class="action">
<view class="text-grey text-sm " style="padding-top: 6rpx;">
<!-- <my-icon iconName="sy-der-icon.png" class="padding-right-xs text-sm"></my-icon> -->
{{siteItem.juli|distanceFilter}}
</view>
</view>
</view>
</template>
@@ -70,16 +79,16 @@
type: Boolean,
default: false
},
listHeight:{
type:Number,
default:0
listHeight: {
type: Number,
default: 0
}
},
data() {
return {
starUrl: this.global.starUrl,
defaultLogo:'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png',
audioUrl:''
defaultLogo: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png',
audioUrl: ''
}
},
methods: {
@@ -110,7 +119,7 @@
distanceFilter(value) {
if (value) {
return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm')
}else{
} else {
return '0.00km'
}
},
@@ -125,20 +134,43 @@
}
</script>
<style scoped>
<style scoped lang="scss">
.site-item {
margin-bottom: 1.8rem;
position: relative;
display: flex;
align-items: flex-start !important;
height: 150rpx!important;
padding: 25rpx;
// margin-bottom: 1.8rem;
line-height: 1.5rem;
.content {
flex: 1;
overflow: hidden;
.action {
position: absolute;
right: 35rpx;
top: 24rpx;
}
}
.yellow-oil{
>.radius {
margin-right: 30rpx;
width: 96rpx;
height: 96rpx;
font-size: 2em;
background-size: 100% 100%;
}
}
.yellow-oil {
color: #e8775a;
}
.cu-avatar{
background-color: transparent !important;
}
.youpin{
.youpin {
border: 1px solid #e4e4e4;
display: flex;
border-radius: 5px;
@@ -146,7 +178,33 @@
margin-right: 5px;
margin-bottom: 5px;
}
.text-xl{
.text-xl {
font-size: 30rpx;
}
.activity {
display: flex;
width: 85%;
// padding: 10rpx 20rpx;
border: 2rpx solid #FF8C00;
border-radius: 10rpx;
.title {
width: 20%;
padding: 10rpx 0;
line-height: 36rpx;
text-align: center;
color: #FF8C00;
background: #FF8C0030;
}
.content {
flex: 1;
padding: 10rpx 20rpx;
line-height: 36rpx;
min-height: 80rpx;
color: #FFA500;
}
}
</style>