From 131a276e5823d6fb3b6aae9dabab554487d8f0ce Mon Sep 17 00:00:00 2001
From: Dragon <13925835632@139.com>
Date: Fri, 14 Jul 2023 15:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/peko/common/js/common2.js                |  2 +-
 view/peko/modules/h5Income/chainBank.html     |  2 +-
 view/peko/modules/h5Income/css/chainBank.css  |  1 +
 view/peko/modules/h5Income/css/chainBank.scss |  1 +
 view/peko/modules/h5Income/css/index.css      |  4 +++
 view/peko/modules/h5Income/css/index.scss     | 11 +++++--
 view/peko/modules/h5Income/css/malaysia.css   |  1 +
 view/peko/modules/h5Income/css/malaysia.scss  |  1 +
 view/peko/modules/h5Income/css/other.css      |  1 +
 view/peko/modules/h5Income/css/other.scss     |  1 +
 view/peko/modules/h5Income/css/singapore.css  |  1 +
 view/peko/modules/h5Income/css/singapore.scss |  1 +
 view/peko/modules/h5Income/css/withdrawal.css |  4 +++
 .../peko/modules/h5Income/css/withdrawal.scss |  4 +++
 view/peko/modules/h5Income/js/index.js        | 13 ++++++++
 view/peko/modules/h5Income/js/login.js        |  5 ++-
 view/peko/modules/h5Income/js/rule.js         |  3 +-
 view/peko/modules/h5Income/js/withdrawal.js   | 32 +++++++++++++------
 view/peko/modules/h5Income/malaysia.html      |  4 +--
 view/peko/modules/h5Income/other.html         |  6 ++--
 view/peko/modules/h5Income/rule.html          |  4 +--
 view/peko/modules/h5Income/singapore.html     |  4 +--
 22 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/view/peko/common/js/common2.js b/view/peko/common/js/common2.js
index 321ed3f..ba1a541 100644
--- a/view/peko/common/js/common2.js
+++ b/view/peko/common/js/common2.js
@@ -547,7 +547,7 @@ function getInfoFromClient () {
         pubInfo.deviceId = "0";
         pubInfo.deviceInfo = {
             app: 'peko',
-            appVersion: '0.0.0',
+            appVersion: '9.9.9',
             os: '0.0.0',
             osVersion: '0.0.0',
             channel: 'browser',
diff --git a/view/peko/modules/h5Income/chainBank.html b/view/peko/modules/h5Income/chainBank.html
index 6f37055..23a4867 100644
--- a/view/peko/modules/h5Income/chainBank.html
+++ b/view/peko/modules/h5Income/chainBank.html
@@ -30,7 +30,7 @@
     <div class="box2">
         <div>
             <span>銀行卡號</span>
-            <input class="bankCard" type="number" placeholder="請填寫銀行卡號">
+            <input class="bankCard" type="text" placeholder="請填寫銀行卡號">
         </div>
         <div>
             <span>手機號碼</span>
diff --git a/view/peko/modules/h5Income/css/chainBank.css b/view/peko/modules/h5Income/css/chainBank.css
index 59fa744..8be0985 100644
--- a/view/peko/modules/h5Income/css/chainBank.css
+++ b/view/peko/modules/h5Income/css/chainBank.css
@@ -164,6 +164,7 @@ input::placeholder {
   left: 50%;
   transform: translateX(-50%);
   top: 0.3733333333rem;
+  z-index: 2;
 }
 
 .but {
diff --git a/view/peko/modules/h5Income/css/chainBank.scss b/view/peko/modules/h5Income/css/chainBank.scss
index ed72352..824364a 100644
--- a/view/peko/modules/h5Income/css/chainBank.scss
+++ b/view/peko/modules/h5Income/css/chainBank.scss
@@ -176,6 +176,7 @@ input {
                 left: 50%;
                 transform: translateX(-50%);
                 top: px2rem(28, );
+                z-index: 2;
             }
         }
     }
diff --git a/view/peko/modules/h5Income/css/index.css b/view/peko/modules/h5Income/css/index.css
index a5696f2..daecc5a 100644
--- a/view/peko/modules/h5Income/css/index.css
+++ b/view/peko/modules/h5Income/css/index.css
@@ -35,6 +35,10 @@ body {
   font-weight: bold;
   margin-bottom: 0.16rem;
   margin-top: 0.4rem;
+  width: 6.5rem;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
 }
 .myInfo div b {
   color: #8A8CAB;
diff --git a/view/peko/modules/h5Income/css/index.scss b/view/peko/modules/h5Income/css/index.scss
index 1e5014c..514c6c4 100644
--- a/view/peko/modules/h5Income/css/index.scss
+++ b/view/peko/modules/h5Income/css/index.scss
@@ -41,6 +41,10 @@ body {
             font-weight: bold;
             margin-bottom: px2rem(12, );
             margin-top: px2rem(30, );
+            width: 6.5rem;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
         }
 
         b {
@@ -100,6 +104,7 @@ body {
         position: absolute;
     }
 }
+
 .gold {
     width: px2rem(690, );
     height: px2rem(288, );
@@ -149,7 +154,8 @@ body {
         top: px2rem(110, );
         position: absolute;
     }
-    .exchangeGold{
+
+    .exchangeGold {
         width: px2rem(292, );
         height: px2rem(80, );
         line-height: px2rem(80, );
@@ -163,7 +169,8 @@ body {
         border: px2rem(2, ) solid #93570B;
         box-sizing: border-box;
     }
-    .withdrawal{
+
+    .withdrawal {
         width: px2rem(292, );
         height: px2rem(80, );
         line-height: px2rem(80, );
diff --git a/view/peko/modules/h5Income/css/malaysia.css b/view/peko/modules/h5Income/css/malaysia.css
index 7f9bf7a..c2af02d 100644
--- a/view/peko/modules/h5Income/css/malaysia.css
+++ b/view/peko/modules/h5Income/css/malaysia.css
@@ -164,6 +164,7 @@ input::placeholder {
   left: 50%;
   transform: translateX(-50%);
   top: 0.3733333333rem;
+  z-index: 2;
 }
 
 .but {
diff --git a/view/peko/modules/h5Income/css/malaysia.scss b/view/peko/modules/h5Income/css/malaysia.scss
index 21791c9..34862f7 100644
--- a/view/peko/modules/h5Income/css/malaysia.scss
+++ b/view/peko/modules/h5Income/css/malaysia.scss
@@ -176,6 +176,7 @@ input {
                 left: 50%;
                 transform: translateX(-50%);
                 top: px2rem(28, );
+                z-index: 2;
             }
         }
     }
diff --git a/view/peko/modules/h5Income/css/other.css b/view/peko/modules/h5Income/css/other.css
index 1961608..293caf7 100644
--- a/view/peko/modules/h5Income/css/other.css
+++ b/view/peko/modules/h5Income/css/other.css
@@ -133,6 +133,7 @@ input::placeholder {
   left: 50%;
   transform: translateX(-50%);
   top: 0.3733333333rem;
+  z-index: 2;
 }
 
 .but {
diff --git a/view/peko/modules/h5Income/css/other.scss b/view/peko/modules/h5Income/css/other.scss
index 8afbfaa..137e61b 100644
--- a/view/peko/modules/h5Income/css/other.scss
+++ b/view/peko/modules/h5Income/css/other.scss
@@ -141,6 +141,7 @@ input {
                 left: 50%;
                 transform: translateX(-50%);
                 top: px2rem(28, );
+                z-index: 2;
             }
         }
     }
diff --git a/view/peko/modules/h5Income/css/singapore.css b/view/peko/modules/h5Income/css/singapore.css
index 8cbb927..8d7c126 100644
--- a/view/peko/modules/h5Income/css/singapore.css
+++ b/view/peko/modules/h5Income/css/singapore.css
@@ -164,6 +164,7 @@ input::placeholder {
   left: 50%;
   transform: translateX(-50%);
   top: 0.3733333333rem;
+  z-index: 2;
 }
 
 .but {
diff --git a/view/peko/modules/h5Income/css/singapore.scss b/view/peko/modules/h5Income/css/singapore.scss
index 21791c9..34862f7 100644
--- a/view/peko/modules/h5Income/css/singapore.scss
+++ b/view/peko/modules/h5Income/css/singapore.scss
@@ -176,6 +176,7 @@ input {
                 left: 50%;
                 transform: translateX(-50%);
                 top: px2rem(28, );
+                z-index: 2;
             }
         }
     }
diff --git a/view/peko/modules/h5Income/css/withdrawal.css b/view/peko/modules/h5Income/css/withdrawal.css
index 5471492..184533a 100644
--- a/view/peko/modules/h5Income/css/withdrawal.css
+++ b/view/peko/modules/h5Income/css/withdrawal.css
@@ -52,6 +52,10 @@ body {
   font-weight: bold;
   margin-bottom: 0.16rem;
   margin-top: 0.4rem;
+  width: 6.5rem;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
 }
 .myInfo div b {
   color: #8A8CAB;
diff --git a/view/peko/modules/h5Income/css/withdrawal.scss b/view/peko/modules/h5Income/css/withdrawal.scss
index 4e5ab4d..242560e 100644
--- a/view/peko/modules/h5Income/css/withdrawal.scss
+++ b/view/peko/modules/h5Income/css/withdrawal.scss
@@ -59,6 +59,10 @@ body {
             font-weight: bold;
             margin-bottom: px2rem(12, );
             margin-top: px2rem(30, );
+            width: 6.5rem;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
         }
 
         b {
diff --git a/view/peko/modules/h5Income/js/index.js b/view/peko/modules/h5Income/js/index.js
index 7032db3..8b9ae3a 100644
--- a/view/peko/modules/h5Income/js/index.js
+++ b/view/peko/modules/h5Income/js/index.js
@@ -91,3 +91,16 @@ function getUser () {
 $('.back').click(function () {
     window.history.go(-1)
 })
+
+//返回页面 重新请求接口
+var hiddenProperty = 'hidden' in document ? 'hidden' :
+    'webkitHidden' in document ? 'webkitHidden' :
+        'mozHidden' in document ? 'mozHidden' : null;
+
+var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
+var onVisibilityChange = function () {
+    if (!document[hiddenProperty]) {
+        location.reload()
+    }
+}
+document.addEventListener(visibilityChangeEvent, onVisibilityChange);
\ No newline at end of file
diff --git a/view/peko/modules/h5Income/js/login.js b/view/peko/modules/h5Income/js/login.js
index df1db2e..272f5f3 100644
--- a/view/peko/modules/h5Income/js/login.js
+++ b/view/peko/modules/h5Income/js/login.js
@@ -101,7 +101,10 @@ function oauthToken () {
     networkRequest({
         type: 'POST',
         url: urlPrefix + '/oauth/token',
-        data: idOrPhone ? { "grant_type": "password", phone, password, client_id: "erban-client", "client_secret": "uyzjdhds" } : { grant_type: 'verify_code', phoneAreaCode, phone, code, client_id: "erban-client", "client_secret": "uyzjdhds" },
+        data: idOrPhone ? {
+            "grant_type": "password", phone, password, client_id: "erban-client", "client_secret": "uyzjdhds"
+        } :
+            { grant_type: 'verify_code', phoneAreaCode, phone:`${code}${phone}`, code, client_id: "erban-client", "client_secret": "uyzjdhds" },
         success (res) {
             if (res.code === 200) {
                 token = res.data.access_token;
diff --git a/view/peko/modules/h5Income/js/rule.js b/view/peko/modules/h5Income/js/rule.js
index 4a500f8..c1d4e9c 100644
--- a/view/peko/modules/h5Income/js/rule.js
+++ b/view/peko/modules/h5Income/js/rule.js
@@ -46,7 +46,8 @@ function getConfig () {
         data: { uid: pubInfo.uid },
         success (res) {
             if (res.code === 200) {
-                $('.box p b').text(res.data.weekMaxValue);
+                $('.box p .b2').text(res.data.weekLimitCount);
+                $('.box p .b1').text(res.data.minValue);
             } else if (res.code ? res.code == 401 : JSON.parse(res).code == 401) {
                 window.location.href = './login.html'
             } else {
diff --git a/view/peko/modules/h5Income/js/withdrawal.js b/view/peko/modules/h5Income/js/withdrawal.js
index 4847f53..c575800 100644
--- a/view/peko/modules/h5Income/js/withdrawal.js
+++ b/view/peko/modules/h5Income/js/withdrawal.js
@@ -57,7 +57,7 @@ function getConfig () {
                 var str = `
                 <p>收益金幣達到${res.data.minValue}或以上可以申請提領</p>
                 <p>提領金幣必須為100的整倍數</p>
-                <p>每周可提領次數：<i>${res.data.weekMaxValue}</i></p>
+                <p>每周可提領次數：<i>${res.data.weekLimitCount}</i></p>
                 <p>提領手續費：<i>${res.data.chargeRate}%</i></p>
                 `
                 $('.withdrawal').append(str);
@@ -229,6 +229,7 @@ $('.switch .pub_in .ok').click(function () {
     $('.account span').addClass('active');
     $('.accountPub').hide();
     $('.switch').hide();
+    calculate();
 })
 // 确定输入提領弹窗按钮
 $('.goldPub .goldPub_in .but').click(function () {
@@ -245,6 +246,13 @@ $('.goldPub .goldPub_in .but').click(function () {
         toastMsg(`提領金幣必須為100的整倍數`);
         return
     }
+    calculate();
+    return false;
+})
+// 计算汇率接口
+function calculate () {
+    var num = $('.goldPub .goldPub_in input').val();
+    num.length == 0 ? num = $('.withdrawal input').val() : num;
     showLoading()
     networkRequest({
         type: 'GET',
@@ -264,7 +272,6 @@ $('.goldPub .goldPub_in .but').click(function () {
             } else {
                 toastMsg(res.message)
             }
-            console.log();
             hideLoading(layerIndex)
         },
         error (err) {
@@ -272,8 +279,7 @@ $('.goldPub .goldPub_in .but').click(function () {
             toastMsg('網絡錯誤，請退出重進')
         }
     })
-    return false;
-})
+}
 // 关闭二次确认提領按钮
 $('.withDrawalPub').click(function () {
     $('.withDrawalPub').hide();
@@ -290,10 +296,6 @@ $('.butBig').click(function () {
         toastMsg('超出本周最大提领次数')
         return
     }
-    if (num >= weekMaxValue) {
-        toastMsg('超出本周最大提领金额')
-        return
-    }
     $('.withDrawalPub .withDrawalPub_in p ').html(`確認通過 <b>${$('.account .active').text()}</b> 提領 <b>${num}</b>金幣?`)
     $('.withDrawalPub .withDrawalPub_in span b ').html(`${$('.withdrawal .numBox b').text()}`)
     $('.withDrawalPub').show();
@@ -360,4 +362,16 @@ $('.back').click(function () {
 // 跳转提領规则页面
 $('.income .rule').click(function () {
     window.location.href = './rule.html';
-})
\ No newline at end of file
+})
+//返回页面 重新请求接口
+var hiddenProperty = 'hidden' in document ? 'hidden' :
+    'webkitHidden' in document ? 'webkitHidden' :
+        'mozHidden' in document ? 'mozHidden' : null;
+
+var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
+var onVisibilityChange = function () {
+    if (!document[hiddenProperty]) {
+        location.reload()
+    }
+}
+document.addEventListener(visibilityChangeEvent, onVisibilityChange);
\ No newline at end of file
diff --git a/view/peko/modules/h5Income/malaysia.html b/view/peko/modules/h5Income/malaysia.html
index bc04e37..32d0306 100644
--- a/view/peko/modules/h5Income/malaysia.html
+++ b/view/peko/modules/h5Income/malaysia.html
@@ -50,11 +50,11 @@
     <div class="box2">
         <div>
             <span>銀行收款賬戶</span>
-            <input class="bankAccount " type="number" placeholder="例：666666">
+            <input class="bankAccount " type="text" placeholder="例：666666">
         </div>
         <div>
             <span>銀行名稱</span>
-            <input class="bankName" type="number" placeholder="例：CIMB Bank">
+            <input class="bankName" type="text" placeholder="例：CIMB Bank">
         </div>
         <div>
             <span>SWIFT CODE</span>
diff --git a/view/peko/modules/h5Income/other.html b/view/peko/modules/h5Income/other.html
index cc17ff6..845f378 100644
--- a/view/peko/modules/h5Income/other.html
+++ b/view/peko/modules/h5Income/other.html
@@ -19,11 +19,11 @@
     <div class="box2">
         <div>
             <span>Payoneer賬戶</span>
-            <input class="bankCard" type="number" placeholder="Payoneer賬戶">
+            <input class="bankCard" type="text" placeholder="Payoneer賬戶">
         </div>
         <div>
             <span>真實姓名</span>
-            <input class="name" type="number" placeholder="例：張三">
+            <input class="name" type="text" placeholder="例：張三">
         </div>
         <div>
             <span>身份證號</span>
@@ -62,7 +62,7 @@
     <div class="rule">
         <p>註意：</p>
         <p>1.其他賬戶提領將由Payoneer發放；</p>
-        <p>2.Payoneer的使用方法請聯繫客服 Wechat:xxxx 咨詢；</p>
+        <p>2.Payoneer的使用方法請聯繫客服 Wechat:sd245376 咨詢；</p>
         <p>3.Payoneer賬戶必須與真實姓名一致，否則提領不能到賬；</p>
         <p>4.請勿將賬號綁定他人的姓名，提領真實姓名綁定後不能修改，請謹慎操作；</p>
         <p>5.首次進行提領流程時，會需要上傳您的身份證相關信息；</p>
diff --git a/view/peko/modules/h5Income/rule.html b/view/peko/modules/h5Income/rule.html
index 5978616..c45681f 100644
--- a/view/peko/modules/h5Income/rule.html
+++ b/view/peko/modules/h5Income/rule.html
@@ -22,8 +22,8 @@
         <p>可以通過接受別人打賞的禮物，獲得金幣。</p>
         <p>3.收益提領规则</p>
         <p>3.1. 1000金幣等於1美元，根據提領地區匯率換算，匯率每週更新</p>
-        <p>3.2. 每周可申請提領5次，次日發放；</p>
-        <p>3.3. 金幣數量需大於或等於<b></b>金幣才能申請提取；</p>
+        <p>3.2. 每周可申請提領<b class="b2"></b>次，次日發放；</p> 
+        <p>3.3. 金幣數量需大於或等於<b class="b1"></b>金幣才能申請提取；</p>
         <p>3.4. 如您的提領信息有誤無法發放，金幣原路退回帳號，請聯繫客服；</p>
         <p>4.金幣兌換鑽石规则</p>
         <p>金幣可兌換為鑽石，兌換比例：1000金幣=1000鑽石。</p>
diff --git a/view/peko/modules/h5Income/singapore.html b/view/peko/modules/h5Income/singapore.html
index 7f8af0f..65e4e74 100644
--- a/view/peko/modules/h5Income/singapore.html
+++ b/view/peko/modules/h5Income/singapore.html
@@ -50,11 +50,11 @@
     <div class="box2">
         <div>
             <span>銀行收款賬戶</span>
-            <input class="bankAccount " type="number" placeholder="例：666666">
+            <input class="bankAccount " type="text" placeholder="例：666666">
         </div>
         <div>
             <span>銀行名稱</span>
-            <input class="bankName" type="number" placeholder="例：CIMB Bank">
+            <input class="bankName" type="text" placeholder="例：CIMB Bank">
         </div>
         <div>
             <span>SWIFT CODE</span>