解决app/api代码合并冲突

video-gen-app/src/api/index.ts

@@ -262,6 +262,27 @@ export async function getMenuConfigs(): Promise<any[]> {
 export async function getRechargePackages(): Promise<any[]> {
   return api.get('/recharge-packages');
 }
+
+export async function getPaymentMethods(): Promise<{ alipay: boolean; wechat: boolean }> {
+  return api.get('/payments/methods');
+}
+
+export async function createRechargeOrder(planId: string, method: string = 'wechat'): Promise<any> {
+  return api.post('/payments/recharge', { plan: planId, method });
+}
+
+export async function getPaymentOrders(): Promise<any[]> {
+  return api.get('/payments/orders');
+}
+
+export async function getPaymentOrder(orderNo: string): Promise<any> {
+  return api.get(`/payments/orders/${orderNo}`);
+}
+
+export async function cancelPaymentOrder(orderNo: string): Promise<void> {
+  return api.post(`/payments/orders/${orderNo}/cancel`);
+}
+
 export async function getCreditRatios(): Promise<any[]> {
   return api.get('/credits/ratios');
 }