Merge branch 'feature/alipay-0629-ch' into msb_test

src/common/utils/alipay.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-29 14:26:10
  * @LastEditors: ch
- * @LastEditTime: 2022-06-29 17:25:38
+ * @LastEditTime: 2022-06-30 16:03:35
  * @Description: file content
  */
 
@@ -19,15 +19,7 @@ export const Alipay = async ({orderId})=>{
 	const par = result.payDataInfo;
 	uni.requestPayment({
 		provider: 'alipay',
-		orderInfo :{
-			"appid": par.appId,  // 微信开放平台 - 应用 - AppId
-			"noncestr": par.nonceStr, // 随机字符串
-			"package": par.packageValue, // 固定值
-			"partnerid": par.partnerId, // 微信支付商户号
-			"prepayid": par.prepayId, // 统一下单订单号 		
-			"timestamp": par.timeStamp ,// 时间戳（单位：秒）
-			"sign": par.sign // 签名，这里用的 MD5 签名
-		},
+		orderInfo :par.payData,
 		success(res) {
 			uni.navigateTo({
 				url : `/payResult?orderId=${orderId}&payType=appWx`

src/manifest.json

@@ -52,6 +52,9 @@
                         "__platform__" : [ "android" ],
                         "appid" : "wx17b34a4a90ef18f7",
                         "UniversalLinks" : ""
+                    },
+                    "alipay" : {
+                        "__platform__" : [ "android" ]
                     }
                 }
             },

src/pages/order/payResult.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-28 15:01:41
  * @LastEditors: ch
- * @LastEditTime: 2022-06-22 14:53:43
+ * @LastEditTime: 2022-06-30 17:31:15
  * @Description: file content
 -->
 
@@ -58,7 +58,7 @@ export default {
 				uni.$u.toast(error.message);
 				return false
 			}
-			if(!result.isSuccess && this.reuqestNum < 5){
+			if(!result.isSuccess && this.reuqestNum < 10){
 				setTimeout(()=>{
 					this.getOrderInfo();
 				}, 1000)