From 0d45bb2d1430c478d73b535df330fa3f4b6252d9 Mon Sep 17 00:00:00 2001
From: wangying <wangying@kezaihui.com>
Date: Thu, 29 Jun 2023 19:22:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(types):=20=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0=E5=A2=9EtradePay=20api?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-h5/src/api/alipay/index.ts  |  1 +
 packages/taro/types/api/alipay/index.d.ts | 43 +++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/packages/taro-h5/src/api/alipay/index.ts b/packages/taro-h5/src/api/alipay/index.ts
index fd2c68e63f30..9d5c885279e5 100644
--- a/packages/taro-h5/src/api/alipay/index.ts
+++ b/packages/taro-h5/src/api/alipay/index.ts
@@ -2,3 +2,4 @@ import { temporarilyNotSupport } from '../../utils'
 
 // AliPay
 export const getOpenUserInfo = /* @__PURE__ */ temporarilyNotSupport('getOpenUserInfo')
+export const tradePay = /* @__PURE__ */ temporarilyNotSupport('tradePay')
diff --git a/packages/taro/types/api/alipay/index.d.ts b/packages/taro/types/api/alipay/index.d.ts
index 1c96f8e98b99..bbbf682fc75f 100644
--- a/packages/taro/types/api/alipay/index.d.ts
+++ b/packages/taro/types/api/alipay/index.d.ts
@@ -15,6 +15,42 @@ declare module '../../index' {
       response: string
     }
   }
+  namespace tradePay  {
+    interface Option {
+      /** 接入小程序支付时传入此参数。此参数为支付宝交易号，注意参数有大小写区分（调用 小程序支付 时必填） */
+      tradeNO?: string
+      /** 完整的支付参数拼接成的字符串，从服务端获取（调用 支付宝预授权 时必填） */
+      orderStr?: string
+      /** 接口调用成功的回调函数 */
+      success?: (res: SuccessCallbackResult) => void
+      /** 接口调用失败的回调函数 */
+      fail?: (res: TaroGeneral.CallbackResult) => void
+      /** 接口调用结束的回调函数（调用成功、失败都会执行） */
+      complete?:(res: TaroGeneral.CallbackResult) => void
+    }
+    interface ResultCode {
+      /** 无权限调用（N22104） */
+      4
+      /** 订单处理成功 */
+      9000
+      /** 正在处理中。支付结果未知（有可能已经支付成功） */
+      8000
+      /** 订单处理失败 */
+      4000
+      /** 用户中途取消 */
+      6001
+      /** 网络连接出错 */
+      6002
+      /** 处理结果未知（有可能已经成功） */
+      6004
+    }
+    interface SuccessCallbackResult {
+      /** success 回调函数会携带一个 Object 类型的对象，其属性如下： */
+      response: {
+        resultCode: ResultCode
+      }
+    }
+  }
   interface TaroStatic {
     /**
      * 此接口可获取支付宝会员的基础信息（头像图片地址、昵称、性别、国家码、省份、所在市区），接入方法请参考 获取会员基础信息介绍。如需获取支付宝会员标识（user_id），请调用 my.getAuthCode 和 alipay.system.oauth.token 接口。
@@ -22,5 +58,12 @@ declare module '../../index' {
      * @see https://docs.alipay.com/mini/api/ch8chh
      */
     getOpenUserInfo(Option: getOpenUserInfo.Option): Promise<getOpenUserInfo.SuccessCallbackResult>
+
+    /**
+     * 此接口是用于发起支付的 API，此 API 暂仅支持企业支付宝小程序使用
+     * @supported alipay
+     * @see https://opendocs.alipay.com/mini/api/openapi-pay
+     */
+    tradePay(Option: tradePay.Option): Promise<tradePay.SuccessCallbackResult>
   }
 }

From 6b48d5d6503c5556e3664e52ce81c4d1cca27789 Mon Sep 17 00:00:00 2001
From: kongwh <piaoxyx@gmail.com>
Date: Wed, 28 Jun 2023 16:59:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(h5):=20chooseMedia=20=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=8C=85=E5=90=AB=20album=20=E5=92=8C=20came?=
 =?UTF-8?q?ra=20=E6=97=B6=EF=BC=8C=E4=BA=8C=E8=80=85=E9=83=BD=E4=BC=9A?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=93=E5=BC=80=E7=9B=B8=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-h5/src/api/media/video/chooseMedia.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/taro-h5/src/api/media/video/chooseMedia.ts b/packages/taro-h5/src/api/media/video/chooseMedia.ts
index 21d16c440b4b..f7ed8aef575c 100644
--- a/packages/taro-h5/src/api/media/video/chooseMedia.ts
+++ b/packages/taro-h5/src/api/media/video/chooseMedia.ts
@@ -71,7 +71,7 @@ export const chooseMedia = async function (
         const { tapIndex } = await showActionSheet({
           itemList: ['拍摄', '从相册选择'],
         }, methodName)
-        sourceType.splice(0, 1, tapIndex === 0 ? 'camera' : 'album')
+        sourceType.splice(0, sourceType.length, tapIndex === 0 ? 'camera' : 'album')
       } catch (e) {
         return handle.fail({
           errMsg: e.errMsg?.replace('^.*:fail ', '')