diff --git a/combining.html b/combining.html index f263902..888ea67 100644 --- a/combining.html +++ b/combining.html @@ -550,7 +550,8 @@ } else { /* 小程序 */ let ua = navigator.userAgent; //判断用户打开链接环境 - if (ua.indexOf("CreditCardAppNew") > -1 || ua.indexOf("CreditCardAppNew UnionPay/1.0") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 + let plan_id = localStorage.getItem('plan_id'); + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 Fw.device.api.openWXMiniProgram({ programID: "gh_07fecf7a6d31", path: `pages/index/index?code_batch_id=${this.code_batch_id}&token=${this.token}`, diff --git a/index.html b/index.html index b180101..dec6c04 100644 --- a/index.html +++ b/index.html @@ -154,6 +154,7 @@ localStorage.setItem('product_list', JSON.stringify(res.data[this.typeList[res.data.page]].product_list)); localStorage.setItem('product_detail', JSON.stringify(res.data[this.typeList[res.data.page]].product_detail)); localStorage.setItem('test', window.location.href); + localStorage.setItem('plan_id', res.data.plan_id); self.loading = false; localStorage.setItem('linkId', linkId); //是否携带token diff --git a/packkey/combining.html b/packkey/combining.html index 923984c..b9ff360 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -569,8 +569,8 @@ 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 删除 + path: `pages/index/index?code_batch_id=${this.code_batch_id}&token=${this.token}`, + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 extJson: JSON.stringify({ code_batch_id: this.code_batch_id, token: this.token, diff --git a/packkey/reduce.html b/packkey/reduce.html index f44b851..fc63586 100644 --- a/packkey/reduce.html +++ b/packkey/reduce.html @@ -265,8 +265,8 @@ if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 return Fw.device.api.openWXMiniProgram({ programID: "gh_07fecf7a6d31", - path: "pages/index/index", - // miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 + path: `pages/index/index?order_number=${res.data.order_number}`, + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 extJson: JSON.stringify({ order_number: res.data.order_number }) diff --git a/packkey/wx-combining.html b/packkey/wx-combining.html index 2f64cfc..6262d31 100644 --- a/packkey/wx-combining.html +++ b/packkey/wx-combining.html @@ -548,8 +548,8 @@ 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 删除 + path: `pages/index/index?code_batch_id=${this.code_batch_id}&token=${this.token}`, + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 extJson: JSON.stringify({ code_batch_id: this.code_batch_id, token: this.token, diff --git a/reduce.html b/reduce.html index a366798..1f61c8e 100644 --- a/reduce.html +++ b/reduce.html @@ -259,7 +259,9 @@ if (self.plaflam == 2) { // 邮储-唤起微信小程序 let ua = navigator.userAgent; //判断用户打开链接环境 - if (ua.indexOf("CreditCardAppNew") > -1 || ua.indexOf("CreditCardAppNew UnionPay/1.0") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 + let plan_id = localStorage.getItem('plan_id'); + alert(plan_id) + if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 this.loading = false; return Fw.device.api.openWXMiniProgram({ programID: "gh_07fecf7a6d31", diff --git a/wx-combining.html b/wx-combining.html index a4f574c..a7a939d 100644 --- a/wx-combining.html +++ b/wx-combining.html @@ -527,6 +527,8 @@ } else { /* 小程序 */ let ua = navigator.userAgent; //判断用户打开链接环境 + let plan_id = localStorage.getItem('plan_id'); + alert(plan_id) if (ua.indexOf("CreditCardAppNew") > -1) { // 正式z 用 CreditCardAppNew UnionPay/1.0 Fw.device.api.openWXMiniProgram({ programID: "gh_07fecf7a6d31", diff --git a/xw-pages/reduce.html b/xw-pages/reduce.html index 757f9f9..955919e 100644 --- a/xw-pages/reduce.html +++ b/xw-pages/reduce.html @@ -266,11 +266,12 @@ // 第二步:其它环境 微信小程序 this.loading = false; let ua = navigator.userAgent; //判断用户打开链接环境 + let plan_id = localStorage.getItem('plan_id'); 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 删除 + path: `pages/index/index?order_number=${res.data.order_number}`, + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 extJson: JSON.stringify({ order_number: res.data.order_number }) diff --git a/xw-pages/wx-combining.html b/xw-pages/wx-combining.html index ddd6152..f52d6db 100644 --- a/xw-pages/wx-combining.html +++ b/xw-pages/wx-combining.html @@ -520,8 +520,8 @@ 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 删除 + path: `pages/index/index?code_batch_id=${this.code_batch_id}&token=${this.token}`, + miniType: 2, // 1 开发版 2 体验版 // 正式z 删除 extJson: JSON.stringify({ code_batch_id: this.code_batch_id, token: this.token,