Merge branch 'feat_subOrder_221128' into 'master'

Feat sub order 221128

See merge request !7

packages/toolkit/package.json

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

packages/toolkit/src/Payment/Defined.ts

@@ -114,7 +114,7 @@ export enum PayErrorMessage {
     ALIPAY_QUIT_URL_MISSING = `缺少支付失败回调地址：'quitUrl'`,
     ALIPAY_RETURN_URL_MISSING =  `缺少支付成功回调地址：'returnUrl'`,
     ALIPAY_PAY_CHANNEL_MISSING = `缺少持的渠道参数：'ALI_WAP'`,
-    WECHAT_JSSDK_PAY_ERROR = '微信JSSDK支付失败',
+    WECHAT_JSSDK_PAY_ERROR = '支付失败',
     WECHAT_H5_PAY_BREAK = '微信h5支付中断',
     ALIPAY_H5_PAY_BREAK = '支付宝支付中断',
 }
@@ -145,43 +145,43 @@ export const FULL_PAY_METHODS: PayMethod[] = [
     {
         label: '余额',
         value: PayType.BALANCE,
-        icon: 'https://static.ydlcdn.com/m/order/icon-pay-qb.png',
+        icon: 'https://static.ydlcdn.com/m/order/balance.png',
         disabled: false
     },
     {
         label: '微信支付',
         value: PayType.WECHAT,
-        icon: 'https://static.ydlcdn.com/m/order/icon-pay-wx.png',
+        icon: 'https://static.ydlcdn.com/m/order/weixinzhifu.png',
         disabled: false
     },
     {
-        label: '支付宝支付',
+        label: '支付宝',
         value: PayType.ALIPAY,
-        icon: 'https://static.ydlcdn.com/m/order/icon-pay-zfb.png',
+        icon: 'https://static.ydlcdn.com/m/order/zhifubaozhifu.png',
         disabled: false
     },
     {
         label: '微信支付',
         value: PayType.WECHAT_BALANCE,
-        icon: 'https://static.ydlcdn.com/m/order/icon-pay-wx.png',
+        icon: 'https://static.ydlcdn.com/m/order/weixinzhifu.png',
         disabled: false
     },
     {
-        label: '支付宝支付',
+        label: '支付宝',
         value: PayType.ALIPAY_BALANCE,
-        icon: 'https://static.ydlcdn.com/m/order/icon-pay-zfb.png',
+        icon: 'https://static.ydlcdn.com/m/order/zhifubaozhifu.png',
         disabled: false
     },
     {
-        label: '花呗支付',
+        label: '花呗',
         value: PayType.HUABEI,
-        icon: 'https://static.ydlcdn.com/m/order/icon-pay-hb.png',
+        icon: 'https://static.ydlcdn.com/m/order/huabei.png',
         disabled: false
     },
     {
-        label: '花呗支付',
+        label: '花呗',
         value: PayType.HUABEI_BALANCE,
-        icon: 'https://static.ydlcdn.com/m/order/icon-pay-hb.png',
+        icon: 'https://static.ydlcdn.com/m/order/huabei.png',
         disabled: false  
     }
 ]
\ No newline at end of file

packages/toolkit/src/Payment/Payment.ts

@@ -121,8 +121,8 @@ export class Payment {
                 case PayType.BALANCE:
                     return {
                         ...item,
-                        label: `余额支付(¥${this.balance})`,
-                        disabled: this.balance > 0 && this.balance < totalAmount
+                        label: `余额<span class="balance">（可用¥${this.balance}）</span>`,
+                        disabled:  this.supportCombination ? (this.balance > 0 && this.balance < totalAmount) : true
                     }
             }
             return item
@@ -152,7 +152,7 @@ export class Payment {
                 case PayType.BALANCE:
                     return {
                         ...item,
-                        label: `余额支付(¥${payBalance})`,
+                        label: `余额<span class="balance">（可用¥${this.balance}）</span>`,
                         disabled: this.balance > 0 && this.balance < totalAmount
                     }
             }