+
{{ $t("certd.order.description") }}：{{ product.intro }}
-
+
{{ $t("certd.order.specifications") }}：
-
- {{ $t("certd.order.pipeline") }}；
- {{ $t("certd.order.totalDomain") }}；
-
- - {{ $t("certd.order.includedWildcardDomain") }}；
-
- {{ $t("certd.order.deployTimes") }}；
- {{ $t("certd.order.monitorCount") }}；
-
+
+
+
{{ $t("certd.order.totalDomain") }}
+
+
+
+
{{ $t("certd.order.includedWildcardDomain") }}
+
+
+
+
{{ $t("certd.order.pipeline") }}
+
+
+
+
{{ $t("certd.order.deployTimes") }}
+
+
+
+
{{ $t("certd.order.monitorCount") }}
+
+
+
@@ -26,10 +39,10 @@
{{ $t("certd.order.price") }}：
-
+
-
返利抵扣：
+
余额抵扣：
可用 {{ amountToYuan(wallet.availableAmount) }} 元，预计抵扣 {{ amountToYuan(expectedRebateAmount) }} 元
@@ -58,7 +71,7 @@ import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
import { useRouter } from "vue-router";
import qrcode from "qrcode";
import * as api from "/@/views/certd/suite/api";
-import { GetMyInvite } from "/@/views/certd/invite/api";
+import { GetWalletSummary } from "/@/views/certd/wallet/api";
import { util } from "/@/utils";
const openRef = ref(false);
@@ -77,8 +90,7 @@ async function open(opts: OrderModalOpenReq) {
formRef.value.num = opts.num ?? 1;
formRef.value.useRebateBalance = false;
try {
- const inviteInfo: any = await GetMyInvite();
- wallet.value = inviteInfo.wallet || { availableAmount: 0 };
+ wallet.value = await GetWalletSummary();
} catch (e) {
wallet.value = { availableAmount: 0 };
}
@@ -261,6 +273,10 @@ defineExpose({
diff --git a/packages/ui/certd-client/src/views/certd/trade/api.ts b/packages/ui/certd-client/src/views/certd/trade/api.ts
index ddc9d4b89..e32147f71 100644
--- a/packages/ui/certd-client/src/views/certd/trade/api.ts
+++ b/packages/ui/certd-client/src/views/certd/trade/api.ts
@@ -26,11 +26,11 @@ export async function UpdateObj(obj: any) {
});
}
-export async function DelObj(id: any) {
+export async function CancelObj(id: any) {
return await request({
- url: apiPrefix + "/delete",
+ url: apiPrefix + "/cancel",
method: "post",
- params: { id },
+ data: { id },
});
}
@@ -50,14 +50,6 @@ export async function GetDetail(id: any) {
});
}
-export async function DeleteBatch(ids: any[]) {
- return await request({
- url: apiPrefix + "/deleteByIds",
- method: "post",
- data: { ids },
- });
-}
-
export async function SyncStatus(id: any) {
return await request({
url: apiPrefix + "/syncStatus",
diff --git a/packages/ui/certd-client/src/views/certd/trade/crud.tsx b/packages/ui/certd-client/src/views/certd/trade/crud.tsx
index a4a1d9a9a..d1768a430 100644
--- a/packages/ui/certd-client/src/views/certd/trade/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/trade/crud.tsx
@@ -1,18 +1,10 @@
import * as api from "./api";
-import { useI18n } from "/src/locales";
-import { computed, Ref, ref } from "vue";
-import { useRouter } from "vue-router";
-import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes, utils } from "@fast-crud/fast-crud";
-import { useUserStore } from "/@/store/user";
-import { useSettingStore } from "/@/store/settings";
+import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
import { Modal } from "ant-design-vue";
import PriceInput from "/@/views/sys/suite/product/price-input.vue";
-import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
-export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
- const router = useRouter();
- const { t } = useI18n();
+export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const pageRequest = async (query: UserPageQuery): Promise
=> {
return await api.GetList(query);
};
@@ -21,56 +13,34 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
const res = await api.UpdateObj(form);
return res;
};
- const delRequest = async ({ row }: DelReq) => {
- return await api.DelObj(row.id);
- };
-
const addRequest = async ({ form }: AddReq) => {
const res = await api.AddObj(form);
return res;
};
- const userStore = useUserStore();
- const settingStore = useSettingStore();
- const selectedRowKeys: Ref = ref([]);
- context.selectedRowKeys = selectedRowKeys;
-
return {
crudOptions: {
- settings: {
- plugins: {
- //这里使用行选择插件，生成行选择crudOptions配置，最终会与crudOptions合并
- rowSelection: {
- enabled: true,
- order: -2,
- before: true,
- // handle: (pluginProps,useCrudProps)=>CrudOptions,
- props: {
- multiple: true,
- crossPage: true,
- selectedRowKeys,
- },
- },
- },
- },
request: {
pageRequest,
addRequest,
editRequest,
- delRequest,
},
rowHandle: {
- width: 240,
+ width: 120,
fixed: "right",
buttons: {
view: { show: false },
edit: { show: false },
copy: { show: false },
+ remove: { show: false },
syncStatus: {
show: compute(({ row }) => {
return row.status === "wait_pay";
}),
- text: "同步订单状态",
+ title: "同步订单状态",
+ text: null,
+ tooltip: { title: "同步订单状态" },
+ icon: "ant-design:sync-outlined",
type: "link",
click: async ({ row }) => {
Modal.confirm({
@@ -83,6 +53,28 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
});
},
},
+ cancel: {
+ show: compute(({ row }) => {
+ return row.status === "wait_pay";
+ }),
+ title: "取消订单",
+ text: null,
+ tooltip: { title: "取消订单" },
+ icon: "ion:close-circle-outline",
+ type: "link",
+ click: async ({ row }) => {
+ Modal.confirm({
+ title: "确认取消订单？",
+ content: "取消后订单会关闭，已冻结的余额抵扣金额将自动退回。",
+ okText: "确认取消",
+ cancelText: "再想想",
+ onOk: async () => {
+ await api.CancelObj(row.id);
+ await crudExpose.doRefresh();
+ },
+ });
+ },
+ },
},
},
actionbar: {
@@ -152,7 +144,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
},
},
rebateAmount: {
- title: "返利抵扣",
+ title: "余额抵扣",
type: "number",
column: {
width: 110,
@@ -201,7 +193,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
{ label: "支付宝", value: "alipay" },
{ label: "微信", value: "wxpay" },
{ label: "免费", value: "free" },
- { label: "返利余额", value: "rebate" },
+ { label: "余额抵扣", value: "rebate" },
],
}),
column: {
diff --git a/packages/ui/certd-client/src/views/certd/trade/index.vue b/packages/ui/certd-client/src/views/certd/trade/index.vue
index dae890251..a0a2fd8da 100644
--- a/packages/ui/certd-client/src/views/certd/trade/index.vue
+++ b/packages/ui/certd-client/src/views/certd/trade/index.vue
@@ -3,13 +3,7 @@
我的订单
-
-
-
-
-
-
-
+
@@ -17,31 +11,11 @@
import { onActivated, onMounted } from "vue";
import { useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud";
-import { message, Modal } from "ant-design-vue";
-import { DeleteBatch } from "./api";
defineOptions({
name: "MyTrade",
});
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
-
-const selectedRowKeys = context.selectedRowKeys;
-const handleBatchDelete = () => {
- if (selectedRowKeys.value?.length > 0) {
- Modal.confirm({
- title: "确认",
- content: `确定要批量删除这${selectedRowKeys.value.length}条记录吗`,
- async onOk() {
- await DeleteBatch(selectedRowKeys.value);
- message.info("删除成功");
- crudExpose.doRefresh();
- selectedRowKeys.value = [];
- },
- });
- } else {
- message.error("请先勾选记录");
- }
-};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
// 页面打开后获取列表数据
onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/wallet/crud-logs.tsx b/packages/ui/certd-client/src/views/certd/wallet/crud-logs.tsx
index 481362d8a..f32fe4d4f 100644
--- a/packages/ui/certd-client/src/views/certd/wallet/crud-logs.tsx
+++ b/packages/ui/certd-client/src/views/certd/wallet/crud-logs.tsx
@@ -1,6 +1,14 @@
import { CreateCrudOptionsRet, dict, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
import * as api from "./api";
-import PriceInput from "/@/views/sys/suite/product/price-input.vue";
+import { util } from "/@/utils";
+
+function moneyText(amount: number) {
+ const yuan = util.amount.toYuan(Math.abs(amount || 0));
+ if (amount < 0) {
+ return `-¥${yuan}`;
+ }
+ return `¥${yuan}`;
+}
export default function (): CreateCrudOptionsRet {
const pageRequest = async (query: UserPageQuery): Promise => {
@@ -24,6 +32,7 @@ export default function (): CreateCrudOptionsRet {
{ label: "收益入账", value: "income", color: "success" },
{ label: "余额抵扣", value: "consume", color: "default" },
{ label: "提现冻结", value: "withdraw_freeze", color: "warning" },
+ { label: "提现成功", value: "withdraw", color: "success" },
{ label: "提现成功", value: "withdraw_success", color: "success" },
{ label: "提现退回", value: "withdraw_reject", color: "processing" },
],
@@ -35,7 +44,10 @@ export default function (): CreateCrudOptionsRet {
type: "number",
column: {
width: 120,
- component: { name: PriceInput, vModel: "modelValue", edit: false },
+ cellRender({ value }) {
+ const amount = Number(value || 0);
+ return {moneyText(amount)};
+ },
},
},
balanceAfter: {
@@ -43,7 +55,9 @@ export default function (): CreateCrudOptionsRet {
type: "number",
column: {
width: 130,
- component: { name: PriceInput, vModel: "modelValue", edit: false },
+ cellRender({ value }) {
+ return {moneyText(Number(value || 0))};
+ },
},
},
remark: {
diff --git a/packages/ui/certd-client/src/views/sys/suite/invite/crud-level.tsx b/packages/ui/certd-client/src/views/sys/suite/invite/crud-level.tsx
index bf46273ed..69e36d4cd 100644
--- a/packages/ui/certd-client/src/views/sys/suite/invite/crud-level.tsx
+++ b/packages/ui/certd-client/src/views/sys/suite/invite/crud-level.tsx
@@ -72,6 +72,7 @@ export default function (): CreateCrudOptionsRet {
title: "升级金额",
type: "number",
form: {
+ show: compute(({ form }) => form.levelType !== "exclusive"),
component: { name: PriceInput, vModel: "modelValue", edit: true },
rules: [{ required: true, message: "请输入升级金额" }],
},
@@ -100,7 +101,7 @@ export default function (): CreateCrudOptionsRet {
}),
form: {
value: "normal",
- helper: "专属等级可由管理员手动指定，不参与普通用户自动升级。",
+ helper: "专属等级可由管理员手动指定，不参与普通用户自动升级。专属等级不会在普通用户端展示。",
},
column: { width: 120, align: "center" },
},
diff --git a/packages/ui/certd-client/src/views/sys/suite/invite/crud-user-level.tsx b/packages/ui/certd-client/src/views/sys/suite/invite/crud-user-level.tsx
index 5f90e8510..f2aef3862 100644
--- a/packages/ui/certd-client/src/views/sys/suite/invite/crud-user-level.tsx
+++ b/packages/ui/certd-client/src/views/sys/suite/invite/crud-user-level.tsx
@@ -23,7 +23,6 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
initialForm: {
userId: row.userId,
levelId: row.levelId,
- levelLocked: row.levelLocked === true,
},
columns: {
levelId: {
@@ -33,20 +32,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
form: {
col: { span: 24 },
rules: [{ required: true, message: "请选择推广等级" }],
- },
- },
- levelLocked: {
- title: "锁定等级",
- type: "dict-switch",
- dict: dict({
- data: [
- { label: "自动升级", value: false, color: "success" },
- { label: "锁定", value: true, color: "warning" },
- ],
- }),
- form: {
- col: { span: 24 },
- helper: "专属等级会自动锁定，不参与自动升级。",
+ helper: "专属等级将锁定为当前等级，普通等级将按累计推广金额自动升级。",
},
},
},
@@ -80,8 +66,17 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
},
columns: {
userId: { title: "用户ID", type: "number", search: { show: true }, column: { width: 100 } },
- username: { title: "用户名", type: "text", search: { show: true }, column: { width: 160 } },
- userDisplay: { title: "显示名称", type: "text", column: { width: 160 } },
+ username: {
+ title: "用户名",
+ type: "text",
+ search: { show: true },
+ column: {
+ width: 180,
+ cellRender({ row }) {
+ return row.simpleUser?.displayName || row.userDisplay || row.username || row.userId;
+ },
+ },
+ },
enabled: {
title: "开通状态",
type: "dict-switch",
diff --git a/packages/ui/certd-client/src/views/sys/suite/invite/level.vue b/packages/ui/certd-client/src/views/sys/suite/invite/level.vue
index b5287d740..5a7ab612d 100644
--- a/packages/ui/certd-client/src/views/sys/suite/invite/level.vue
+++ b/packages/ui/certd-client/src/views/sys/suite/invite/level.vue
@@ -33,7 +33,8 @@
佣金比例
{{ item.commissionRate || 0 }}%
-
累计推广 ≥ {{ amountToYuan(item.minAmount) }} 元
+
平台指定专属等级
+
累计推广 ≥ {{ amountToYuan(item.minAmount) }} 元
-
-
-
-
-
-
-
+
@@ -20,31 +14,11 @@
import { onActivated, onMounted } from "vue";
import { useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud";
-import { message, Modal } from "ant-design-vue";
-import { DeleteBatch } from "./api";
defineOptions({
name: "TradeManager",
});
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
-
-const selectedRowKeys = context.selectedRowKeys;
-const handleBatchDelete = () => {
- if (selectedRowKeys.value?.length > 0) {
- Modal.confirm({
- title: "确认",
- content: `确定要批量删除这${selectedRowKeys.value.length}条记录吗`,
- async onOk() {
- await DeleteBatch(selectedRowKeys.value);
- message.info("删除成功");
- crudExpose.doRefresh();
- selectedRowKeys.value = [];
- },
- });
- } else {
- message.error("请先勾选记录");
- }
-};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
// 页面打开后获取列表数据
onMounted(() => {