Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/hard/hard-dept-total/index.vue

@@ -113,6 +113,18 @@
 								<div :class="{ 'color-danger': row.orderRefundCont != 0 }">{{ row.orderRefundCont }}次</div>
 							</template>
 						</el-table-column>
+						<el-table-column prop="orderProfitPrice" label="盈利金额" align="center" min-width="90">
+							<template #default="{ row }">
+								<div :class="{ 'color-success': row.orderProfitPrice != 0 }">
+									{{ displayPrice(row.orderProfitPrice) }}
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column prop="orderProfitCont" label="盈利次数" align="center" min-width="90">
+							<template #default="{ row }">
+								<div :class="{ 'color-success': row.orderProfitCont != 0 }">{{ row.orderProfitCont }}次</div>
+							</template>
+						</el-table-column>
 						<el-table-column v-if="false" label="操作" width="300"> </el-table-column>
 					</el-table>
 				</template>
@@ -165,6 +177,8 @@ const getSummaries = (param: any) => {
 		"walletOnceCount",
 		"walletOnceReducePrice",
 		"walletOnceReduceCount",
+		"orderProfitPrice",
+		"orderProfitCont",
 	]
 	const totalRow = Array.from({ length: columns.length })
 	columns.forEach((i: any, index: number) => {