完善页面

src/hooks/useOrder.ts

@@ -7,7 +7,6 @@ import {
 } from '@/api/tea-room'
 import { OrderType } from '@/utils/order'
 
-
 /**
  * 包间-取消订单
  * @param orderId 订单ID
@@ -26,7 +25,8 @@ export async function handleTRCancelOrderHooks(orderId: number) {
 /**
  * 重新支付
  * @param orderId 订单ID
- * @param teaSpecialistId 茶艺师ID
+ * @param teaRoomName 茶室名称
+ * @param storeId 商家ID
  * @returns 
  */
 export function handleTRToPayHooks(orderId: number, teaRoomName: string, storeId: number) {
@@ -36,15 +36,9 @@ export function handleTRToPayHooks(orderId: number, teaRoomName: string, storeId
                 uni.$off("payment")
                 uni.$emit('refreshOrderList')
                 uni.$emit('refreshOrderDetail')
-                  if (params.result) {
-                        uni.redirectTo({
-                            url: `/pages/notice/reserve?type=room&orderId=${orderId}`
-                        })
-                    } else {
-                        uni.redirectTo({
-                            url: '/bundle/order/tea-room/order-list?orderStatus=all'
-                        })
-                    }
+                uni.redirectTo({
+                    url: '/bundle/order/tea-room/order-list?orderStatus=all'
+                })
             }, 1000)
         })
 
@@ -65,6 +59,7 @@ export async function handleTRDeleteOrderHooks(orderId: number) {
         await deleteTeaRoomOrder({ id: orderId })
         uni.$emit('refreshOrderList')
         uni.$emit('refreshOrderDetail')
+        toast.info('删除订单成功')
     } catch (error) {
         router.navigateBack()
         throw error
@@ -99,4 +94,27 @@ export async function handleTRConfirmOrderHooks(orderId: number) {
 //         router.navigateBack()
 //         throw error
 //     }
-// }
+// }
+
+/**
+ * 平台团购套餐-订单退款
+ */
+export async function handleTGOrderRefundHooks(orderId: number) {
+    // try {
+    //     await confirmTeaRoomOrder({ id: orderId })
+    //     uni.$emit('refreshPackageOrderList')
+    //     uni.$emit('refreshPackageOrderDetail')
+    // } catch (error) {
+    //     router.navigateBack()
+    //     throw error
+    // }   
+}
+
+/**
+ * 跳转到茶室店铺
+ * @param storeId 门店ID
+ * @param operationType 门店类型：1-直营 2-加盟
+ */
+export function handleToTeaRoomStoreHooks(storeId: number, operationType: number) {
+    router.navigateTo(`/bundle/tea-room/room?id=${storeId}&type=${operationType}`)
+}

src/hooks/usePay.ts

@@ -1,4 +1,4 @@
-export function wxpay(opt) {
+export function wxPay(opt) {
 	return new Promise((resolve, reject) => {
 		let params;
 		// #ifdef MP-WEIXIN