Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	pages/user/contractLook/inventoryCost.vue

pages/user/contractLook/inventoryCost.vue

@@ -13,8 +13,8 @@
 					<view class="font">价值（元）</view>
 				</view>
 				<view class="goods-table-content" v-for="(item1,index1) in item.goodList">
-					<view class="font">{{item1.goodsName}}</view>
-					<view class="font">{{item1.storage}}</view>
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">{{item1.goodsName}}</view>
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">{{item1.storage}}</view>
 					<view class="font">{{item1.cost}}</view>
 				</view>
 			</view>
@@ -182,6 +182,10 @@
 </script>
 
 <style scoped lang="scss">
+	.active{
+		font-size: 32rpx;
+		font-weight: 700;
+	}
 	.modal-row {
 		display: flex;
 		justify-content: space-between;