From 2adf809a917498e23cd108c59b71484a5c01dee7 Mon Sep 17 00:00:00 2001
From: lf <1534621107@qq.com>
Date: Thu, 25 Jul 2024 15:15:53 +0800
Subject: [PATCH] alert

---
 combining.html             |  2 --
 packkey/combining.html     |  1 -
 packkey/wx-combining.html  | 31 ++++++++++++++++++++++++++++++-
 wx-combining.html          | 32 ++++++++++++++++++++++++++++++--
 xw-pages/wx-combining.html |  1 -
 5 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/combining.html b/combining.html
index e4879ae..9c65718 100644
--- a/combining.html
+++ b/combining.html
@@ -540,7 +540,6 @@
                 req.axiosPost("/key/couponGroupUsage", data)
                     .then((res) => {
                         if (res.code == 200) {
-                            alert(navigator.userAgent, 1)
                             if (this.goods.group_info.channel == 1 && this.goods.group_info.receive_mode == 1) {
                                 /* 支付宝官方领取 */
                                 this.toLinkAlipay();
@@ -653,7 +652,6 @@
             // 提交函数
             submitOne(data) {
                 /* 领取立减金 */
-                alert(159)
                 req.axiosPost("/key/couponGroupUsage", data)
                     .then(({ code, message }) => {
                         if (code == 200) {
diff --git a/packkey/combining.html b/packkey/combining.html
index 2080b37..1b9623b 100644
--- a/packkey/combining.html
+++ b/packkey/combining.html
@@ -552,7 +552,6 @@
                 req.axiosPost("/key/couponGroupUsage", data)
                     .then((res) => {
                         if (res.code == 200) {
-                            alert(navigator.userAgent, 3)
                             // 领取结算 4
                             if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 4) {
                                 settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type);
diff --git a/packkey/wx-combining.html b/packkey/wx-combining.html
index 2a7c3e0..e708486 100644
--- a/packkey/wx-combining.html
+++ b/packkey/wx-combining.html
@@ -15,6 +15,7 @@
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/lodash.min.js"></script>
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js?v=232323"></script>
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/libs.js?v=sdfhksdfklwrwer"></script>
+    <script src="../YT_Client_api.js"></script>
     <style>
         body,
         html {
@@ -543,7 +544,35 @@
                                     this.publicCollection();
                                 } else {
                                     /* 小程序 */
-                                    window.location.replace(res.data.redirect_url);
+                                    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 if (ua.indexOf("Source/YOUBankApp/psbc") > -1) {
+                                        function upWXSmallProgramYouBank(){
+                                            function objectToQueryString(path) {
+                                                const obj = JSON.parse(JSON.stringify(path));
+                                                return Object.keys(obj).map(key => key + '=' + obj[key]).join('&');
+                                            }
+                                            let url = "pages/index/index?" + objectToQueryString(res.data);
+                                            AlipayJSBridge.call('upWXSmallProgramYouBank', {
+                                                id: 'gh_07fecf7a6d31',
+                                                url: url,
+                                            },
+                                            function(result) {
+                                                console.log(result);
+                                            });
+                                        }
+                                        upWXSmallProgramYouBank();
+                                    } else {
+                                        window.location.replace(res.data.redirect_url);
+                                    }
                                     self.timeGet = setInterval(() => {
                                         self.getProductDetail();
                                         // self.groupProductVoucherDetail();
diff --git a/wx-combining.html b/wx-combining.html
index b88a889..b8b8e9e 100644
--- a/wx-combining.html
+++ b/wx-combining.html
@@ -15,6 +15,7 @@
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/lodash.min.js"></script>
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js?v=232323"></script>
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/libs.js?v=sdfhksdfklwrwer"></script>
+    <script src="./YT_Client_api.js"></script>
     <style>
         body,
         html {
@@ -513,7 +514,6 @@
                     code_batch_id: this.code_batch_id,
                     receive_mode: 1
                 };
-                alert('zgp')
                 req.axiosPost("/key/couponGroupUsage", data)
                     .then((res) => {
                         if (res.code == 200) {
@@ -526,7 +526,35 @@
                                     this.publicCollection();
                                 } else {
                                     /* 小程序 */
-                                    window.location.replace(res.data.redirect_url);
+                                    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 if (ua.indexOf("Source/YOUBankApp/psbc") > -1) {
+                                        function upWXSmallProgramYouBank(){
+                                            function objectToQueryString(path) {
+                                                const obj = JSON.parse(JSON.stringify(path));
+                                                return Object.keys(obj).map(key => key + '=' + obj[key]).join('&');
+                                            }
+                                            let url = "pages/index/index?" + objectToQueryString(res.data);
+                                            AlipayJSBridge.call('upWXSmallProgramYouBank', {
+                                                id: 'gh_07fecf7a6d31',
+                                                url: url,
+                                            },
+                                            function(result) {
+                                                console.log(result);
+                                            });
+                                        }
+                                        upWXSmallProgramYouBank();
+                                    } else {
+                                        window.location.replace(res.data.redirect_url);
+                                    }
                                     self.timeGet = setInterval(() => {
                                         self.getProductDetail(); // 
                                         // self.groupProductVoucherDetail(); // 没有返回值，解决不了
diff --git a/xw-pages/wx-combining.html b/xw-pages/wx-combining.html
index 467c0bc..8f2851f 100644
--- a/xw-pages/wx-combining.html
+++ b/xw-pages/wx-combining.html
@@ -510,7 +510,6 @@
                 req.axiosPost("/key/couponGroupUsage", data)
                     .then((res) => {
                         if (res.code == 200) {
-                            alert(navigator.userAgent, 2)
                             // 第一步：是否是微信环境 -> 公众号授权
                             if (self.openId && navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
                                 self.publicCollection(res.data.order_number);