Merge branch 'master' into dev

pekinese888 · Apr 29, 2019 · 6014676 · 6014676
2 parents 8cf72d2 + d99c73a
commit 6014676
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/uni-h5/dist/index.umd.min.js b/packages/uni-h5/dist/index.umd.min.js
diff --git a/packages/uni-h5/package.json b/packages/uni-h5/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-h5",
-	"version": "0.4.7",
+	"version": "0.4.8",
 	"description": "uni-app h5",
 	"main": "dist/index.umd.min.js",
 	"scripts": {

diff --git a/src/platforms/mp-alipay/service/api/protocols.js b/src/platforms/mp-alipay/service/api/protocols.js
@@ -320,7 +320,7 @@ const protocols = { // 需要做转换的 API 列表
   requestPayment: {
     name: 'tradePay',
     args: {
-      orderInfo: 'orderStr'
+      orderInfo: 'tradeNO'
     }
   },
   getBLEDeviceServices: {