From 0512f40da106268ac342377256cf9099d7f90b3e Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 18 十月 2024 10:41:35 +0800
Subject: [PATCH] add 首页的定位
---
sub_pages/customer/shopping/confirm.vue | 128 ++++++++++++++++++++----------------------
1 files changed, 62 insertions(+), 66 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 97a123e..8553dc6 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -68,41 +68,43 @@
},
async onShow() {
// 支付回调
- // #ifdef PUB_CUSTOMER_DEV
- let options = wx.getEnterOptionsSync();
- if (options.scene == '1038' && options.referrerInfo.appId=='wxef277996acc166c3') {
- // 代表从收银台小程序返回
- let extraData = options.referrerInfo.extraData;
- // if (!extraData) {
- // // "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
- // } else {
- // if (extraData.code == 'success') {
- // // "支付成功";
- // } else if (extraData.code == 'cancel') {
- // // "支付已取消";
- // this.$message.showToast("支付已取消" + extraData.errmsg)
- // } else {
- // // "支付失败：" + extraData.errmsg;
- // this.$message.showToast("支付失败：" + extraData.errmsg)
- // }
- // }
- //
- //只要是进入了这个支付页面，都算是支付了，不管成功与否都返回
- console.log('pay success options.referrerInfo', options.referrerInfo)
- //返回上一页
- let tmp = this
- await tmp.$store.dispatch('sign_add', 'shopping')
- //清空优惠券
- tmp.$store.dispatch('cache_coupon_select', {})
- tmp.$store.dispatch('cache_goods_select', [])
-
- await tmp.$message.showToast('支付成功',{
- duration:500
- })
- uni.navigateBack()
- return
- }
+ // #ifdef PUB_CUSTOMER
+ if (this.sign['cache_topay']) {
+ let options = wx.getEnterOptionsSync();
+ if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
+ // 代表从收银台小程序返回
+ let extraData = options.referrerInfo.extraData;
+ // if (!extraData) {
+ // // "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
+ // } else {
+ // if (extraData.code == 'success') {
+ // // "支付成功";
+ // } else if (extraData.code == 'cancel') {
+ // // "支付已取消";
+ // this.$message.showToast("支付已取消" + extraData.errmsg)
+ // } else {
+ // // "支付失败：" + extraData.errmsg;
+ // this.$message.showToast("支付失败：" + extraData.errmsg)
+ // }
+ // }
+ //
+ //只要是进入了这个支付页面，都算是支付了，不管成功与否都返回
+ console.log('pay success options.referrerInfo', options.referrerInfo)
+ //返回上一页
+ let tmp = this
+ await tmp.$store.dispatch('sign_add', 'shopping')
+ //清空优惠券
+ tmp.$store.dispatch('cache_coupon_select', {})
+ tmp.$store.dispatch('cache_goods_select', [])
+ // await tmp.$message.showToast('支付操作', {
+ // duration: 500
+ // })
+ uni.navigateBack()
+ await tmp.$store.dispatch('sign_clear', 'cache_topay')
+ return
+ }
+ }
// #endif
//优惠券
@@ -335,6 +337,7 @@
await tmp.$store.dispatch('sign_add', 'shopping')
uni.navigateBack()
} else if (data) {
+ // #ifndef PUB_CUSTOMER
wx.requestPayment({
...data,
async success(res) {
@@ -362,41 +365,34 @@
// uni.navigateBack()
}
})
-
+ // #endif
// openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2
-
- // #ifdef PUB_CUSTOMER_DEV
+
+ // #ifdef PUB_CUSTOMER
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
- })
-
- }
+ await tmp.$store.dispatch('sign_add', 'cache_topay')
+
+ wx.openEmbeddedMiniProgram({
+ appId: 'wxef277996acc166c3',
+ extraData: param
+ })
// #endif
}
--
Gitblit v1.9.3