1

pages/user/contractLook/inventoryCost.vue

@@ -21,29 +21,22 @@
 					</view>
 					<view class="font">{{item1.cost}}</view>
 				</view>
-				<view v-show="(item1.cargoWeight && item1.cargoWeight != 0) || (item1.redemptionWeight && item1.redemptionWeight != 0)"
-					class="goods-table-content" v-for="(item1,index1) in item.goodList">
-					<view class="" style="width: 100%;">
-						<view class="" style="display: flex;width: 100%;">
-							<view v-if="item1.cargoWeight && item1.cargoWeight != 0" class="font"
-								:class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
-								{{item1.goodsName}}(转入)
-							</view>
-							<view v-if="item1.cargoWeight && item1.cargoWeight != 0" class="font"
-								:class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
-								{{item1.cargoWeight}}
-							</view>
-						</view>
-						<view class="" style="display: flex;padding-top: 10px;">
-							<view v-if="item1.redemptionWeight && item1.redemptionWeight != 0" class="font"
-								:class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
-								{{item1.goodsName}}(待赎回)
-							</view>
-							<view v-if="item1.redemptionWeight && item1.redemptionWeight != 0" class="font"
-								:class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
-								{{item1.redemptionWeight}}
-							</view>
-						</view>
+				<view v-show="(item1.cargoWeight && item1.cargoWeight != 0)" class="goods-table-content"
+					v-for="(item1,index1) in item.goodList">
+					<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.cargoWeight}}
+					</view>
+				</view>
+				<view v-show="(item1.redemptionWeight && item1.redemptionWeight != 0)" class="goods-table-content"
+					v-for="(item1,index1) in item.goodList">
+					<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.redemptionWeight}}
 					</view>
 				</view>
 			</view>
@@ -378,12 +371,5 @@
 				text-align: right;
 			}
 		}
-
-		// .goods-list{
-		// 	    display: block;
-		// 	.font1{
-		// 		display: flex;
-		// 	}
-		// }
 	}
 </style>