diff --git a/admin/src/views/order/OrderList.vue b/admin/src/views/order/OrderList.vue index 6c926f4f..8045c766 100644 --- a/admin/src/views/order/OrderList.vue +++ b/admin/src/views/order/OrderList.vue @@ -85,9 +85,10 @@ - + @@ -288,7 +289,7 @@ - + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - + diff --git a/miniprogram/utils/request.ts b/miniprogram/utils/request.ts index 4f50c27a..e3dcde00 100644 --- a/miniprogram/utils/request.ts +++ b/miniprogram/utils/request.ts @@ -1,6 +1,6 @@ // 手动切换后端地址，部署时改成线上域名即可 -const BASE_URL = 'http://localhost:3000' -// const BASE_URL = 'http://115.190.188.216:2850' +// const BASE_URL = 'http://localhost:3000' +const BASE_URL = 'http://115.190.188.216:2850' export { BASE_URL } diff --git a/server/src/controllers/adminOrder.ts b/server/src/controllers/adminOrder.ts index b66ce1b0..20ddb62d 100644 --- a/server/src/controllers/adminOrder.ts +++ b/server/src/controllers/adminOrder.ts @@ -64,7 +64,7 @@ export async function adminGetOrders(req: Request, res: Response): Promise const total = countRows[0].total const [rows] = await pool.execute( - `SELECT o.id, o.order_no, o.user_id, u.nickname as user_nickname, o.status, + `SELECT o.id, o.order_no, o.user_id, u.nickname as user_nickname, u.uid as user_uid, o.status, o.total_price, o.receiver_name, o.receiver_phone, o.receiver_address, o.payment_time, o.payment_proof, o.shipping_company, o.shipping_no, o.cancel_reason, o.refund_proof, o.refund_time,