Merge branch 'master' into fix_WX_browser_20230403

merge

packages/toolkit/package.json

 {
   "name": "@ydl-packages/toolkit",
-  "version": "1.0.8",
+  "version": "1.0.8-beta.2",
   "description": "",
   "main": "./dist/index.umd.js",
   "scripts": {

packages/toolkit/src/Payment/Defined.ts

@@ -126,6 +126,13 @@ export type ToPayReturns = {
     payUrl?: string
 }
 
+
+export type BalanceReturns = {
+    success: boolean
+    code?: number
+    msg?: string
+}
+
 export interface DoUnifiedParams extends Omit<ToPayParams, 'totalAmount' | 'redirectUrl'> {
     payChannel?: PayChannel,
     payBalance: number,

packages/toolkit/src/Payment/Payment.ts

@@ -18,6 +18,7 @@ import {
     PayType,
     ToPayParams,
     ToPayReturns,
+    BalanceReturns,
     WechatPayParams
 } from "./Defined";
 import {ACCESS_TOKEN, UID} from "@/Const";
@@ -89,15 +90,21 @@ export class Payment {
         }
     }
 
-    async getBalance(): Promise<number> {
+    //isHandleErr 是否要自定义处理异常
+    async getBalance(handleErr: (err: BalanceReturns) =>void): Promise<number|null> {
         try {
             const {data: res} = await requestForPhp.post(MY_BALANCE, {balance: 1})
             if (res.data && res.data.balance) {
                 this.balance = Number(res.data.balance)
             }
+            if(handleErr && res.msg !== 'success'){
+                handleErr && handleErr(res)
+                return null
+            }
             return this.balance
         } catch (err) {
-            return 0
+            handleErr && handleErr({success: false})
+            return !!handleErr ? null : 0
         }
     }
     getPayMethodList (totalAmount:number) {