From 4050c112f00c2b7f600949699208b60e8f713138 Mon Sep 17 00:00:00 2001 From: lf <1534621107@qq.com> Date: Wed, 24 Jul 2024 11:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E5=82=A8app=20=E5=94=A4=E8=B5=B7?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- combining.html | 15 +++++++-------- packkey/combining.html | 17 ++++++++--------- packkey/reduce.html | 12 ++++++------ reduce.html | 27 +++++++++++++-------------- xw-pages/reduce.html | 19 +++++++++---------- xw-pages/wx-combining.html | 14 +++++++------- 6 files changed, 50 insertions(+), 54 deletions(-) diff --git a/combining.html b/combining.html index 156cb3e..9284edb 100644 --- a/combining.html +++ b/combining.html @@ -549,16 +549,15 @@ this.publicCollection(); } else { /* 小程序 */ - let ua = navigator.userAgent; - // 邮储-唤起微信小程序 - if (ua.indexOf("CreditCardAppNew") > -1) { + let ua = navigator.userAgent; //判断用户打开链接环境 + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 Fw.device.api.openWXMiniProgram({ - programID: "wx9ed74283ad25bca1", + programID: "gh_07fecf7a6d31", path: "pages/index/index", - miniType: 2, // 1 开发版 2 体验版 - extJson: { - order_number: res.data.order_number - } + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 + extJson: JSON.stringify({ + ...res.data + }) }) } else { window.location.replace(res.data.redirect_url); diff --git a/packkey/combining.html b/packkey/combining.html index 3c23025..6c01fb5 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -565,16 +565,15 @@ this.publicCollection(); } else { /* 小程序 */ - let ua = navigator.userAgent; - // 邮储-唤起微信小程序 - if (ua.indexOf("CreditCardAppNew") > -1) { - return Fw.device.api.openWXMiniProgram({ - programID: "wx9ed74283ad25bca1", + let ua = navigator.userAgent; //判断用户打开链接环境 + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 + Fw.device.api.openWXMiniProgram({ + programID: "gh_07fecf7a6d31", path: "pages/index/index", - miniType: 2, // 1 开发版 2 体验版 - extJson: { - order_number: res.data.order_number - } + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 + extJson: JSON.stringify({ + ...res.data + }) }) } else { window.location.replace(res.data.redirect_url); diff --git a/packkey/reduce.html b/packkey/reduce.html index 9a0ba0f..d62f82f 100644 --- a/packkey/reduce.html +++ b/packkey/reduce.html @@ -262,14 +262,14 @@ self.toLinkAlipay(); } if (self.plaflam == 2) { - if (ua.indexOf("CreditCardAppNew") > -1) { + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 return Fw.device.api.openWXMiniProgram({ - programID: "wx9ed74283ad25bca1", + programID: "gh_07fecf7a6d31", path: "pages/index/index", - miniType: 2, // 1 开发版 2 体验版 - extJson: { - order_number: res.data.order_number - } + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 + extJson: JSON.stringify({ + ...res.data + }) }) } //微信 diff --git a/reduce.html b/reduce.html index 3654622..5da598f 100644 --- a/reduce.html +++ b/reduce.html @@ -258,18 +258,18 @@ } if (self.plaflam == 2) { // 邮储-唤起微信小程序 - alert(3) - // let ua = navigator.userAgent; //判断用户打开链接环境 - // if (ua.indexOf("CreditCardAppNew") > -1) { - // return Fw.device.api.openWXMiniProgram({ - // programID: "gh_07fecf7a6d31", - // path: "pages/index/index", - // // miniType: 2, // 1 开发版 2 体验版 - // extJson: JSON.stringify({ - // ...res.data - // }) - // }) - // } + let ua = navigator.userAgent; //判断用户打开链接环境 + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 + this.loading = false; + return Fw.device.api.openWXMiniProgram({ + programID: "gh_07fecf7a6d31", + path: "pages/index/index", + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 + extJson: JSON.stringify({ + ...res.data + }) + }) + } //微信 // if (ua.indexOf("dingtalk") > -1) { // //在钉钉内置环境打开，不能唤起微信小程序 @@ -280,8 +280,7 @@ } else { this.loading = false; //唤起微信福利官小程序 - // window.location.replace(res.data.redirect_url); - window.open(res.data.redirect_url) + window.location.replace(res.data.redirect_url); } // } diff --git a/xw-pages/reduce.html b/xw-pages/reduce.html index 14f5bf2..2f4eb3b 100644 --- a/xw-pages/reduce.html +++ b/xw-pages/reduce.html @@ -265,17 +265,16 @@ } else { // 第二步：其它环境 微信小程序 this.loading = false; - let ua = navigator.userAgent; - // 邮储-唤起微信小程序 - if (ua.indexOf("CreditCardAppNew") > -1) { - return Fw.device.api.openWXMiniProgram({ - programID: "wx9ed74283ad25bca1", - path: "pages/index/index", - miniType: 2, // 1 开发版 2 体验版 - extJson: { - order_number: res.data.order_number - } + let ua = navigator.userAgent; //判断用户打开链接环境 + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 + Fw.device.api.openWXMiniProgram({ + programID: "gh_07fecf7a6d31", + path: "pages/index/index", + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 + extJson: JSON.stringify({ + ...res.data }) + }) } else { window.location.replace(res.data.redirect_url); } diff --git a/xw-pages/wx-combining.html b/xw-pages/wx-combining.html index f19c237..0f645a1 100644 --- a/xw-pages/wx-combining.html +++ b/xw-pages/wx-combining.html @@ -516,15 +516,15 @@ } else { /* 小程序 */ // 邮储-唤起微信小程序 - let ua = navigator.userAgent; - if (ua.indexOf("CreditCardAppNew") > -1) { + let ua = navigator.userAgent; //判断用户打开链接环境 + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 Fw.device.api.openWXMiniProgram({ - programID: "wx9ed74283ad25bca1", + programID: "gh_07fecf7a6d31", path: "pages/index/index", - miniType: 2, // 1 开发版 2 体验版 - extJson: { - order_number: res.data.order_number - } + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 + extJson: JSON.stringify({ + ...res.data + }) }) } else { window.location.replace(res.data.redirect_url);