Просмотр исходного кода

Merge branch 'feature_业主工会' of http://192.168.4.246:3000/elab-damai-h5/h5-elab-open-ownerUnion into feature_业主工会

张文飞 3 лет назад
Родитель
Сommit
96f9f9e1cb
2 измененных файлов с 5 добавлено и 3 удалено
  1. 4 2
      pages/houseDetail/houseDetail.vue
  2. 1 1
      pages/reportPage/reportPage.vue

+ 4 - 2
pages/houseDetail/houseDetail.vue

@@ -21,7 +21,9 @@
 		</view>
 		</view>
 		<view class="sectionB">
 		<view class="sectionB">
 			<view class="item" v-for="(item, idx) in categoryList" :key="idx">
 			<view class="item" v-for="(item, idx) in categoryList" :key="idx">
-				<view class="name">{{item.categoryName}}收益</view>
+				<view class="name">
+					<text>{{item.categoryName}}</text><text v-if="idx != categoryList.length - 1">收益</text>
+				</view>
 				<view class="value">{{item.value}}</view>
 				<view class="value">{{item.value}}</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -223,7 +225,7 @@
 				})
 				})
 				this.categoryList = tempList
 				this.categoryList = tempList
 				this.categoryList.push({
 				this.categoryList.push({
-					categoryName: '可获收益',
+					categoryName: '可获收益/总活动金额',
 					value: this.dataInfo.availableIncome + '元'
 					value: this.dataInfo.availableIncome + '元'
 				})
 				})
 			},
 			},

+ 1 - 1
pages/reportPage/reportPage.vue

@@ -18,7 +18,7 @@
 					<view class="name">{{item.title}}</view>
 					<view class="name">{{item.title}}</view>
 					<view class="value">¥{{item.value}}</view>
 					<view class="value">¥{{item.value}}</view>
 					<view class="des" v-if="idx == 1">
 					<view class="des" v-if="idx == 1">
-						(续费¥{{item.subValue}})
+						(续费¥{{item.subValue}})
 					</view>
 					</view>
 					<view class="rightLine" v-if="idx < 2"></view>
 					<view class="rightLine" v-if="idx < 2"></view>
 				</view>
 				</view>