refactor(card-c-trip-info): 重构订单组件和API调用
- 更新API调用方式,使用apiClient替代单独的导入 - 修正订单历史和配置组件中的API路径 - 优化订单列表组件中的数据获取逻辑 - 调整表单数据结构和类型定义
This commit is contained in:
@@ -270,7 +270,7 @@ const columns: TableColumnData[] = [
|
||||
width: 220
|
||||
}
|
||||
];
|
||||
const generateFormModel = () => {
|
||||
const generateFormModel = (): formDataType => {
|
||||
return {
|
||||
remark: '',
|
||||
name: '',
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { apiClient } from '@/api';
|
||||
import { getWalmartConfig } from '@/api/card-walmart-order';
|
||||
import type { KamiApiCardInfoWalmartV1RedeemConfigGetRes } from '@/api/generated';
|
||||
import type { KamiApiCardInfoCTripV1RedeemConfigGetRes } from '@/api/generated';
|
||||
import {
|
||||
Button,
|
||||
Modal,
|
||||
@@ -20,18 +19,26 @@ export default defineComponent({
|
||||
}>({
|
||||
visible: false
|
||||
});
|
||||
const formData = ref<Required<KamiApiCardInfoWalmartV1RedeemConfigGetRes>>({
|
||||
isAllowDifferentAmount: true,
|
||||
isAllowDifferentSucceedCallback: true,
|
||||
isAllowDifferentFailCallback: true,
|
||||
redeemCardMinAmount: 0,
|
||||
isAllowCompensatedCallback: true,
|
||||
redeemCardRate: 100
|
||||
|
||||
// 定义默认值
|
||||
const defaultFormData: Required<KamiApiCardInfoCTripV1RedeemConfigGetRes> =
|
||||
{
|
||||
isAllowDifferentAmount: true,
|
||||
isAllowDifferentSucceedCallback: true,
|
||||
isAllowDifferentFailCallback: true,
|
||||
redeemCardMinAmount: 0,
|
||||
isAllowCompensatedCallback: true,
|
||||
redeemCardRate: 100
|
||||
};
|
||||
|
||||
const formData = ref<Required<KamiApiCardInfoCTripV1RedeemConfigGetRes>>({
|
||||
...defaultFormData
|
||||
});
|
||||
|
||||
const formRef = ref<FormInstance>();
|
||||
onMounted(() => {
|
||||
getWalmartConfig().then(res => {
|
||||
formData.value = res.data;
|
||||
apiClient.apiCardInfoCTripConfigGetGet().then(res => {
|
||||
formData.value = { ...defaultFormData, ...res.data };
|
||||
});
|
||||
});
|
||||
return () => (
|
||||
@@ -41,8 +48,8 @@ export default defineComponent({
|
||||
status='normal'
|
||||
onClick={() => {
|
||||
state.visible = !state.visible;
|
||||
getWalmartConfig().then(res => {
|
||||
formData.value = res.data;
|
||||
apiClient.apiCardInfoCTripConfigGetGet().then(res => {
|
||||
formData.value = { ...defaultFormData, ...res.data };
|
||||
});
|
||||
}}
|
||||
>
|
||||
@@ -56,7 +63,7 @@ export default defineComponent({
|
||||
done(false);
|
||||
}
|
||||
try {
|
||||
await apiClient.apiCardInfoWalmartConfigSetPost(formData.value);
|
||||
await apiClient.apiCardInfoCTripConfigSetPost(formData.value);
|
||||
done(true);
|
||||
} catch {
|
||||
done(false);
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { queryWalmartOrderHistoryList } from '@/api/card-walmart-order';
|
||||
import { apiClient } from '@/api';
|
||||
import { KamiInternalModelEntityV1CardRedeemOrderHistory } from '@/api/generated';
|
||||
import { reactive, ref, watch } from 'vue';
|
||||
|
||||
@@ -60,9 +60,9 @@ const state = reactive<{ isReverse: boolean; visible: boolean }>({
|
||||
const renderData = ref<KamiInternalModelEntityV1CardRedeemOrderHistory[]>([]);
|
||||
|
||||
const getJDOrderHistoryList = async () => {
|
||||
const res = await queryWalmartOrderHistoryList({
|
||||
orderNo: props.orderNo
|
||||
});
|
||||
const res = await apiClient.apiCardInfoCTripOrderGetHistoryListGet(
|
||||
props.orderNo
|
||||
);
|
||||
renderData.value = res.data.list;
|
||||
};
|
||||
|
||||
|
||||
@@ -276,13 +276,12 @@ const generateFormModel = () => {
|
||||
const { loading, setLoading } = useLoading(true);
|
||||
const renderData = ref<KamiInternalModelEntityV1CardRedeemOrderInfo[]>([]);
|
||||
const formModel = ref<{
|
||||
giftCardPwd: string;
|
||||
merchantId: string;
|
||||
attach: string;
|
||||
accountNickName: string;
|
||||
accountCk: string;
|
||||
attach: string;
|
||||
giftCardPwd: string;
|
||||
status: number;
|
||||
dateRange: Date[];
|
||||
dateRange: Array<string>;
|
||||
}>(generateFormModel());
|
||||
|
||||
const fetchData = async (
|
||||
@@ -297,7 +296,13 @@ const fetchData = async (
|
||||
data: { list, total }
|
||||
} = await apiClient.apiCardInfoCTripOrderListGet(
|
||||
params.current,
|
||||
params.pageSize as ApiCardInfoCTripOrderListGetPageSizeEnum
|
||||
params.pageSize as ApiCardInfoCTripOrderListGetPageSizeEnum,
|
||||
formModel.value.giftCardPwd,
|
||||
formModel.value.merchantId,
|
||||
formModel.value.attach,
|
||||
formModel.value.accountNickName,
|
||||
formModel.value.accountCk,
|
||||
formModel.value.dateRange
|
||||
);
|
||||
renderData.value = list;
|
||||
pagination.current = params.current;
|
||||
|
||||
Reference in New Issue
Block a user