1、上传充值2、完成第三方分享modLink3、替换帮助繁体化

view/peko/activity/act-ocean/index.html

@@ -30,9 +30,9 @@
                 <!-- <div class="current-tip">玩法：选择碎片数量→选择食材</div> -->
 
                 <div class="btn-wrap">
-                    <div class="active">100金幣</div>
-                    <div>1000金幣</div>
-                    <div>10000金幣</div>
+                    <div class="active">100钻石</div>
+                    <div>1000钻石</div>
+                    <div>10000钻石</div>
                 </div>
                 <ul>
 
@@ -107,7 +107,7 @@
                 <div class="fragment">用户昵称</div>
                 <div class="award">今日獎勵：<span>0</span></div>
             </div>
-            <div class="activeBalance">余額：<span></span>金幣 <b>儲值></b></div>
+            <div class="activeBalance">余額：<span></span>钻石 <b>儲值></b></div>
             <!-- <div class="add"><img src="./images/add.png" alt=""></div> -->
             
         </div>
@@ -119,7 +119,7 @@
                 <main>
                     <h3>遊戲規則</h3>
                     <div>
-                        <p>1.每次至少選擇1種森林動物，可多次疊加選擇，中獎後可以獲得對應金幣獎勵（中獎森林動物選中數*中獎森林動物對應倍數）</p>
+                        <p>1.每次至少選擇1種森林動物，可多次疊加選擇，中獎後可以獲得對應钻石獎勵（中獎森林動物選中數*中獎森林動物對應倍數）</p>
                         <p>2.活動結束將關閉頁面，請留意活動關閉時間。</p>
                         <p>3.本活動與Apple Inc.無關，最終解釋權歸平臺所有。</p>
                     </div>
@@ -134,7 +134,7 @@
                 <div class="rank-top">
 
                     <div class="tab-wrap">
-                        <span class="diamond-rank active">金幣榜</span>
+                        <span class="diamond-rank active">钻石榜</span>
                         <span class="num-rank">今日歐皇榜</span>
                     </div>
 
@@ -161,12 +161,12 @@
         <!-- 碎片不足提示弹窗 -->
         <div class="shade-mask-fragmentNum">
             <div class="shade-content-fragmentNum">
-                <div class="fragmentNum-title">金幣不足</div>
+                <div class="fragmentNum-title">钻石不足</div>
                 <img src="./images/mall/no-money.png" alt="">
-                <p>當前金幣不足</p>
+                <p>當前钻石不足</p>
                 <div class="fragmentNum-btn-wrap">
                     <div class="cancel-btn">取消</div>
-                    <div class="confirm-btn">獲取金幣</div>
+                    <div class="confirm-btn">獲取钻石</div>
                 </div>
             </div>
         </div>

view/peko/activity/act-ocean/js/index.js

@@ -53,7 +53,7 @@ const getUserInfo = (param) => {
                 if (res.data.todayReward.toString().length >= 5) {
                     res.data.todayReward = (res.data.todayReward / 10000).toFixed(2) + 'W'
                 }
-                $('.info-bottom').find('.award span').html(res.data.todayReward + '金幣')
+                $('.info-bottom').find('.award span').html(res.data.todayReward + '钻石')
                 $('.info-bottom').find('.fragment').html(res.data.nick)
                 myFragment = res.data.diamonds
                 $('.info-bottom .activeBalance span').text(res.data.diamonds);

view/peko/activity/act-ocean/js/record.js

@@ -80,7 +80,7 @@ const renderRecord = (res) => {
                 <h3>${dateFormat(res.drawTime, 'yy-MM-dd hh:mm:ss')}</h3>
                 <div class="goldBox">
                     <span>遊戲獎勵：</span>
-                    <span class="gold">${res.reward}金幣</span>
+                    <span class="gold">${res.reward}钻石</span>
                 </div>
                 <div class="marine_organism"></div>
                 <p style="display: ${res.drawStatus == 1 ? 'none' : 'block'};" class="fasle">哎呀~猜錯了o(╥﹏╥)o</p>

view/peko/activity/act-ocean/rank.html

@@ -14,7 +14,7 @@
     <div class="rank-top">
 
       <div class="tab-wrap">
-        <span class="diamond-rank active">金幣榜</span>
+        <span class="diamond-rank active">钻石榜</span>
         <span class="num-rank">欧皇榜</span>
       </div>
 

view/peko/activity/activemodel/index.html

@@ -35,7 +35,7 @@
     <div id="download"><a href="javascript:void(0)">点击进入</a></div>
   </div> -->
   <script src="../../common/js/jquery-3.2.1.min.js"></script>
-  <script src="../../common/js/common.js"></script>
+  <script src="../../common/js/common2.js"></script>
   <script src="../../common/js/template-web.js"></script>
   <script src="../../common/js/vconsole.min.js"></script>
   <script src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>

view/peko/activity/activemodel/js/index.js

@@ -4,7 +4,7 @@ var betaUrl;
 var realUrl;
 var share;
 var browser = checkVersion();
-var api = locateJudge();
+var api = getUrlPrefix();
 var queryData = getQueryString();
 var code = queryData.code;
 $(function() {

view/peko/modules/pay/css/index.css

@@ -2,7 +2,7 @@
 body,
 html {
   height: 100%;
-  background: #fff;
+  background: #F3F5FA;
 }
 body .logingActive,
 html .logingActive {
@@ -48,8 +48,7 @@ html .header {
   height: 6.6666666667rem;
   background: #000;
   margin: 0 auto;
-  background: linear-gradient(180deg, #F4E1FF 0%, #F3F5FA 100%);
-  background-size: 100% 100%;
+  background: linear-gradient(180deg, #F2E0FF 0%, #FAF7FE 100%);
 }
 body .header .header_top,
 html .header .header_top {
@@ -104,14 +103,13 @@ html .header .header_top .header_top_right b {
 }
 body .header .user,
 html .header .user {
-  background: none;
+  background: #FFFFFF;
   outline: none;
   border: none;
   width: 8.9333333333rem;
   height: 0.8533333333rem;
   border-radius: 0.8533333333rem;
   margin: 0.5333333333rem auto 0;
-  border: 2px solid #000;
   display: block;
   box-sizing: border-box;
   padding: 0 0.1333333333rem;
@@ -136,14 +134,19 @@ html .pay_method p {
   width: 100%;
   height: 0.8rem;
 }
+body .pay_method .methodBox,
+html .pay_method .methodBox {
+  display: flex;
+  flex-wrap: wrap;
+}
 body .pay_method .methods,
 html .pay_method .methods {
-  width: 100%;
+  width: 30%;
   min-height: 2.5rem;
   display: flex;
   flex-wrap: wrap;
-  justify-content: start;
   padding-left: 0.285rem;
+  margin-bottom: 0.1rem;
 }
 body .pay_method .methods span,
 html .pay_method .methods span {
@@ -154,8 +157,9 @@ html .pay_method .methods span {
   background: #F0F5F6;
   border-radius: 0.16rem;
   position: relative;
-  margin-bottom: 0.6933333333rem;
+  margin-bottom: 1rem;
   margin-right: 0.3rem;
+  box-sizing: border-box;
 }
 body .pay_method .methods span img,
 html .pay_method .methods span img {
@@ -163,28 +167,30 @@ html .pay_method .methods span img {
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
-  width: 3rem;
-  height: 1.8rem;
+  width: 1.8rem;
+  height: 1.5rem;
   border-radius: 50%;
   overflow: hidden;
 }
 body .pay_method .methods span p,
 html .pay_method .methods span p {
-  color: #333;
+  color: #B3B3C3;
   font-size: 0.32rem;
   width: 100%;
   text-align: center;
   position: absolute;
   left: 0;
-  bottom: -0.9rem;
+  top: 1.9rem;
 }
 body .pay_method .methods .active,
 html .pay_method .methods .active {
-  border-radius: 0.16rem;
-  box-sizing: border-box;
   background: url(../images/jvxing.png) no-repeat;
   background-size: 100% 100%;
 }
+body .pay_method .methods .active p,
+html .pay_method .methods .active p {
+  color: #9168FA;
+}
 body .pay_number,
 html .pay_number {
   width: 9.2rem;
@@ -215,8 +221,7 @@ html .pay_number .number span {
   display: block;
   width: 4.1866666667rem;
   height: 2.24rem;
-  background: url(../images/noActive.png) no-repeat;
-  background-size: 100% 100%;
+  background: #F0F5F6;
   border-radius: 0.16rem;
   position: relative;
   margin-bottom: 0.5333333333rem;
@@ -246,28 +251,26 @@ html .pay_number .number .active {
 body .pay_number .but1,
 html .pay_number .but1 {
   color: #B3B3C3;
-  font-size: 0.48rem;
+  font-size: 0.4266666667rem;
   width: 8.1066666667rem;
-  height: 1.4933333333rem;
+  height: 1.2266666667rem;
   border-radius: 1.4933333333rem;
-  line-height: 1.4933333333rem;
+  line-height: 1.2266666667rem;
   margin: 0 auto;
   text-align: center;
   background: #E6E6F0;
-  background-size: 100% 100%;
 }
 body .pay_number .but2,
 html .pay_number .but2 {
   color: #fff;
-  font-size: 0.48rem;
+  font-size: 0.4266666667rem;
   width: 8.1066666667rem;
-  height: 1.4933333333rem;
+  height: 1.2266666667rem;
   border-radius: 1.4933333333rem;
-  line-height: 1.4933333333rem;
+  line-height: 1.2266666667rem;
   margin: 0 auto;
   text-align: center;
   background: linear-gradient(255deg, #CC66FF 1%, #9CB3FF 52%, #13E2F5 100%);
-  background-size: 100% 100%;
   display: none;
 }
 body .pop_up,
@@ -345,7 +348,7 @@ html .stance .picture span {
 
 input::-webkit-input-placeholder {
   /* placeholder颜色  */
-  color: #6D6B89;
+  color: #929198;
   /* placeholder字体大小  */
   font-size: 0.32rem;
   /* placeholder位置  */

view/peko/modules/pay/css/index.scss

@@ -7,8 +7,7 @@
 body,
 html {
     height: 100%;
-    background: #fff;
-    ;
+    background: #F3F5FA;
 
     .logingActive {
         position: fixed;
@@ -55,8 +54,8 @@ html {
         background: #000;
         margin: 0 auto;
         // background: url(../images/header.png) no-repeat;
-        background: linear-gradient(180deg, #F4E1FF 0%, #F3F5FA 100%);
-        background-size: 100% 100%;
+        // background-size: 100% 100%;
+        background: linear-gradient(180deg, #F2E0FF 0%, #FAF7FE 100%);;
 
         .header_top {
             width: 100%;
@@ -110,14 +109,13 @@ html {
         }
 
         .user {
-            background: none;
+            background: #FFFFFF;
             outline: none;
             border: none;
             width: px2rem(670, );
             height: px2rem(64, );
             border-radius: px2rem(64, );
             margin: px2rem(40, ) auto 0;
-            border: 2px solid #000;
             display: block;
             box-sizing: border-box;
             padding: 0 px2rem(10, );
@@ -145,13 +143,20 @@ html {
             height: px2rem(60, );
         }
 
+        .methodBox {
+            display: flex;
+            flex-wrap: wrap;
+        }
+
         .methods {
-            width: 100%;
+            width: 30%;
             min-height: 2.5rem;
             display: flex;
             flex-wrap: wrap;
-            justify-content: start;
+            // justify-content: start;
             padding-left: 0.285rem;
+            margin-bottom: 0.1rem;
+            
 
             span {
                 float: left;
@@ -161,38 +166,42 @@ html {
                 background: #F0F5F6;
                 border-radius: px2rem(12, );
                 position: relative;
-                margin-bottom: px2rem(52, );
+                // margin-bottom: px2rem(52, );
+                margin-bottom: 1rem;
                 margin-right: 0.3rem;
+                box-sizing: border-box;
 
                 img {
                     position: absolute;
                     left: 50%;
                     top: 50%;
                     transform: translate(-50%, -50%);
-                    width: 3rem;
-                    height: 1.8rem;
+                    width: 1.8rem;
+                    height: 1.5rem;
                     border-radius: 50%;
                     overflow: hidden;
                 }
 
                 p {
-                    color: #333;
+                    color: #B3B3C3;
                     font-size: px2rem(24, );
                     width: 100%;
                     text-align: center;
                     position: absolute;
                     left: 0;
-                    bottom: -0.9rem;
+                    top: 1.9rem;
                 }
             }
 
             .active {
-                border-radius: px2rem(12, );
-                box-sizing: border-box;
+                // border: 2px solid #BB43FF;
+                // box-sizing: border-box;
                 background: url(../images/jvxing.png) no-repeat;
                 background-size: 100% 100%;
+                p{
+                    color: #9168FA;
+                }
             }
-
         }
     }
 
@@ -223,8 +232,9 @@ html {
                 display: block;
                 width: px2rem(314, );
                 height: px2rem(168, );
-                background: url(../images/noActive.png) no-repeat;
-                background-size: 100% 100%;
+                // background: url(../images/noActive.png) no-repeat;
+                // background-size: 100% 100%;
+                background: #F0F5F6;
                 border-radius: px2rem(12, );
                 position: relative;
                 margin-bottom: px2rem(40, );
@@ -255,30 +265,30 @@ html {
 
         .but1 {
             color: #B3B3C3;
-            font-size: px2rem(36, );
+            font-size: px2rem(32, );
             width: px2rem(608, );
-            height: px2rem(112, );
+            height: px2rem(92, );
             border-radius: px2rem(112, );
-            line-height: px2rem(112, );
+            line-height: px2rem(92, );
             margin: 0 auto;
             text-align: center;
             // background: url('../images/noBut.png') no-repeat;
+            // background-size: 100% 100%;
             background: #E6E6F0;
-            background-size: 100% 100%;
         }
 
         .but2 {
             color: #fff;
-            font-size: px2rem(36, );
+            font-size: px2rem(32, );
             width: px2rem(608, );
-            height: px2rem(112, );
+            height: px2rem(92, );
             border-radius: px2rem(112, );
-            line-height: px2rem(112, );
+            line-height: px2rem(92, );
             margin: 0 auto;
             text-align: center;
             // background: url('../images/but.png') no-repeat;
-            background: linear-gradient(255deg, #CC66FF 1%, #9CB3FF 52%, #13E2F5 100%);
-            background-size: 100% 100%;
+            // background-size: 100% 100%;
+            background: linear-gradient(255deg, #CC66FF 1%, #9CB3FF 52%, #13E2F5 100%);;
             display: none;
         }
     }
@@ -359,7 +369,7 @@ html {
 
 input::-webkit-input-placeholder {
     /* placeholder颜色  */
-    color: #6D6B89;
+    color: #929198;
     /* placeholder字体大小  */
     font-size: px2rem(24, );
     /* placeholder位置  */

view/peko/modules/pay/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>充值</title>
+    <title id="pay_title">充值</title>
     <meta name="viewport"
         content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">
@@ -18,76 +18,83 @@
 </head>
 
 <body>
-    <div class="logingActive"></div>
+    <div class="logingActive" style="font-size: 0.35rem;"></div>
     <div class="header">
         <!-- 头部 -->
         <div class="header_top">
             <div class="header_top_left">
-                <img src="./images/logo.png" alt=""><b>peko储值中心</b>
+                <img src="./images/logo.png" alt=""><b id="pay_header_t_l">peko儲值中心</b>
             </div>
             <div class="header_top_right">
-                <img src="./images/more.png" alt=""><b>台湾</b>
+                <img src="./images/more.png" alt=""><b></b>
             </div>
         </div>
         <!-- 输入框 -->
-        <input class="user" type="text" placeholder="请输入peko账号ID">
+        <input class="user" type="text" id="pay_user_id" placeholder="請輸入peko賬號ID">
     </div>
     <!-- 选择支付方式 -->
     <div class="pay_method">
-        <p>请选择储值方式:</p>
-        <div class="methods">
-            <span class="active">
-                <img src="./images/logo.png" alt="">
+        <p id="pay_method_p">请选择儲值方式:</p>
+        <!-- <div class="methods methods0">
+            <p style="width: 100%;color: #000;height: 0.5rem;"></p>
+            <span>
+                <img src="" alt="">
                 <p>迪迦奥特曼</p>
             </span>
-        </div>
+        </div> -->
+        <!-- <div class="methods methods1">
+            <p style="width: 100%;color: #000;height: 0.5rem;"></p>
+            <span>
+                <img src="" alt="">
+                <p>迪迦奥特曼</p>
+            </span>
+        </div> -->
+        <div class="methodBox"></div>
     </div>
     <!-- 选择充值金额 -->
     <div class="pay_number">
-        <p>请选择您的储值金额:</p>
+        <p id="pay_number_sd">請選擇您的儲值金額:</p>
         <div class="number">
-            <span class="active">
-                <b>100,000 金币</b>
+            <!-- <span class="active">
+                <b>100,000 金幣</b>
                 <i>NT$ 1,000</i>
             </span>
             <span>
-                <b>100,000 金币</b>
+                <b>100,000 金幣</b>
                 <i>NT$ 1,000</i>
             </span>
             <span>
-                <b>100,000 金币</b>
+                <b>100,000 金幣</b>
                 <i>NT$ 1,000</i>
-            </span>
+            </span> -->
         </div>
-        <div class="but1">立即支付</div>
-        <div class="but2">立即支付</div>
+        <div class="but1 pay_but">立即支付</div>
+        <div class="but2 pay_but">立即支付</div>
     </div>
     <!-- 弹窗 -->
     <div class="pop_up">
         <div class="pop_up_in">
-            <b>请选择储值地区</b>
-            <p countryCode="HK">香港</p>
-            <p countryCode="TW">台湾</p>
-            <p countryCode="CN">马来西亚</p>
-            <p countryCode="CN">新加坡</p>
+            <b id="pop_up_in_b">請選擇儲值地區</b>
+            <!-- <p countryCode="TW" id="pop_up_in_p1">臺灣</p>
+            <p countryCode="CN" id="pop_up_in_p2">大陸</p> -->
             <!-- <p>香港</p> -->
         </div>
     </div>
     <div class="stance">
         <div class="picture">
-            <span>储值服务即将开放，请耐心等待</span>
+            <span id="pay_stance_picture">儲值服務即將開放，請耐心等待</span>
         </div>
     </div>
     <div class="wx_skip">
-        <img src="./images/wx_skip.png" alt="">
+        <img id="wx_skip_img" src="./images/wx_skip.png" alt="">
     </div>
     <script src="../../common/js/jquery-3.2.1.min.js"></script>
     <script src="../../common/js/flexible.js"></script>
     <script src="../../common/js/vconsole.min.js"></script>
     <script src="../../common/js/pingpp.js"></script>
-    <script src="../../common/js/common2.js"></script>
+    <script src="../../common/js/common2.js?v=8.0"></script>
     <script src="../../common/js/layer.js"></script>
-    <script src="./js/index.js?v=11.1111"></script>
+    <script src="./js/index.js?v=1.2"></script>
 </body>
 
 </html>

view/peko/modules/pay/js/index.js

@@ -1,10 +1,11 @@
 var browser = checkVersion();
 const urlPrefix = getUrlPrefix();
-const urlTest = "http://anan.uat.lecheng163.com";
-const urlProduct = "https://anan.lecheng163.com";
+const urlTest = "https://api.pekolive.com";
+const urlProduct = "https://beta.api.pekolive.com";
 let arr = [];
-let countryCode = "TW";//选择区号
-let account;//账号
+let arr2 = [];
+let countryCode = "";//选择区号
+let erbanNo;//账号
 let chargeProdId;//金额:tw_payermax_1003_1000
 let openId;
 let payChannel;//付款方式
@@ -15,6 +16,14 @@ let uid;
 let modeOfPayment = false;//判断是否有选择支付方式
 let paymentAmount = false;//判断是否有选择付款金额
 $(function () {
+    console.log(host)
+    if (EnvCheck() == 'test') {//degBug
+        new VConsole();
+    }
+    getInfoFromClient();//请求依赖
+    setTimeout(function () {
+        listChargeAreaInfo();
+    }, 100)
     function get_param (param) {
         var query = location.search.substring(1).split('&');
         for (var i = 0; i < query.length; i++) {
@@ -27,7 +36,7 @@ $(function () {
     }
     // if (get_param('countryCodeURL') == "TW") {
     //     countryCode = "TW";
-    //     $('.header_top_right b').text('臺灣');
+    //     $('.header_top_right b').text(langReplace(localLang.demoModule.pop_up_in_p1));//'臺灣'
     // } else if (get_param('countryCodeURL') == "CN") {
     //     if (EnvCheck() == 'test') {
     //         if (host != "anan.uat.lecheng163.com") {
@@ -39,22 +48,14 @@ $(function () {
     //         }
     //     }
     //     countryCode = "CN";
-    //     $('.header_top_right b').text('大陸');
+    //     $('.header_top_right b').text(langReplace(localLang.demoModule.pop_up_in_p2));//'大陸'
     // }
     $('.logingActive').hide();
-    getInfoFromClient();//请求依赖
-    if (EnvCheck() == 'test') {//degBug
-        new VConsole();
-        // console.log(pubInfo)
-    }
     if (browser.weixin) {
         $('.wx_skip').show();
     } else {
         $('.wx_skip').hide();
     }
-    setTimeout(function () {
-        getChargePageInfoForH5(countryCode);
-    }, 50)
     function getChargePageInfoForH5 (countryCode) {
         let is_CN = countryCode == "CN" ? true : false;
         networkRequest({
@@ -63,21 +64,34 @@ $(function () {
             data: { countryCode },
             success: function (res) {
                 if (res.code == 200) {
+                    $('.methods').remove();
                     $('.methods span').remove();
                     console.log(res)
                     let strT = '';
                     let strB = '';
-                    res.data.chargeWays.forEach((res, index) => {
-                        arr[index] = res.chargeProds;
-                        strT += `
-                            <span desc="${res.desc}" paymentType="${res.paymentType}" payChannel="${res.payChannel}">
-                                <img src="${res.logo}" alt="">
-                                <p>${res.desc}</p>
-                            </span>
-                        `
+                    // $('.methods0 p').text(res.data.chargeGroups[0].groupName ? res.data.chargeGroups[0].groupName : '');
+                    // $('.methods1 p').text(res.data.chargeGroups[1] ? res.data.chargeGroups[1].groupName : '');
+                    res.data.chargeGroups.forEach((res1, index1) => {
+                        arr = res.data.chargeGroups;
+                        // strB += 
+                        $('.pay_method .methodBox').append(`
+                            <div class="methods methods${index1}">
+                                <p style="width: 100%;color: #000;height: 0.8rem;display: none;">${res1.groupName}</p>
+                            </div>
+                        `);
+                        res.data.chargeGroups[index1].chargeWays.forEach((res, index) => {
+                            // arr[index] = res.chargeProds;
+                            // strT += 
+                            $(`.methods${index1}`).append(`
+                                <span index=${index} type='${index1}' desc="${res.desc}" paymentType="${res.paymentType}" payChannel="${res.payChannel}">
+                                    <img src="${res.logo}" alt="">
+                                    <p>${res.desc}</p>
+                                </span>
+                            `);
+                        });
+
                     });
-                    $('.methods').append(strT);
-                    coloursFun(0);
+                    coloursFun(0, 0);
                     // 选择支付方式按钮
                     $('.methods span').click(function () {
                         modeOfPayment = true;
@@ -85,27 +99,28 @@ $(function () {
                         paymentType = $(this).attr('paymentType');
                         payChannel = $(this).attr('payChannel');
                         // $(this).parent().addClass('active').siblings().removeClass('active');
-                        $(this).addClass('active').siblings().removeClass('active');
-                        coloursFun($(this).index());
+                        $('.methods span').removeClass('active');
+                        $(this).addClass('active');
+                        coloursFun($(this).attr('index'), $(this).attr('type'));
                     })
                     console.log(countryCode)
                     $('.but2').off();
                     $('.but2').on('click', function () {
                         console.log(countryCode)
                         if (modeOfPayment == false) {
-                            logingFun('請選擇儲值方式')
+                            logingFun("請選擇儲值方式")//''
                         } else if (paymentAmount == false) {
-                            logingFun('請選擇您的儲值金額')
+                            logingFun("請選擇您的儲值金額")//'' 
                         } else {
                             console.log(countryCode)
                             networkRequest({
                                 type: 'POST',
                                 url: urlPrefix + '/charge/apply2New',
-                                data: { account, chargeProdId, countryCode, openId, payChannel, paymentType, successUrl, uid },
+                                data: { erbanNo, chargeProdId, countryCode, openId, payChannel, paymentType, successUrl, uid },
                                 success: function (res) {
                                     if (res.code == 200) {
                                         console.log(res)
-                                        $('.logingActive').text("請稍等");
+                                        $('.logingActive').text("請稍等");//""
                                         $('.logingActive').show();
                                         window.location.href = res.data.mweb_url
                                     } else {
@@ -122,36 +137,58 @@ $(function () {
             }
         });
     }
-
+    function listChargeAreaInfo () {
+        networkRequest({
+            type: 'GET',
+            url: urlPrefix + '/charge/listChargeAreaInfo',
+            success: function (res) {
+                if (res.code == 200) {
+                    var str = ``;
+                    res.data.forEach(res => {
+                        str += `
+                            <p countryCode="${res.areaCode}" id="pop_up_in_p2">${res.areaName}</p>
+                        `
+                    })
+                    $('.header_top_right b').text(res.data[0].areaName);
+                    $('.pop_up_in').append(str)
+                    getChargePageInfoForH5(res.data[0].areaCode);
+                    $('.pop_up_in p').click(function () {
+                        $('.header_top_right b').text($(this).text());
+                        countryCode = $(this).attr("countryCode");
+                        $('.pop_up').hide();
+                        // if (countryCode == "CN") {
+                        //     if (EnvCheck() == 'test') {
+                        //         if (host != "anan.uat.lecheng163.com") {
+                        //             window.location.href = ifCNFun() + '/peko/modules/pay/index.html?countryCodeURL=CN'
+                        //         }
+                        //     } else {
+                        //         if (host != "anan.lecheng163.com") {
+                        //             window.location.href = ifCNFun() + '/peko/modules/pay/index.html?countryCodeURL=CN'
+                        //         }
+                        //     }
+                        // } else {
+                        //     window.location.href = urlPrefix + '/peko/modules/pay/index.html?countryCodeURL=' + countryCode;
+                        // }
+                        getChargePageInfoForH5(countryCode);
+                    })
+                } else {
+                    logingFun(res.message)
+                }
+            }
+        });
+    }
     $('.header_top_right').click(function () {
         $('.pop_up').show();
     });
-    $('.pop_up_in p').click(function () {
-        $('.header_top_right b').text($(this).text());
-        countryCode = $(this).attr("countryCode");
-        $('.pop_up').hide();
-        // if (countryCode == "CN") {
-        //     if (EnvCheck() == 'test') {
-        //         if (host != "anan.uat.lecheng163.com") {
-        //             window.location.href = ifCNFun() + '/peko/modules/pay/index.html?countryCodeURL=CN'
-        //         }
-        //     } else {
-        //         if (host != "anan.lecheng163.com") {
-        //             window.location.href = ifCNFun() + '/peko/modules/pay/index.html?countryCodeURL=CN'
-        //         }
-        //     }
-        // } else {
-        //     window.location.href = urlPrefix + '/peko/modules/pay/index.html?countryCodeURL=' + countryCode;
-        // }
-        getChargePageInfoForH5(countryCode);
-    })
-    function coloursFun (index) {
+
+    function coloursFun (index, type) {
         $('.pay_number .number span').remove();
         var str = '';
-        arr[index].forEach(res => {
+        console.log(arr[type]);
+        arr[type].chargeWays[index].chargeProds.forEach(res => {//金幣
             str += `
             <span channel="${res.channel}" chargeProdId="${res.chargeProdId}" seqNo="${res.seqNo}">
-                <b>${res.chargeGoldNum.toLocaleString()} 金幣</b>
+                <b>${res.chargeGoldNum.toLocaleString()} ${"金幣"}</b>
                 <i>${res.currencySign} ${res.money.toLocaleString()}</i>
             </span>
             `
@@ -178,7 +215,7 @@ $(function () {
             if (val != '') {
                 $('.but1').hide();
                 $('.but2').show();
-                account = val;
+                erbanNo = val;
             } else {
                 $('.but1').show();
                 $('.but2').hide();
@@ -205,7 +242,7 @@ $(function () {
         const url = window.location.href;
         console.log(url)
         if (!url) return undefined;
-        if (url.match(/uat/) || url.match(/127.0.0.1:/) || url.match(/192.168/) || (url.match(/beta/))) { envChecks = "test" } else { envChecks = "live" };
+        if (url.match(/uat/) || url.match(/127.0.0.1:/) || (url.match(/beta.api/))) { envChecks = "test" } else { envChecks = "live" };
         if (!envChecks) return undefined;
         return envChecks === 'live' ? urlProduct : urlTest;
     }

view/peko/modules/pay/local/ar.js

@@ -0,0 +1,21 @@
+// 阿拉伯
+langAr = {
+    // 模块
+    demoModule: {
+        wx_skip_img: './images/wx_skip_en.png',
+        // 国际化内容对应的数据项：
+        pay_title: `recharge`,
+        pay_header_t_l: `HABU Recharge Center`,
+        pay_header_t_r: `Taiwan`,
+        pay_method_p: `Please select a recharge method:`,
+        pay_number_sd: `Please select your recharge amount:`,
+        pay_but: `Pay now`,
+        pop_up_in_b: `Please select a recharge area`,
+        pop_up_in_p1: `Taiwan`,
+        pop_up_in_p2: `China`,
+        pay_stance_picture: `The recharge service is about to open, please be patient`,
+        wait_a_minute: 'Please wait',
+        gold_id: 'gold coins',
+        pay_user_id: 'Please enter your HABU account ID',
+    }
+}

view/peko/modules/pay/local/en.js

@@ -0,0 +1,21 @@
+// 英文
+langEn = {
+    // 模块
+    demoModule: {
+        wx_skip_img: './images/wx_skip_en.png',
+        // 国际化内容对应的数据项：
+        pay_title: `recharge`,
+        pay_header_t_l: `HABU Recharge Center`,
+        pay_header_t_r: `Taiwan`,
+        pay_method_p: `Please select a recharge method:`,
+        pay_number_sd: `Please select your recharge amount:`,
+        pay_but: `Pay now`,
+        pop_up_in_b: `Please select a recharge area`,
+        pop_up_in_p1: `Taiwan`,
+        pop_up_in_p2: `China`,
+        pay_stance_picture: `The recharge service is about to open, please be patient`,
+        wait_a_minute: 'Please wait',
+        gold_id: 'gold coins',
+        pay_user_id: 'Please enter your HABU account ID',
+    }
+}

view/peko/modules/pay/local/in.js

@@ -0,0 +1,21 @@
+// 印尼语
+langIn = {
+    // 模块
+    demoModule: {
+        wx_skip_img: './images/wx_skip_en.png',
+        // 国际化内容对应的数据项：
+        pay_title: `recharge`,
+        pay_header_t_l: `HABU Recharge Center`,
+        pay_header_t_r: `Taiwan`,
+        pay_method_p: `Please select a recharge method:`,
+        pay_number_sd: `Please select your recharge amount:`,
+        pay_but: `Pay now`,
+        pop_up_in_b: `Please select a recharge area`,
+        pop_up_in_p1: `Taiwan`,
+        pop_up_in_p2: `China`,
+        pay_stance_picture: `The recharge service is about to open, please be patient`,
+        wait_a_minute: 'Please wait',
+        gold_id: 'gold coins',
+        pay_user_id: 'Please enter your HABU account ID',
+    }
+}

view/peko/modules/pay/local/zh-CN.js

@@ -0,0 +1,21 @@
+// 简体中文
+langZhCN = {
+    // 模块
+    demoModule: {
+        wx_skip_img: './images/wx_skip_en.png',
+        // 国际化内容对应的数据项：
+        pay_title: `recharge`,
+        pay_header_t_l: `HABU Recharge Center`,
+        pay_header_t_r: `Taiwan`,
+        pay_method_p: `Please select a recharge method:`,
+        pay_number_sd: `Please select your recharge amount:`,
+        pay_but: `Pay now`,
+        pop_up_in_b: `Please select a recharge area`,
+        pop_up_in_p1: `Taiwan`,
+        pop_up_in_p2: `China`,
+        pay_stance_picture: `The recharge service is about to open, please be patient`,
+        wait_a_minute: 'Please wait',
+        gold_id: 'gold coins',
+        pay_user_id: 'Please enter your HABU account ID',
+    }
+}

view/peko/modules/pay/local/zh-TW.js

@@ -0,0 +1,21 @@
+// 繁体中文
+langZhTW = {
+    // 模块
+    demoModule: {
+        wx_skip_img: './images/wx_skip_en.png',
+        // 国际化内容对应的数据项：
+        pay_title: `recharge`,
+        pay_header_t_l: `HABU Recharge Center`,
+        pay_header_t_r: `Taiwan`,
+        pay_method_p: `Please select a recharge method:`,
+        pay_number_sd: `Please select your recharge amount:`,
+        pay_but: `Pay now`,
+        pop_up_in_b: `Please select a recharge area`,
+        pop_up_in_p1: `Taiwan`,
+        pop_up_in_p2: `China`,
+        pay_stance_picture: `The recharge service is about to open, please be patient`,
+        wait_a_minute: 'Please wait',
+        gold_id: 'gold coins',
+        pay_user_id: 'Please enter your HABU account ID',
+    }
+}

view/peko/modules/rule/guide.html

@@ -24,7 +24,7 @@
 			<!--拍卖功能介绍-->
 			<!--</a>-->
 			<!--</li>-->
-			<li class="border-1px">
+			<!-- <li class="border-1px">
 				<a href="faq.html" class="link-1">
 					常见问题
 				</a>
@@ -44,17 +44,17 @@
 			</li>
 			<li class="border-1px">
 				<a href="live-protocol.html" class="link-1">直播协议</a>
-			</li>
+			</li> -->
 			<!-- <li class="border-1px">
 				<a href="data.html">
 					个人资料、动态、好友
 				</a>
 			</li> -->
-			<li class="border-1px">
+			<!-- <li class="border-1px">
 				<a href="environment.html" class="link-2">
 					账号申诉
 				</a>
-			</li>
+			</li> -->
 			<li class="border-1px">
 				<a href="loginout.html" class="link-2">
 					注销账号
@@ -72,7 +72,7 @@
 		</ul>
 	</div>
 	<script src="../../common/js/jquery-3.2.1.min.js"></script>
-	<script src="../../common/js/common.js"></script>
+	<script src="../../common/js/common2.js"></script>
 	<script>
 		var locateObj = getQueryString();
 		var appname = $('.appname');

view/peko/modules/share_room/index.html

@@ -33,7 +33,7 @@
       <p class="user-name"></p>
       <p class="user-room">邀请你进入 <span></span> 的房间</p>
       <p class="user-id">房间ID <span></span> </p>
-      <a href="" class="linkedme"></a>
+      <a href="" class="linkedme" id="bomlinkdomload"></a>
     </div>
     <div class="code" style="display: none;">
       <img src="./images/share_bg_whrite.png" alt="">
@@ -56,8 +56,10 @@
   <script src="../../common/js/vconsole.min.js"></script>
   <!--创建深度链接-->
   <script src="https://static.lkme.cc/linkedme.min.js"></script>
-  <script src="../../common/js/common.js"></script>
+  <script src="../../common/js/common2.js"></script>
   <script src="../../common/js/vconsole.min.js"></script>
+  <!-- <script src="./js/moblink.js"></script> -->
+  <script type="text/javascript" src="//bvgw.t4m.cn/applink.js"></script>
   <script src="js/index.js?v=2.0"></script>
 </body>
 

view/peko/modules/share_room/js/index.js

@@ -3,127 +3,164 @@
 /* eslint-disable eqeqeq */
 /* eslint-disable no-undef */
 var share = {
-  title: 'peko，带你进入声优的世界',
-  link: window.location.href,
-  imgUrl: '',
-  desc: ''
+    title: 'peko，带你进入声优的世界',
+    link: window.location.href,
+    imgUrl: '',
+    desc: ''
 };
-
+let roomuid;
+let uid; //90413321
+let mobid;
+let ROOM_UID;
+let fromType;
+let enterType;
+let workAuthor;
+let workAuthorId;
 //获取房主uid的信息
 $(function () {
-  var EnvType = EnvCheck();
-  if (EnvType == 'test') {
-    var vConsole = new VConsole();
-  }
-  var EnvType = EnvCheck();
-  //根据浏览器窗口高度背景图片高度
-  let user = $('.user-detail');
-  var locateObj = getQueryString();
-  $('.avatar img').attr('src', decodeURIComponent(locateObj.room_avatar));
-  user.find('.user-name').html(decodeURIComponent(locateObj.share_name))
-  user.find('.user-room span').html(decodeURIComponent(locateObj.room_name))
-  user.find('.user-id span').html(locateObj.room_id)
-  var share_room = {};
-
-  share_room["roomuid"] = locateObj.uid;
-  share_room["uid"] = locateObj.shareUid;
-  share_room["type"] = "2";
-  var jsonStr = JSON.stringify(share_room);
-
-  console.log(share_room);
-  var linkData = {
-    type: EnvType,  //"live"表示使用线上模式,"test"表示测试模式.【可选】
-    channel: "share_room2",
-    tags: "share_room2",
-    ios_custom_url: "",// 自定义iOS平台下App的下载地址，如果是AppStore的下载地址可以不用填写，【可选】
-    // data.android_custom_url = "";// 自定义安卓平台下App的下载地址，【可选】
-    // 下面是自定义深度链接参数，用户点击深度链接打开app之后，params的参数会通过LinkedME服务器透传给app，由app根据参数进行相关跳转
-    // 例如：详情页面的参数，写入到params中，这样在唤起app并获取参数后app根据参数跳转到详情页面
-    params: jsonStr
-  };
-  linkedme.init("6ba9e9d9760b8acc50b2b499cfd557da", { type: EnvType }, null);
-  // 978cd79c98264f836450afda1228762e
-  // 4f5ec8302c8a0a385c2e5dd196af9aff
-  //414571f0698afaa1c194f345f0dcc328
-
-  linkedme.link(linkData, function (err, response) {
-    if (err) {
-      // 生成深度链接失败，返回错误对象err
-      console.log('err:', err);
-    } else {
-      console.log(response, 9999999)
-      $('.linkedme').on('click', function(){
-        linkedme.trigger_deeplink(response.url);
-      })
-      $('.linkedme').attr("href", response.url);
+    var EnvType = EnvCheck();
+    if (EnvType == 'test') {
+        // var vConsole = new VConsole();
     }
-  }, false);
+    var EnvType = EnvCheck();
+    //根据浏览器窗口高度背景图片高度
+    let user = $('.user-detail');
+    var locateObj = getQueryString();
+    $('.avatar img').attr('src', decodeURIComponent(locateObj.room_avatar));
+    user.find('.user-name').html(decodeURIComponent(locateObj.share_name));
+    user.find('.user-room span').html(decodeURIComponent(locateObj.room_name));
+    user.find('.user-id span').html(locateObj.room_id);
+    var share_room = {};
 
+    share_room["roomuid"] = locateObj.uid;
+    share_room["uid"] = locateObj.shareUid;
+    share_room["type"] = "2";
+    var jsonStr = JSON.stringify(share_room);
+    //   var linkData = {
+    //     type: EnvType,  //"live"表示使用线上模式,"test"表示测试模式.【可选】
+    //     channel: "share_room2",
+    //     tags: "share_room2",
+    //     ios_custom_url: "",// 自定义iOS平台下App的下载地址，如果是AppStore的下载地址可以不用填写，【可选】
+    //     // data.android_custom_url = "";// 自定义安卓平台下App的下载地址，【可选】
+    //     // 下面是自定义深度链接参数，用户点击深度链接打开app之后，params的参数会通过LinkedME服务器透传给app，由app根据参数进行相关跳转
+    //     // 例如：详情页面的参数，写入到params中，这样在唤起app并获取参数后app根据参数跳转到详情页面
+    //     params: jsonStr
+    //   };
+    //   linkedme.init("6ba9e9d9760b8acc50b2b499cfd557da", { type: EnvType }, null);
+    //   // 978cd79c98264f836450afda1228762e
+    //   // 4f5ec8302c8a0a385c2e5dd196af9aff
+    //   //414571f0698afaa1c194f345f0dcc328
 
-  // var url = encodeURIComponent(location.href.split('#')[0]);
-  // var data = "url=" + url;
-  // console.log(data);
-  // $.ajax({
-  //   type: 'GET',
-  //   url: '/wx/config',
-  //   data: data,
-  //   asyc: true,
-  //   success: function (data) {
-  //     if (data.code = 200) {
-  //       wx.config({
-  //         debug: false,
-  //         appId: 'wx009d793f92c24eec',
-  //         timestamp: data.data.timestamp,
-  //         nonceStr: data.data.nonceStr,
-  //         signature: data.data.signature,
-  //         jsApiList: data.data.jsApiList
-  //       });
-  //       wx.error(function (res) {
-  //         console.log('config error,msg:' + res);
-  //       });
-  //     }
-  //   },
-  //   error: function (res) {
-  //     console.log('config error,msg:' + res);
-  //   }
-  // })
+    //   linkedme.link(linkData, function (err, response) {
+    //     if (err) {
+    //       // 生成深度链接失败，返回错误对象err
+    //       console.log('err:', err);
+    //     } else {
+    //       console.log(response, 9999999)
+    //       $('.linkedme').on('click', function(){
+    //         linkedme.trigger_deeplink(response.url);
+    //       })
+    //       $('.linkedme').attr("href", response.url);
+    //     }
+    //   }, false);
+
+    /*
+             * MobLink 支持数组=>MobLink([...]) 和对象=>MobLink({...}) 两种初始化形式
+             * 页面上有多个元素需要跳转时使用数组方式,仅单个元素需要跳转时可以使用对象的方式进行初始化
+             * el: 表示网页上Element的id值,该字段为空或者不写,则表示MobLink **默认浮层** 上的打开按钮(注意:该字段支持selector方式: 1.'.class' 2.'#id1' 3.['#id1','#id2'])
+             * path: 对应App里需要恢复页面的路径
+             * default: 指定分享页默认场景参数（最多只能指定一项作为默认场景参数）
+             * params: 网页需要带给客户端的参数
+             */
+    // 页面上有多个元素需要跳转时要使用数组方式进行初始化
+    function get_param (param) {
+        var query = location.search.substring(1).split('&');
+        for (var i = 0; i < query.length; i++) {
+            var kv = query[i].split('=');
+            if (kv[0] == param) {
+                return kv[1];
+            }
+        }
+        return null;
+    }
+    uid = get_param('uid');
+    mobid = get_param('mobid');
+    ROOM_UID = get_param('ROOM_UID')
+    fromType = get_param('fromType')
+    enterType = get_param('enterType')
+    workAuthor = get_param('workAuthor')
+    workAuthorId = get_param('workAuthorId')
+    roomuid = get_param('roomuid')
+    MobLink([{
+        el: '#bomlinkdomload',
+        path: '',
+        params: { mobLinkType: 1, roomuid, uid, mobid, ROOM_UID, fromType, enterType, workAuthor, workAuthorId }
+    }
+    ]);
+    // var url = encodeURIComponent(location.href.split('#')[0]);
+    // var data = "url=" + url;
+    // console.log(data);
+    // $.ajax({
+    //   type: 'GET',
+    //   url: '/wx/config',
+    //   data: data,
+    //   asyc: true,
+    //   success: function (data) {
+    //     if (data.code = 200) {
+    //       wx.config({
+    //         debug: false,
+    //         appId: 'wx009d793f92c24eec',
+    //         timestamp: data.data.timestamp,
+    //         nonceStr: data.data.nonceStr,
+    //         signature: data.data.signature,
+    //         jsApiList: data.data.jsApiList
+    //       });
+    //       wx.error(function (res) {
+    //         console.log('config error,msg:' + res);
+    //       });
+    //     }
+    //   },
+    //   error: function (res) {
+    //     console.log('config error,msg:' + res);
+    //   }
+    // })
 });
 
 wx.ready(function () {
-  //分享到朋友圈
-  wx.onMenuShareTimeline({
-    title: share.title,
-    link: share.link,
-    imgUrl: share.imgUrl,
-    success: function () {
-      // 用户确认分享后执行的回调函数
-    },
-    cancel: function () {
-      // 用户取消分享后执行的回调函数
-    }
-  });
-  //分享给朋友
-  wx.onMenuShareAppMessage({
-    title: share.title,
-    desc: share.desc,
-    link: share.link,
-    imgUrl: share.imgUrl,
-    type: 'link',
-    dataUrl: '',
-    success: function () {
-    },
-    cancel: function () {
-    }
-  });
-  //分享到QQ
-  wx.onMenuShareQQ({
-    title: share.title,
-    desc: share.desc,
-    link: share.link,
-    imgUrl: share.imgUrl,
-    success: function () {
-    },
-    cancel: function () {
-    }
-  });
+    //分享到朋友圈
+    wx.onMenuShareTimeline({
+        title: share.title,
+        link: share.link,
+        imgUrl: share.imgUrl,
+        success: function () {
+            // 用户确认分享后执行的回调函数
+        },
+        cancel: function () {
+            // 用户取消分享后执行的回调函数
+        }
+    });
+    //分享给朋友
+    wx.onMenuShareAppMessage({
+        title: share.title,
+        desc: share.desc,
+        link: share.link,
+        imgUrl: share.imgUrl,
+        type: 'link',
+        dataUrl: '',
+        success: function () {
+        },
+        cancel: function () {
+        }
+    });
+    //分享到QQ
+    wx.onMenuShareQQ({
+        title: share.title,
+        desc: share.desc,
+        link: share.link,
+        imgUrl: share.imgUrl,
+        success: function () {
+        },
+        cancel: function () {
+        }
+    });
 });