更新

ghsApp/src/admin/custom/balanceChange.vue

@@ -19,10 +19,10 @@
 						<t-td align="center" color="info"><view >{{ parseFloat(item.balance) }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.remark }}</view></t-td>
 					</t-tr>
-					<t-tr v-if="Number(item.clearId)>0 || Number(item.clearAmount)>0 || Number(item.becomeBalance)>0">
+					<t-tr v-if="Number(item.clearId)>0 && Number(item.clearAmount)>0">
 						<t-td align="left" color="info" :colspan="6">
-							<view v-if="Number(item.clearId)>0" @click.stop="goClear(item)">结账单 {{ item.clearSn }} 销账{{ item.clearAmount ? parseFloat(item.clearAmount) : 0 }}元</view>
-							<view v-if="Number(item.clearAmount)>0 && Number(item.becomeBalance)>0">充值后剩余可用余额 {{ parseFloat(item.becomeBalance) }}元</view>
+							<view @click.stop="goClear(item)">结账单 {{ item.clearSn }} {{ parseFloat(item.clearAmount) }}元</view>
+							<view v-if="Number(item.becomeBalance)>0">余额 {{ parseFloat(item.becomeBalance) }}元</view>
 						</t-td>
 					</t-tr>
 				</view>
@@ -55,6 +55,13 @@ export default {
 				return
 			}
 			let currentList = res.data.list
+			// 充值销账：结账信息挂在充值行下，隐藏单独的「结账 -X」流水（对照 hd，历史数据兼容）
+			currentList = currentList.filter(function(item) {
+				if (item.io == 0 && item.event && String(item.event).indexOf('结账') === 0) {
+					return false
+				}
+				return true
+			})
 			currentList.forEach(function(item,index,array){
 				array[index].amount = item.io == 0 ? '-'+parseFloat(item.amount) : '+'+parseFloat(item.amount)
 			});

ghsApp/src/pagesArrears/detailsItem.vue

@@ -12,9 +12,12 @@
 				<view class="mark">{{ info.payTime?info.payTime.substr(5,11):'' }}</view>
 			</view>
 			<view class="item-row">
-				<view class="price">¥{{ parseFloat(info.remainDebtPrice) }}</view>
+				<view :class="[Number(info.debtPrice)>Number(info.remainDebtPrice) ? 'price-del' : 'price']">¥{{ parseFloat(info.debtPrice || info.remainDebtPrice) }}</view>
 				<view class="price" style="border:1upx solid #67a0f7;border-radius:10upx;font-weight:normal;color:#3385FF;font-size:32upx;width:180upx;height:80upx;justify-content:center;" @click.stop="goToDetai(info)">查看明细</view>
 			</view>
+			<view class="item-row" v-if="Number(info.debtPrice)>Number(info.remainDebtPrice)">
+				<view class="price" style="color:red;">已清 ¥{{ info.hasPayDebt }}，剩余待结 ¥{{ parseFloat(info.remainDebtPrice) }}</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -107,6 +110,14 @@ export default {
 				color: #999999;
 			}
 		}
+		.price-del {
+			display: flex;
+			align-items: center;
+			font-size: 28upx;
+			font-weight: 600;
+			color: #333333;
+			text-decoration: line-through;
+		}
 	}
 }
 </style>