新增微信支付、Native支付

This commit is contained in:
gxwebsoft
2024-05-11 23:06:25 +08:00
parent 31d6517314
commit ec629c4540
18 changed files with 1121 additions and 63 deletions

View File

@@ -0,0 +1,332 @@
<!-- 编辑弹窗 -->
<template>
<ele-modal
:width="800"
:visible="visible"
:maskClosable="false"
:maxable="maxable"
:title="isUpdate ? '编辑支付方式' : '添加支付方式'"
:body-style="{ paddingBottom: '28px' }"
@update:visible="updateVisible"
@ok="save"
>
{{ form }}
<a-form
ref="formRef"
:model="form"
:rules="rules"
:label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
:wrapper-col="
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
>
<a-form-item label="支付方式" name="name">
<PayMethod
dict-code="payMethod"
v-model:value="form.name"
:placeholder="`选择支付方式`"
@change="onPayMethod"
/>
</a-form-item>
<!--微信支付-->
<template v-if="form.code == 'wxPay'">
<a-form-item label="微信商户号类型" name="wechatType">
<a-radio-group v-model:value="form.wechatType">
<a-radio :value="0">
<text>普通商户</text>
</a-radio>
<a-radio :value="1">子商户 (服务商模式)</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="应用ID" name="appId" extra="微信小程序或者微信公众号的APPID需要在哪个客户端支付就填写哪个APP支付需要填写开放平台的应用APPID">
<a-input
allow-clear
placeholder="请输入应用ID"
v-model:value="form.appId"
/>
</a-form-item>
<a-form-item label="商户号" name="mchId">
<a-input
allow-clear
placeholder="请输入商户号"
v-model:value="form.mchId"
/>
</a-form-item>
<a-form-item label="设置APIv3密钥" name="apiKey">
<a-input
allow-clear
placeholder="请输入设置APIv3密钥"
v-model:value="form.apiKey"
/>
</a-form-item>
<a-form-item label="证书文件 (CERT)" name="apiclientCert" extra="请上传 apiclient_cert.pem 文件">
<Upload accept=".crt" v-model:value="form.apiclientCert" />
{{ form.apiclientCert }}
</a-form-item>
<a-form-item label="证书文件 (KEY)" name="apiclientKey" extra="请上传 apiclient_key.pem 文件">
<Upload accept=".crt" v-model:value="form.apiclientKey" />
{{ form.apiclientKey }}
</a-form-item>
<a-form-item label="商户证书序列号" name="merchantSerialNumber">
<a-input
allow-clear
placeholder="请输入商户证书序列号"
v-model:value="form.merchantSerialNumber"
/>
</a-form-item>
</template>
<a-form-item label="支付图标" name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="备注" name="comments">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="请输入描述"
v-model:value="form.comments"
/>
</a-form-item>
<a-form-item label="排序" name="sortNumber">
<a-input-number
:min="0"
:max="9999"
class="ele-fluid"
placeholder="请输入排序号"
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="是否启用" name="status">
<a-switch v-model:checked="form.status" />
</a-form-item>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addPayment, updatePayment } from '@/api/system/payment';
import { Payment } from '@/api/system/payment/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FormInstance } from 'ant-design-vue/es/form';
import { FileRecord } from '@/api/system/file/model';
import Upload from "@/components/UploadCert/index.vue";
import { uploadFile } from "@/api/system/file";
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const { styleResponsive } = storeToRefs(themeStore);
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: Payment | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
const images = ref<ItemType[]>([]);
// 用户信息
const form = reactive<Payment>({
id: 0,
name: undefined,
code: '',
image: '',
wechatType: 0,
appId: '',
mchId: '',
apiKey: '',
apiclientCert: '',
apiclientKey: '',
merchantSerialNumber: '',
comments: '',
sortNumber: 0,
status: undefined,
tenantId: undefined,
createTime: ''
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
name: [
{
required: true,
type: 'string',
message: '请填写支付方式名称',
trigger: 'blur'
}
],
appId: [
{
required: true,
type: 'string',
message: '请填写应用ID',
trigger: 'blur'
}
],
mchId: [
{
required: true,
type: 'string',
message: '请填写商户号',
trigger: 'blur'
}
],
wechatType: [
{
required: true,
type: 'number',
message: '请选择商户类型',
trigger: 'blur'
}
],
apiKey: [
{
required: true,
type: 'string',
message: '请填写APIv3密钥',
trigger: 'blur'
}
],
// apiclientCert: [
// {
// required: true,
// type: 'string',
// message: '请上传证书文件(CERT)',
// trigger: 'blur'
// }
// ],
// apiclientKey: [
// {
// required: true,
// type: 'string',
// message: '请上传证书文件(KEY)',
// trigger: 'blur'
// }
// ],
merchantSerialNumber: [
{
required: true,
type: 'string',
message: '请填写商户证书序列号',
trigger: 'blur'
}
]
});
const chooseImage = (data: FileRecord) => {
console.log(data);
images.value.push({
uid: data.id,
url: data.thumbnail,
status: 'done'
});
form.image = data.thumbnail;
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.image = '';
};
const onPayMethod = (value: string, item: any) => {
form.name = item.label
form.code = item.value
}
const onUpload = (d: ItemType) => {
uploadFile(<File>d.file)
.then((result) => {
form.image = result.path;
message.success("上传成功");
})
.catch((e) => {
message.error(e.message);
});
};
const { resetFields } = useForm(form, rules);
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updatePayment : addPayment;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {});
};
watch(
() => props.visible,
(visible) => {
if (visible) {
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
}
isUpdate.value = true;
} else {
isUpdate.value = false;
}
} else {
resetFields();
}
},
{ immediate: true }
);
</script>

View File

@@ -0,0 +1,42 @@
<!-- 搜索表单 -->
<template>
<a-space :size="10" style="flex-wrap: wrap">
<a-button type="primary" class="ele-btn-icon" @click="add">
<template #icon>
<PlusOutlined />
</template>
<span>添加</span>
</a-button>
</a-space>
</template>
<script lang="ts" setup>
import { PlusOutlined } from '@ant-design/icons-vue';
import type { GradeParam } from '@/api/user/grade/model';
import { watch } from 'vue';
const props = withDefaults(
defineProps<{
// 选中的角色
selection?: [];
}>(),
{}
);
const emit = defineEmits<{
(e: 'search', where?: GradeParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'batchMove'): void;
}>();
// 新增
const add = () => {
emit('add');
};
watch(
() => props.selection,
() => {}
);
</script>

View File

@@ -0,0 +1,252 @@
<template>
<div class="page">
<div class="ele-body">
<a-card :bordered="false" :body-style="{ padding: '16px' }">
<ele-pro-table
ref="tableRef"
row-key="id"
:columns="columns"
:datasource="datasource"
:customRow="customRow"
tool-class="ele-toolbar-form"
class="sys-org-table"
>
<template #toolbar>
<search
@search="reload"
:selection="selection"
@add="openEdit"
@remove="removeBatch"
@batchMove="openMove"
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'name'">
<a-space class="ele-cell">
<a-avatar :src="record.image" size="small" shape="square" />
<span class="ele-text-secondary">{{ record.name }}</span>
</a-space>
</template>
<template v-if="column.key === 'code'">
<span class="ele-text-secondary">{{ record.code }}</span>
</template>
<template v-if="column.key === 'status'">
<a-switch
v-model:checked="record.status"
@change="updateStatus(record)"
/>
</template>
<template v-if="column.key === 'action'">
<a-space>
<a @click="openEdit(record)">修改</a>
<a-divider type="vertical" />
<a-popconfirm
title="确定要删除此记录吗?"
@confirm="remove(record)"
>
<a class="ele-text-danger">删除</a>
</a-popconfirm>
</a-space>
</template>
</template>
</ele-pro-table>
</a-card>
<!-- 编辑弹窗 -->
<PaymentEdit v-model:visible="showEdit" :data="current" @done="reload" />
</div>
</div>
</template>
<script lang="ts" setup>
import { createVNode, ref } from 'vue';
import { message, Modal } from 'ant-design-vue';
import {
ExclamationCircleOutlined,
WechatOutlined
} from '@ant-design/icons-vue';
import type { EleProTable } from 'ele-admin-pro';
import { toDateString } from 'ele-admin-pro';
import type {
DatasourceFunction,
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import PaymentEdit from './components/paymentEdit.vue';
import {
pagePayment,
removePayment,
removeBatchPayment,
updatePayment
} from '@/api/system/payment';
import type { Payment, PaymentParam } from '@/api/system/payment/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格选中数据
const selection = ref<Payment[]>([]);
// 当前编辑数据
const current = ref<Payment | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示批量移动弹窗
const showMove = ref(false);
// 加载状态
const loading = ref(true);
// 表格数据源
const datasource: DatasourceFunction = ({
page,
limit,
where,
orders,
filters
}) => {
if (filters) {
where.status = filters.status;
}
return pagePayment({
...where,
...orders,
page,
limit
});
};
// 表格列配置
const columns = ref<ColumnItem[]>([
{
title: '支付方式',
dataIndex: 'name',
key: 'name',
width: 280
},
{
title: '标识',
dataIndex: 'code',
key: 'code',
width: 280,
align: 'center'
},
// {
// title: '商户号类型',
// dataIndex: 'wechatType',
// key: 'wechatType',
// align: 'center',
// width: 180,
// customRender: ({ text }) => ['普通商户', '子商户'][text]
// },
{
title: '是否启用',
dataIndex: 'status',
key: 'status',
align: 'center'
},
{
title: '操作',
key: 'action',
width: 280,
fixed: 'right',
align: 'center',
hideInSetting: true
}
]);
/* 搜索 */
const reload = (where?: PaymentParam) => {
selection.value = [];
tableRef?.value?.reload({ where: where });
};
/* 打开编辑弹窗 */
const openEdit = (row?: Payment) => {
current.value = row ?? null;
showEdit.value = true;
};
/* 打开批量移动弹窗 */
const openMove = () => {
showMove.value = true;
};
const updateStatus = (item: Payment) => {
updatePayment(item)
.then((msg) => {
message.success(msg);
})
.catch((msg) => {
message.error(msg);
});
};
/* 删除单个 */
const remove = (row: Payment) => {
const hide = message.loading('请求中..', 0);
removePayment(row.id)
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
};
/* 批量删除 */
const removeBatch = () => {
if (!selection.value.length) {
message.error('请至少选择一条数据');
return;
}
Modal.confirm({
title: '提示',
content: '确定要删除选中的记录吗?',
icon: createVNode(ExclamationCircleOutlined),
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchPayment(selection.value.map((d) => d.id))
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
}
});
};
/* 查询 */
const query = () => {
loading.value = true;
};
/* 自定义行属性 */
const customRow = (record: Payment) => {
return {
// 行点击事件
onClick: () => {
// console.log(record);
},
// 行双击事件
onDblclick: () => {
openEdit(record);
}
};
};
query();
</script>
<script lang="ts">
export default {
name: 'Payment'
};
</script>
<style lang="less" scoped></style>

View File

@@ -54,15 +54,16 @@
</a-space>
</a-form-item>
<a-form-item label="应用状态">
<span v-if="form.status == 0">已上线</span>
<span v-if="form.status == 1" color="orange">开发中</span>
<span v-if="form.status == 2" color="orange">维护中</span>
<span v-if="form.status == 3" color="orange">已欠费</span>
<span v-if="form.status == 0" class="ele-text-success">已上线</span>
<span v-if="form.status == 1" class="ele-text-warning" color="orange">开发中</span>
<span v-if="form.status == 2" class="ele-text-danger">维护中</span>
<span v-if="form.status == 3" class="ele-text-placeholder">已欠费</span>
</a-form-item>
<a-form-item label="当前版本">
<a-space class="justify">
<div v-if="form.version === 10">体验版试用期1个月</div>
<a-tag color="green" v-if="form.version === 20">授权版</a-tag>
<a-tag color="red" v-if="form.version === 10">体验版</a-tag>
<a-tag color="blue" v-if="form.version === 20">授权版</a-tag>
<a-tag color="cyan" v-if="form.version === 30">永久授权</a-tag>
</a-space>
</a-form-item>
<a-form-item label="当前版本号">
@@ -71,10 +72,10 @@
<a @click="openUrl('/system/version')">更新</a>
</a-space>
</a-form-item>
<a-form-item label="注册时间">
<a-form-item label="开通时间">
<span>{{ form.createTime }}</span>
</a-form-item>
<a-form-item label="到期时间">
<a-form-item label="到期时间" v-if="form.version != 30">
<span>{{ form.expirationTime }}</span>
</a-form-item>
<a-divider style="padding-bottom: 20px" />
@@ -414,11 +415,12 @@ import {FileRecord} from "@/api/system/file/model";
const query = () => {
logo.value = [];
getCompany().then((response) => {
console.log(response.companyLogo);
if (response.companyLogo) {
logo.value.push({
uid: 1,
url: response.companyLogo,
status: ''
status: 'done'
});
}
assignObject(form, response);

View File

@@ -8,7 +8,7 @@
:wrapper-col="styleResponsive ? { md: 9, sm: 19, xs: 24 } : { flex: '1' }"
>
<a-form-item label="支付方式" name="payMethod">
<DictRadio
<PayMethod
dict-code="payMethod"
v-model:value="form.payMethod"
:placeholder="`选择支付方式`"

View File

@@ -52,7 +52,7 @@
import { listSetting } from '@/api/system/setting';
// tab页选中
const active = ref('upload');
const active = ref('payment');
const data = ref<Setting>();