hmy_farmer-main.git

xuxueyang

2024-10-08 b4ccdd63e945417f3bd25e584d93a3dd5af1c666

update 测试支付新接口（todo 提交体验版测试）

已修改4个文件

	package.json	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/order-detail.vue	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/order.vue	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/customer/shopping/confirm.vue	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 package.json

@@ -42,7 +42,8 @@
                    "PUB_TYPE": "customer"
                },
                "define": {
                    "PUB_CUSTOMER_DEV": true
                    "PUB_CUSTOMER_DEV": true,
                    "PUB_CUSTOMER": true
                }
            }


 pages/order/order-detail.vue

@@ -354,6 +354,8 @@
                        if (code === 0) {
                            //微信接口
                            let that = this
                            // #ifndef PUB_CUSTOMER_DEV
							
                            wx.requestPayment({
                                ...data,
                                async success(res) {
@@ -366,39 +368,30 @@
                                    that.$message.showToast('支付失败')
                                }
                            })
                            // #endif
                            // #ifdef PUB_CUSTOMER_DEV
                            var param = {
                                cusid: "平台分配的商户号",
                                appid: "平台分配的appid",
                                orgid: "平台分配的机构号",
                                version: "12",
                                trxamt: "1",
                                reqsn: "商户唯一订单号",
                                notify_url: "服务器异步通知页面路径",
                                body: "标题",
                                remark: "备注",
                                validtime: "订单有效时间",
                                limit_pay: "no_credit",
                                randomstr: "随机字符串",
                                paytype: "W06",
                                signtype: "签名方式",
                                sign: "签名，参考2.1",
                                // cusid: "平台分配的商户号",
                                // appid: "平台分配的appid",
                                // orgid: "平台分配的机构号",
                                // version: "12",
                                // trxamt: "1",
                                // reqsn: "商户唯一订单号",
                                // notify_url: "服务器异步通知页面路径",
                                // body: "标题",
                                // remark: "备注",
                                // validtime: "订单有效时间",
                                // limit_pay: "no_credit",
                                // randomstr: "随机字符串",
                                // paytype: "W06",
                                // signtype: "签名方式",
                                // sign: "签名，参考2.1",
                                ...data
                            }
                            if (compareVersion(version, '2.26.2') >= 0) {
							
                                wx.openEmbeddedMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })
							
                            } else {
                                wx.navigateToMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })
							
                            }
                            wx.openEmbeddedMiniProgram({
                                appId: 'wxef277996acc166c3',
                                extraData: param
                            })
                            // #endif
                            


 pages/order/order.vue

@@ -334,6 +334,7 @@
                        if (code === 0) {
                            //微信接口
                            let that = this
                            // #ifndef PUB_CUSTOMER_DEV
                            wx.requestPayment({
                                ...data,
                                async success(res) {
@@ -349,39 +350,44 @@
                                    that.$message.showToast('支付失败')
                                }
                            })
                            // #endif
                            // #ifdef PUB_CUSTOMER_DEV
                            var param = {
                                cusid: "平台分配的商户号",
                                appid: "平台分配的appid",
                                orgid: "平台分配的机构号",
                                version: "12",
                                trxamt: "1",
                                reqsn: "商户唯一订单号",
                                notify_url: "服务器异步通知页面路径",
                                body: "标题",
                                remark: "备注",
                                validtime: "订单有效时间",
                                limit_pay: "no_credit",
                                randomstr: "随机字符串",
                                paytype: "W06",
                                signtype: "签名方式",
                                sign: "签名，参考2.1",
                                // cusid: "平台分配的商户号",
                                // appid: "平台分配的appid",
                                // orgid: "平台分配的机构号",
                                // version: "12",
                                // trxamt: "1",
                                // reqsn: "商户唯一订单号",
                                // notify_url: "服务器异步通知页面路径",
                                // body: "标题",
                                // remark: "备注",
                                // validtime: "订单有效时间",
                                // limit_pay: "no_credit",
                                // randomstr: "随机字符串",
                                // paytype: "W06",
                                // signtype: "签名方式",
                                // sign: "签名，参考2.1",
                                ...data
                            }
                            if (compareVersion(version, '2.26.2') >= 0) {
                            wx.openEmbeddedMiniProgram({
                                appId: 'wxef277996acc166c3',
                                extraData: param
                            })
                            // if (compareVersion(version, '2.26.2') >= 0) {

                                wx.openEmbeddedMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })
                            //     wx.openEmbeddedMiniProgram({
                            //         appId: 'wxef277996acc166c3',
                            //         extraData: param
                            //     })

                            } else {
                                wx.navigateToMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })
                            // } else {
                            //     wx.navigateToMiniProgram({
                            //         appId: 'wxef277996acc166c3',
                            //         extraData: param
                            //     })

                            }
                            // }
                            // #endif

                        }

 sub_pages/customer/shopping/confirm.vue

@@ -335,6 +335,7 @@
                                    await tmp.$store.dispatch('sign_add', 'shopping')
                                    uni.navigateBack()
                                } else if (data) {
                                    // #ifndef PUB_CUSTOMER_DEV
                                    wx.requestPayment({
                                        ...data,
                                        async success(res) {
@@ -362,41 +363,32 @@
                                            // uni.navigateBack()
                                        }
                                    })
									
                                    // #endif
                                    // openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2
                                    
                                    // #ifdef PUB_CUSTOMER_DEV
                                    var param = {
                                        cusid: "平台分配的商户号",
                                        appid: "平台分配的appid",
                                        orgid: "平台分配的机构号",										
                                        version: "12",									
                                        trxamt: "1",								
                                        reqsn: "商户唯一订单号",				
                                        notify_url: "服务器异步通知页面路径",	
                                        body: "标题",
                                        remark: "备注",	
                                        validtime: "订单有效时间",	
                                        limit_pay: "no_credit",	
                                        randomstr: "随机字符串",	
                                        paytype: "W06",
                                        signtype: "签名方式",	
                                        sign: "签名，参考2.1"
                                        // cusid: "平台分配的商户号",
                                        // appid: "平台分配的appid",
                                        // orgid: "平台分配的机构号",										
                                        // version: "12",									
                                        // trxamt: "1",								
                                        // reqsn: "商户唯一订单号",				
                                        // notify_url: "服务器异步通知页面路径",	
                                        // body: "标题",
                                        // remark: "备注",	
                                        // validtime: "订单有效时间",	
                                        // limit_pay: "no_credit",	
                                        // randomstr: "随机字符串",	
                                        // paytype: "W06",
                                        // signtype: "签名方式",	
                                        // sign: "签名，参考2.1",
                                        ...data,
                                    }
                                    if (compareVersion(version, '2.26.2') >= 0) {
									
                                        wx.openEmbeddedMiniProgram({			
                                            appId: 'wxef277996acc166c3',			
                                            extraData: param
                                        })
										
                                    } else {
                                        wx.navigateToMiniProgram({
                                            appId: 'wxef277996acc166c3',
                                            extraData: param
                                        })
									
                                    }
                                    wx.openEmbeddedMiniProgram({
                                        appId: 'wxef277996acc166c3',			
                                        extraData: param
                                    })
                                    // #endif

                                }

			@@ -42,7 +42,8 @@
			"PUB_TYPE": "customer"
			},
			"define": {
			"PUB_CUSTOMER_DEV": true
			"PUB_CUSTOMER_DEV": true,
			"PUB_CUSTOMER": true
			}
			}

			@@ -354,6 +354,8 @@
			if (code === 0) {
			//微信接口
			let that = this
			// #ifndef PUB_CUSTOMER_DEV

			wx.requestPayment({
			...data,
			async success(res) {
			@@ -366,39 +368,30 @@
			that.$message.showToast('支付失败')
			}
			})
			// #endif
			// #ifdef PUB_CUSTOMER_DEV
			var param = {
			cusid: "平台分配的商户号",
			appid: "平台分配的appid",
			orgid: "平台分配的机构号",
			version: "12",
			trxamt: "1",
			reqsn: "商户唯一订单号",
			notify_url: "服务器异步通知页面路径",
			body: "标题",
			remark: "备注",
			validtime: "订单有效时间",
			limit_pay: "no_credit",
			randomstr: "随机字符串",
			paytype: "W06",
			signtype: "签名方式",
			sign: "签名，参考2.1",
			// cusid: "平台分配的商户号",
			// appid: "平台分配的appid",
			// orgid: "平台分配的机构号",
			// version: "12",
			// trxamt: "1",
			// reqsn: "商户唯一订单号",
			// notify_url: "服务器异步通知页面路径",
			// body: "标题",
			// remark: "备注",
			// validtime: "订单有效时间",
			// limit_pay: "no_credit",
			// randomstr: "随机字符串",
			// paytype: "W06",
			// signtype: "签名方式",
			// sign: "签名，参考2.1",
			...data
			}
			if (compareVersion(version, '2.26.2') >= 0) {

			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			} else {
			wx.navigateToMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			}
			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})
			// #endif

			@@ -334,6 +334,7 @@
			if (code === 0) {
			//微信接口
			let that = this
			// #ifndef PUB_CUSTOMER_DEV
			wx.requestPayment({
			...data,
			async success(res) {
			@@ -349,39 +350,44 @@
			that.$message.showToast('支付失败')
			}
			})
			// #endif
			// #ifdef PUB_CUSTOMER_DEV
			var param = {
			cusid: "平台分配的商户号",
			appid: "平台分配的appid",
			orgid: "平台分配的机构号",
			version: "12",
			trxamt: "1",
			reqsn: "商户唯一订单号",
			notify_url: "服务器异步通知页面路径",
			body: "标题",
			remark: "备注",
			validtime: "订单有效时间",
			limit_pay: "no_credit",
			randomstr: "随机字符串",
			paytype: "W06",
			signtype: "签名方式",
			sign: "签名，参考2.1",
			// cusid: "平台分配的商户号",
			// appid: "平台分配的appid",
			// orgid: "平台分配的机构号",
			// version: "12",
			// trxamt: "1",
			// reqsn: "商户唯一订单号",
			// notify_url: "服务器异步通知页面路径",
			// body: "标题",
			// remark: "备注",
			// validtime: "订单有效时间",
			// limit_pay: "no_credit",
			// randomstr: "随机字符串",
			// paytype: "W06",
			// signtype: "签名方式",
			// sign: "签名，参考2.1",
			...data
			}
			if (compareVersion(version, '2.26.2') >= 0) {
			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})
			// if (compareVersion(version, '2.26.2') >= 0) {

			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})
			// wx.openEmbeddedMiniProgram({
			// appId: 'wxef277996acc166c3',
			// extraData: param
			// })

			} else {
			wx.navigateToMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})
			// } else {
			// wx.navigateToMiniProgram({
			// appId: 'wxef277996acc166c3',
			// extraData: param
			// })

			}
			// }
			// #endif

			}

			@@ -335,6 +335,7 @@
			await tmp.$store.dispatch('sign_add', 'shopping')
			uni.navigateBack()
			} else if (data) {
			// #ifndef PUB_CUSTOMER_DEV
			wx.requestPayment({
			...data,
			async success(res) {
			@@ -362,41 +363,32 @@
			// uni.navigateBack()
			}
			})

			// #endif
			// openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2

			// #ifdef PUB_CUSTOMER_DEV
			var param = {
			cusid: "平台分配的商户号",
			appid: "平台分配的appid",
			orgid: "平台分配的机构号",
			version: "12",
			trxamt: "1",
			reqsn: "商户唯一订单号",
			notify_url: "服务器异步通知页面路径",
			body: "标题",
			remark: "备注",
			validtime: "订单有效时间",
			limit_pay: "no_credit",
			randomstr: "随机字符串",
			paytype: "W06",
			signtype: "签名方式",
			sign: "签名，参考2.1"
			// cusid: "平台分配的商户号",
			// appid: "平台分配的appid",
			// orgid: "平台分配的机构号",
			// version: "12",
			// trxamt: "1",
			// reqsn: "商户唯一订单号",
			// notify_url: "服务器异步通知页面路径",
			// body: "标题",
			// remark: "备注",
			// validtime: "订单有效时间",
			// limit_pay: "no_credit",
			// randomstr: "随机字符串",
			// paytype: "W06",
			// signtype: "签名方式",
			// sign: "签名，参考2.1",
			...data,
			}
			if (compareVersion(version, '2.26.2') >= 0) {

			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			} else {
			wx.navigateToMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			}
			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})
			// #endif

			}