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

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/zhongPin into caolc

Browse Source
This commit is contained in:
caolc
2023-07-05 18:41:41 +08:00
parent 27694e14f4 ec08020202
commit 47600ad2b5
10 changed files with 178 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,9 @@
<template>
<<<<<<< HEAD
<view class="cu-item cur padding no-mr-border site-item" >
=======
<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':''}">
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
<view class="cu-avatar radius lg "
:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
</view>