关闭在线退款

src/modules/dj/views/balance.vue

@@ -76,6 +76,10 @@ const items = ref<ClForm.Item[]>([
 				{
 					label: "内充",
 					value: 4
+				},
+				{
+					label: "退款",
+					value: 5
 				}
 			]
 		}
@@ -109,7 +113,8 @@ const Table = useTable({
 				{ label: "代收", value: 1, color: "#67C23A" },
 				{ label: "下发", value: 2, color: "#F56C6C" },
 				{ label: "冲正", value: 3, color: "#e6a23c" },
-				{ label: "内充", value: 4, color: "#67C23A" }
+				{ label: "内充", value: 4, color: "#67C23A" },
+				{ label: "退款", value: 5, color: "#F56C6C" }
 			]
 		},
 		{ prop: "amount", label: "金额" },

src/modules/dj/views/order.vue

@@ -438,16 +438,25 @@ const Table = useTable({
 			width: checkPerm(service.dj.order.permission.update) ? 210 : 120,
 			buttons({ scope }) {
 				const btns = [];
+				if (checkPerm(service.dj.order.permission.update)) {
+					btns.push({
+						label: "标记成功",
+						type: "danger",
+						onClick({ scope }: any) {
+							Upsert.value?.edit(scope.row);
+						}
+					});
+				}
 				if (+scope.row.status === 1) {
-					if (checkPerm(service.dj.order.permission.toRefund)) {
-						btns.push({
-							label: "退款",
-							type: "danger",
-							async onClick({ scope }: any) {
-								openRefund(scope.row)
-							}
-						});
-					}
+					// if (checkPerm(service.dj.order.permission.toRefund)) {
+					// 	btns.push({
+					// 		label: "退款",
+					// 		type: "danger",
+					// 		async onClick({ scope }: any) {
+					// 			openRefund(scope.row)
+					// 		}
+					// 	});
+					// }
 					if (checkPerm(service.dj.order.permission.notify)) {
 						btns.push({
 							label: "补发通知",
@@ -466,15 +475,6 @@ const Table = useTable({
 						});
 					}
 				} else {
-					if (checkPerm(service.dj.order.permission.update)) {
-						btns.push({
-							label: "标记成功",
-							type: "danger",
-							onClick({ scope }: any) {
-								Upsert.value?.edit(scope.row);
-							}
-						});
-					}
 					if (checkPerm(service.dj.order.permission.query)) {
 						btns.push({
 							label: "API查单",

src/modules/dj/views/refund.vue

@@ -196,7 +196,7 @@ const Table = useTable({
 			prop: "date",
 			label: "退款时间",
 			width: 155,
-			component: { name: "cl-date-text", props: { format: "YYYY-MM-DD" } }
+			component: { name: "cl-date-text", props: { format: "YYYY-MM-DD HH:mm:ss" } }
 		},
 		{ prop: "refundTraceNo", label: "退款交易号", showOverflowTooltip: true, width: 120 },
 		{ prop: "outOrderNo", label: "商户订单号", showOverflowTooltip: true, width: 120 },

src/modules/dj/views/wallet.vue

@@ -145,7 +145,7 @@ const Table = useTable({
 		{ prop: "freeze", label: "冻结中余额", sortable: "custom", },
 		{
 			prop: "use", label: "可提现余额", sortable: "custom", formatter(row) {
-				return (+row.balance - +row.freeze).toFixed(2);
+				return (+row.balance - Math.abs(+row.freeze)).toFixed(2);
 			}
 		},
 		{ prop: "updateTime", label: "更新时间", sortable: "custom", width: 160 },