From b4ccdd63e945417f3bd25e584d93a3dd5af1c666 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 08 十月 2024 17:45:38 +0800
Subject: [PATCH] update 测试支付新接口（todo 提交体验版测试）
---
package.json | 3
sub_pages/customer/shopping/confirm.vue | 52 +++++++----------
pages/order/order.vue | 58 ++++++++++--------
pages/order/order-detail.vue | 51 +++++++---------
4 files changed, 78 insertions(+), 86 deletions(-)
diff --git a/package.json b/package.json
index 195298b..5c4c744 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,8 @@
"PUB_TYPE": "customer"
},
"define": {
- "PUB_CUSTOMER_DEV": true
+ "PUB_CUSTOMER_DEV": true,
+ "PUB_CUSTOMER": true
}
}
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 3b6c0b3..24a86bb 100644
--- a/pages/order/order-detail.vue
+++ b/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
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 7c5142f..985d21d 100644
--- a/pages/order/order.vue
+++ b/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
}
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 97a123e..662ac88 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/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
}
--
Gitblit v1.9.3