Skip to content

M
mallapp
Commit 04381314 authored by 吴春's avatar 吴春
Browse files
Options

11

parent e4ae8266
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 29 deletions
components/tradeActivity/tradeIndex.vue
View file @ 04381314
...@@ -30,32 +30,19 @@ ...@@ -30,32 +30,19 @@
<view class="waterfall-item-img-wrap"> <view class="waterfall-item-img-wrap">
<image class="waterfall-item-img" :src="item.CoverImg" mode="widthFix" lazy-load /> <image class="waterfall-item-img" :src="item.CoverImg" mode="widthFix" lazy-load />
<view class="waterfall-item-tag" v-if="item.DataType"> <view class="waterfall-item-tag" v-if="item.DataType">
{{ getTypeName(item.DataType) }} <template v-if="item.DataType==1&&item.ProjectTypeName!=''">
{{ item.ProjectTypeName }}
</template>
<template v-else>
{{ getTypeName(item.DataType) }}
</template>
</view> </view>
</view> </view>
<view class="waterfall-item-body"> <view class="waterfall-item-body">
<view class="waterfall-item-name">{{ item.DataName }}</view> <view class="waterfall-item-name">{{ item.DataName }}</view>
<!-- 品牌信息 --> <view v-if="item.DataType==3||item.DataType==1">
<view class="waterfall-item-brand" v-if="item.DataType==3"> <text class="item-address" v-if="item.DataType==1">{{item.Address}}</text>
<view class="brand-icon"> <text class="item-brand" v-else>{{item.FullBrandName}}</text>
<text class="iconfont icon-shangbiao"></text>
</view>
<text class="brand-name">{{item.FullBrandName}}</text>
</view>
<!-- 项目信息 -->
<view class="waterfall-item-project" v-if="item.DataType==1">
<view class="project-type">
<view class="type-icon">
<text class="iconfont icon-leixing"></text>
</view>
<text class="type-name">{{item.ProjectTypeName}}</text>
</view>
<view class="project-address" v-if="item.Address">
<view class="address-icon">
<text class="iconfont icon-dizhi"></text>
</view>
<text class="address-text">{{item.Address}}</text>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -66,17 +53,19 @@ ...@@ -66,17 +53,19 @@
<view class="waterfall-item-img-wrap"> <view class="waterfall-item-img-wrap">
<image class="waterfall-item-img" :src="item.CoverImg" mode="widthFix" lazy-load /> <image class="waterfall-item-img" :src="item.CoverImg" mode="widthFix" lazy-load />
<view class="waterfall-item-tag" v-if="item.DataType"> <view class="waterfall-item-tag" v-if="item.DataType">
{{ getTypeName(item.DataType) }} <template v-if="item.DataType==1&&item.ProjectTypeName!=''">
{{ item.ProjectTypeName }}
</template>
<template v-else>
{{ getTypeName(item.DataType) }}
</template>
</view> </view>
</view> </view>
<view class="waterfall-item-body"> <view class="waterfall-item-body">
<view class="waterfall-item-name">{{ item.DataName }}</view> <view class="waterfall-item-name">{{ item.DataName }}</view>
<view v-if="item.DataType==3"> <view v-if="item.DataType==3||item.DataType==1">
{{item.FullBrandName}} <text class="item-address" v-if="item.DataType==1">{{item.Address}}</text>
</view> <text class="item-brand" v-else>{{item.FullBrandName}}</text>
<view v-if="item.DataType==1">
{{item.ProjectTypeName}}
地址图标:{{item.Address}}
</view> </view>
</view> </view>
</view> </view>
...@@ -382,6 +371,18 @@ ...@@ -382,6 +371,18 @@
margin-bottom: 12rpx; margin-bottom: 12rpx;
} }
.item-address {
font-size: 24rpx;
color: #888;
line-height: 1.4;
}
.item-brand {
font-size: 24rpx;
color: #888;
line-height: 1.4;
}
.waterfall-item-meta { .waterfall-item-meta {
display: flex; display: flex;
align-items: center; align-items: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment