diff --git a/.env.development b/.env.development index 3ff803c..116d930 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,6 @@ VITE_APP_NAME=后台管理系统 #VITE_API_URL=http://localhost:9090/api -#VITE_API_URL=http://yxw.wsdns.cn/api +VITE_API_URL=https://yxw-api.websoft.top/api #VITE_SOCKET_URL=ws://localhost:9190 #VITE_API_URL=http://127.0.0.1:9090/api -#VITE_API_URL=https://server.gxwebsoft.com/api -#VITE_SOCKET_URL=wss://server.gxwebsoft.com -VITE_API_URL=http://yxw.wsdns.cn/api +VITE_SOCKET_URL=wss://server.websoft.top diff --git a/.env.production b/.env.production index 14d05e2..b0e0570 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,3 @@ VITE_APP_NAME=后台管理系统 -#VITE_API_URL=https://server.jimeigroup.cn/api -#VITE_API_URL=https://server.gxwebsoft.com/api -VITE_API_URL=http://yxw.wsdns.cn/api -#VITE_API_URL=http://1.14.132.108:10032/api -VITE_SOCKET_URL=wss://server.gxwebsoft.com +VITE_API_URL=https://yxw-api.websoft.top/api +VITE_SOCKET_URL=wss://server.websoft.top diff --git a/src/api/order/index.ts b/src/api/order/index.ts index 1fb2706..977e351 100644 --- a/src/api/order/index.ts +++ b/src/api/order/index.ts @@ -67,6 +67,14 @@ export async function addOrderPay(data: OrderPay) { return Promise.reject(new Error(res.data.message)); } +export async function updateOrderPay(data: OrderPay) { + const res = await request.put>('/shop/order-pay', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + /** * 根据id查询订单 */ diff --git a/src/api/order/model/index.ts b/src/api/order/model/index.ts index 5ca7b43..b564336 100644 --- a/src/api/order/model/index.ts +++ b/src/api/order/model/index.ts @@ -35,6 +35,7 @@ export interface Order { sortNumber?: number; // 配送方式 deliveryType?: string; + payTime?: string; // 付款状态 payStatus?: number; expressPrice?: string; @@ -126,6 +127,7 @@ export interface OrderPay { currPeriods?:number;//当前期数 isAdminRenew?:number;//是否管理员学费 + orderPays?: OrderPay[] } diff --git a/src/views/oa/task/components/task-info.vue b/src/views/oa/task/components/task-info.vue index 8787b38..2a24962 100644 --- a/src/views/oa/task/components/task-info.vue +++ b/src/views/oa/task/components/task-info.vue @@ -119,7 +119,7 @@