From 495eca12cace0073d266031d21967a21cea98cef Mon Sep 17 00:00:00 2001
From: qf <tanqiaofei@xuanyinyy.com>
Date: Tue, 27 Dec 2022 15:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=B9=B4=E6=B4=BB=E5=8A=A8=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=B7=E6=AD=8C=E5=8C=85=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peko/activity/act-newYear-2022/index.html |  2 +-
 .../activity/act-newYear-2022/js/index.js     | 25 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/view/peko/activity/act-newYear-2022/index.html b/view/peko/activity/act-newYear-2022/index.html
index 5eebf26..131a9c9 100644
--- a/view/peko/activity/act-newYear-2022/index.html
+++ b/view/peko/activity/act-newYear-2022/index.html
@@ -188,7 +188,7 @@
     <script src="../../common/js/layer.js"></script>
     <script src="../../common/js/vconsole.min.js"></script>
     <script src="../../common/js/svga.min.js"></script>
-    <script src="./js/index.js?v=1.1"></script>
+    <script src="./js/index.js?v=1.3"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/view/peko/activity/act-newYear-2022/js/index.js b/view/peko/activity/act-newYear-2022/js/index.js
index d55b970..c03d7a1 100644
--- a/view/peko/activity/act-newYear-2022/js/index.js
+++ b/view/peko/activity/act-newYear-2022/js/index.js
@@ -31,7 +31,7 @@ const toastMsg = (content = '操作完成', time = 2) => {
     })
 }
 
-if (false) {//!browser.app
+if (!browser.app) {//false
     toastMsg('請在app內打開！');
 } else {
     $('.wrap').removeClass('no-in-app')
@@ -107,7 +107,7 @@ function getInit() {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -156,7 +156,7 @@ function getConvertRecord(page) {
             scrollBool = true;
             bodyScroolFun(false)
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -204,7 +204,7 @@ function openFireworks(type, num) {
         error(err) {
             canWish = true
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -272,7 +272,7 @@ function getRank(type) {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -290,7 +290,7 @@ function sendLog(event) {
             }
         },
         error(err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -368,7 +368,7 @@ $('.gift-box-wrap .wish').click(function () {
                 // }, 1000);
             }
         }else {
-            toastMsg('烟花点燃中，请稍后~')
+            toastMsg('煙花點燃中，請稍後~')
         }
 
 
@@ -523,8 +523,15 @@ $('.tishiBox .close').click(function () {
 $('.tishiBox').on('click', '.recharge', function () {
     if (browser.app) {
         if (browser.android) {
-            sendLog('pay_click')
-            window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+            let channel = pubInfo.deviceInfo.channel;
+            console.log(pubInfo.deviceInfo);
+            if (channel == "google") {
+                sendLog('pay_click')
+                window.androidJsObj.openChargePage(0);
+            } else {
+                sendLog('pay_click')
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+            }
         } else if (browser.ios) {
             sendLog('pay_click')
             window.webkit.messageHandlers.openChargePage.postMessage(null)