github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 免费套餐支持购买

v2
xiaojunnuo 2024-12-25 17:05:24 +08:00
parent fe4786e168
commit f5ec9870fd
14 changed files with 158 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/ui/certd-client/src/store/modules/settings.ts
View File

@ -122,12 +122,11 @@ export const useSettingStore = defineStore({
};
return vipLabelMap[this.plusInfo?.vipType || "free"];
},
// @ts-ignore
getHeaderMenus() {
getHeaderMenus(): { menus: any[] } {
// @ts-ignore
return this.headerMenus?.menus || { menus: [] };
},
isSuiteEnabled() {
isSuiteEnabled(): boolean {
// @ts-ignore
return this.suiteSetting?.enabled === true;
}

8
packages/ui/certd-client/src/views/certd/suite/api.ts
View File

@ -52,6 +52,14 @@ export async function TradeCreate(form: TradeCreateReq) {
});
}
export async function TradeCreateFree(form: TradeCreateReq) {
return await request({
url: "/suite/trade/createFree",
method: "POST",
data: form
});
}
export async function GetPaymentTypes() {
return await request({
url: "/suite/trade/payments",

15
packages/ui/certd-client/src/views/certd/suite/buy.vue
View File

@ -35,6 +35,7 @@ import { ref } from "vue";
import * as api from "./api";
import ProductInfo from "/@/views/certd/suite/product-info.vue";
import OrderModal from "/@/views/certd/suite/order-modal.vue";
import { notification } from "ant-design-vue";
const suites = ref([]);
const addons = ref([]);
@ -48,6 +49,20 @@ async function loadProducts() {
loadProducts();
const orderModalRef = ref<any>(null);
async function doOrder(req: any) {
if (req.price === 0) {
//如果是0，直接请求创建订单
await api.TradeCreateFree({
productId: req.productId,
duration: req.duration,
num: 1,
payType: "free"
});
notification.success({
message: "套餐购买成功"
});
return;
}
await orderModalRef.value.open({
...req
});

2
packages/ui/certd-client/src/views/certd/suite/mine/crud.tsx
View File

@ -263,7 +263,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
userSuite: compute(({ row }) => {
return row;
}),
currentSuite: context.detail
currentSuite: context.currentSuite
},
conditionalRender: {
match() {

11
packages/ui/certd-client/src/views/certd/suite/mine/index.vue
View File

@ -15,7 +15,7 @@
</template>
<script lang="ts" setup>
import { onActivated, onMounted, ref } from "vue";
import { computed, onActivated, onMounted, ref } from "vue";
import { useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud";
import api, { SuiteDetail } from "/@/views/certd/suite/mine/api";
@ -25,7 +25,14 @@ defineOptions({
name: "MySuites"
});
const detail = ref<SuiteDetail>({});
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { detail } });
const currentSuite = computed(() => {
if (detail.value?.suites && detail.value.suites.length > 0) {
return detail.value.suites[0];
}
return null;
});
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { detail, currentSuite } });
async function loadSuiteDetail() {
detail.value = await api.SuiteDetailGet();

2
packages/ui/certd-client/src/views/certd/suite/product-info.vue
View File

@ -80,7 +80,7 @@ const productTypeDictRef = dict({
const emit = defineEmits(["order"]);
async function doOrder() {
emit("order", { product: props.product, productId: props.product.id, duration: selected.value.duration });
emit("order", { product: props.product, productId: props.product.id, duration: selected.value.duration, price: selected.value.price });
}
</script>

9
packages/ui/certd-client/src/views/certd/trade/crud.tsx
View File

@ -162,7 +162,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
]
}),
column: {
width: 100
width: 100,
align: "center"
}
},
payType: {
@ -173,14 +174,16 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
data: [
{ label: "聚合支付", value: "yizhifu" },
{ label: "支付宝", value: "alipay" },
{ label: "微信", value: "wxpay" }
{ label: "微信", value: "wxpay" },
{ label: "免费", value: "free" }
]
}),
column: {
width: 100,
component: {
color: "auto"
}
},
align: "center"
}
},
payTime: {

4
packages/ui/certd-client/src/views/framework/home/dashboard/suite-card.vue
View File

@ -36,8 +36,8 @@
</span>
<span>(<expires-time-text :value="item.expiresTime" />)</span>
</a-tag>
<div class="flex-o ml-5">
暂无套餐 <a-button v-if="detail.suites?.length === 0" class="ml-5" type="primary" size="small" @click="goBuy">去购买</a-button>
<div v-if="detail.suites?.length === 0" class="flex-o ml-5">
暂无套餐 <a-button class="ml-5" type="primary" size="small" @click="goBuy">去购买</a-button>
</div>
</div>
</a-popover>

1
packages/ui/certd-client/src/views/sys/suite/setting/index.vue
View File

@ -17,6 +17,7 @@
<div style="height: 400px">
<ProductManager @refreshed="onTableRefresh"></ProductManager>
</div>
<div class="helper">不建议设置免费套餐，可以在下方配置注册赠送套餐</div>
</a-form-item>
<a-form-item label="注册赠送套餐" name="registerGift">

4
packages/ui/certd-client/src/views/sys/suite/setting/suite-duration-selector.vue
View File

@ -7,6 +7,10 @@ import { ref, watch } from "vue";
import { dict } from "@fast-crud/fast-crud";
import { request } from "/@/api/service";
defineOptions({
name: "SuiteDurationSelector"
});
const props = defineProps<{
modelValue?: {
productId?: number;

12
packages/ui/certd-client/src/views/sys/suite/trade/crud.tsx
View File

@ -155,7 +155,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
component: {
name: DurationValue,
vModel: "modelValue"
}
},
align: "center"
}
},
amount: {
@ -182,7 +183,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
]
}),
column: {
width: 100
width: 100,
align: "center"
}
},
payType: {
@ -193,14 +195,16 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
data: [
{ label: "聚合支付", value: "yizhifu" },
{ label: "支付宝", value: "alipay" },
{ label: "微信", value: "wxpay" }
{ label: "微信", value: "wxpay" },
{ label: "免费", value: "free" }
]
}),
column: {
width: 100,
component: {
color: "auto"
}
},
align: "center"
}
},
payTime: {

17
packages/ui/certd-client/src/views/sys/suite/user-suite/api.ts
View File

@ -1,8 +1,7 @@
import { request } from "/src/api/service";
export function createApi() {
const apiPrefix = "/sys/suite/user-suite";
return {
const apiPrefix = "/sys/suite/user-suite";
export const sysUserSuiteApi = {
async GetList(query: any) {
return await request({
url: apiPrefix + "/page",
@ -55,8 +54,12 @@ export function createApi() {
method: "post",
data: { ids }
});
},
async PresentSuite(form: any) {
return await request({
url: apiPrefix + "/presentSuite",
method: "post",
data: form
});
}
};
}
export const pipelineGroupApi = createApi();
};

60
packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx
View File

@ -1,15 +1,14 @@
import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
import { pipelineGroupApi } from "./api";
import { sysUserSuiteApi } from "./api";
import { useRouter } from "vue-router";
import SuiteValueEdit from "/@/views/sys/suite/product/suite-value-edit.vue";
import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
import dayjs from "dayjs";
import createCrudOptionsUser from "/@/views/sys/authority/user/crud";
import UserSuiteStatus from "/@/views/certd/suite/mine/user-suite-status.vue";
import SuiteDurationSelector from "../setting/suite-duration-selector.vue";
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const api = pipelineGroupApi;
const api = sysUserSuiteApi;
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
return await api.GetList(query);
};
@ -26,7 +25,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
const addRequest = async (req: AddReq) => {
const { form } = req;
const res = await api.AddObj(form);
const res = await api.PresentSuite(form);
return res;
};
@ -57,16 +56,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
},
actionbar: {
buttons: {
add: { show: false }
// buy: {
// text: "购买",
// type: "primary",
// click() {
// router.push({
// path: "/certd/suite/buy"
// });
// }
// }
add: { text: "赠送套餐" }
}
},
toolbar: { show: false },
@ -112,7 +102,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
show: true
},
form: {
rules: [{ required: true, message: "此项必填" }]
show: false
},
column: {
width: 200
@ -143,6 +133,27 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
}
}
},
//赠送
presentSuiteId: {
title: "赠送套餐",
type: "dict-select",
column: { show: false },
addForm: {
component: {
name: SuiteDurationSelector,
vModel: "modelValue"
},
rules: [{ required: true, message: "请选择套餐" }]
},
valueResolve({ form, value }) {
if (value) {
const arr = value.splict("_");
form.productId = parseInt(arr[0]);
form.duration = parseInt(arr[1]);
}
},
form: { show: false }
},
productType: {
title: "类型",
type: "dict-select",
@ -158,7 +169,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
]
}),
form: {
rules: [{ required: true, message: "此项必填" }]
show: false
},
column: {
width: 80,
@ -179,6 +190,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "域名数量",
type: "text",
form: {
show: false,
key: ["content", "maxDomainCount"],
component: {
name: SuiteValueEdit,
@ -201,6 +213,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "流水线数量",
type: "text",
form: {
show: false,
key: ["content", "maxPipelineCount"],
component: {
name: SuiteValueEdit,
@ -223,6 +236,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "部署次数",
type: "text",
form: {
show: false,
key: ["content", "maxDeployCount"],
component: {
name: SuiteValueEdit,
@ -248,6 +262,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "证书监控数量",
type: "text",
form: {
show: false,
key: ["content", "maxMonitorCount"],
component: {
name: SuiteValueEdit,
@ -269,7 +284,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
duration: {
title: "时长",
type: "text",
form: {},
form: { show: false },
column: {
component: {
name: DurationValue,
@ -304,11 +319,17 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
type: "date",
column: {
width: 150
},
form: {
show: false
}
},
expiresTime: {
title: "过期时间",
type: "date",
form: {
show: false
},
column: {
width: 150,
component: {
@ -328,7 +349,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
]
}),
form: {
value: true
value: true,
show: false
},
column: {
width: 100,

4
packages/ui/certd-client/src/views/sys/suite/user-suite/index.vue
View File

@ -11,10 +11,10 @@
</template>
<script lang="ts" setup>
import { defineComponent, onActivated, onMounted } from "vue";
import { onActivated, onMounted } from "vue";
import { useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud";
import { createApi } from "./api";
defineOptions({
name: "UserSuites"
});