11

components/tradeActivity/tradeIndex.vue

@@ -30,32 +30,19 @@
 						<view class="waterfall-item-img-wrap">
 							<image class="waterfall-item-img" :src="item.CoverImg" mode="widthFix" lazy-load />
 							<view class="waterfall-item-tag" v-if="item.DataType">
+								<template v-if="item.DataType==1&&item.ProjectTypeName!=''">
+									{{ item.ProjectTypeName }}
+								</template>
+								<template v-else>
 									{{ getTypeName(item.DataType) }}
+								</template>
 							</view>
 						</view>
 						<view class="waterfall-item-body">
 							<view class="waterfall-item-name">{{ item.DataName }}</view>
-							<!-- 品牌信息 -->
-							<view class="waterfall-item-brand" v-if="item.DataType==3">
-								<view class="brand-icon">
-									<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 v-if="item.DataType==3||item.DataType==1">
+								<text class="item-address" v-if="item.DataType==1">{{item.Address}}</text>
+								<text class="item-brand" v-else>{{item.FullBrandName}}</text>
 							</view>
 						</view>
 					</view>
@@ -66,17 +53,19 @@
 						<view class="waterfall-item-img-wrap">
 							<image class="waterfall-item-img" :src="item.CoverImg" mode="widthFix" lazy-load />
 							<view class="waterfall-item-tag" v-if="item.DataType">
+								<template v-if="item.DataType==1&&item.ProjectTypeName!=''">
+									{{ item.ProjectTypeName }}
+								</template>
+								<template v-else>
 									{{ getTypeName(item.DataType) }}
+								</template>
 							</view>
 						</view>
 						<view class="waterfall-item-body">
 							<view class="waterfall-item-name">{{ item.DataName }}</view>
-							<view v-if="item.DataType==3">
-								{{item.FullBrandName}}
-							</view>
-							<view v-if="item.DataType==1">
-								{{item.ProjectTypeName}}
-								地址图标:{{item.Address}}
+							<view v-if="item.DataType==3||item.DataType==1">
+								<text class="item-address" v-if="item.DataType==1">{{item.Address}}</text>
+								<text class="item-brand" v-else>{{item.FullBrandName}}</text>
 							</view>
 						</view>
 					</view>
@@ -382,6 +371,18 @@
 		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 {
 		display: flex;
 		align-items: center;