替换h5提现 充值元素以及优化账单多语言

view/molistar/modules/h5Income/exchangeGold.html

@@ -17,8 +17,8 @@
     <img src="./images/back.png" alt="" class="back">
     <!-- 兌換信息 -->
     <div class="box">
-        <div class="golds">我的金幣：0</div>
-        <div class="diamonds">我的鉆石：0</div>
+        <div class="golds">我的鉆石：0</div>
+        <div class="diamonds">我的金幣：0</div>
         <input type="number" placeholder="0" class="num">
         <input type="number" disabled placeholder="0" class="num2">
     </div>
@@ -28,7 +28,7 @@
     <div class="pub">
         <div class="pub_in">
             <div class="title">確認兌換</div>
-            <p>確認獎 <b class="gold">0</b> 金幣兌換為 <b class="diamond">0</b> 鉆石嗎？</p>
+            <p>確認獎 <b class="gold">0</b> 鉆石兌換為 <b class="diamond">0</b> 金幣嗎？</p>
             <div class="close">取消</div>
             <div class="ok">確認</div>
         </div>

view/molistar/modules/h5Income/index.html

@@ -19,29 +19,29 @@
     <div class="myInfo">
         <img src="./images/login/logo.png" alt="">
         <div>
-            <p>piko</p>
+            <p>MoliStar</p>
             <b>ID:</b>
         </div>
     </div>
     <!-- 鉆石 -->
     <div class="diamond">
-        <img src="./images/index/diamondIcon.png" alt="" class="diamondIcon">
+        <img src="./images/index/goldIcon.png" alt="" class="diamondIcon">
         <!-- <img src="./images/index/moreD.png" alt="" class="moreD"> -->
-        <span>鉆石</span>
+        <span>金幣</span>
         <!-- <b>明細</b> -->
         <p>0</p>
     </div>
     <!-- 金幣 -->
     <div class="gold">
-        <img src="./images/index/goldIcon.png" alt="" class="goldIcon">
-        <span>金幣</span>
-        <a href="../myincome/index.html#/GoldLog">
+        <img src="./images/index/diamondIcon.png" alt="" class="goldIcon">
+        <span>鉆石</span>
+        <a href="../myincome/index.html#/GoldLog?lang=zh">
             <b>明細</b>
             <img src="./images/index/moreG.png" alt="" class="moreG">
         </a>
         <p>0</p>
         <a href="./exchangeGold.html">
-            <div class="exchangeGold">兌換鉆石</div>
+            <div class="exchangeGold">兌換金幣</div>
         </a>
         <a href="./withdrawal.html">
             <div class="withdrawal">提領</div>

view/molistar/modules/h5Income/js/login.js

@@ -193,11 +193,11 @@ $('.box .hone').click(function () {
     if (idOrPhone) {
         $('.idLogin').show();
         $('.phone').hide();
-        $('.box .hone').text('piko手機號登錄');
+        $('.box .hone').text('MoliStar手機號登錄');
     } else {
         $('.phone').show();
         $('.idLogin').hide();
-        $('.box .hone').text('piko賬號登錄');
+        $('.box .hone').text('MoliStar賬號登錄');
     }
 })
 // 打開選擇區號

view/molistar/modules/h5Income/js/withdrawal.js

@@ -27,8 +27,8 @@ const toastMsg = (content = '操作完成', time = 2) => {
     })
 }
 var accountType;//1 其它賬戶 2 中國大陸銀聯 4 馬來西亞銀行 8 新加坡銀行
-var minValue;//最小提領金币数量
-var golds;//当前剩余金币
+var minValue;//最小提領鑽石数量
+var golds;//当前剩余鑽石
 var weekLimitCount;//本周剩余次数
 var weekMaxValue;//本周剩余最大金额
 var realName = false;//默认大陆未实名
@@ -60,11 +60,11 @@ function getConfig () {
                 weekLimitCount = res.data.weekLimitCount;
                 weekMaxValue = res.data.weekMaxValue;
                 var str = `
-                <p>1、收益金幣達到${res.data.minValue}或以上可以申請提領</p>
-                <p>2、提領金幣必須為1000的整倍數</p>
+                <p>1、收益鑽石達到${res.data.minValue}或以上可以申請提領</p>
+                <p>2、提領鑽石必須為1000的整倍數</p>
                 <p>3、每周可提領次數：<i>${res.data.weekLimitCount}</i>次, &nbsp;&nbsp;提領手續費：<i>${res.data.chargeRate}%</i></p>
                 <p>4、台幣提領，請聯繫客服微信：sd245376</p>
-                <p>5、如您使用Payoneer帳戶提領，因Payoneer要求付款最少50美元，需要滿足55000金幣後發起，不滿足的提領將會被駁回</p>
+                <p>5、如您使用Payoneer帳戶提領，因Payoneer要求付款最少50美元，需要滿足55000鑽石後發起，不滿足的提領將會被駁回</p>
                 `
                 $('.withdrawal').append(str);
                 getAccounts();
@@ -91,7 +91,7 @@ function query () {
         data: { uid: pubInfo.uid },
         success (res) {
             if (res.code === 200) {
-                $('.income p').text(`金幣 ${res.data.golds}`);
+                $('.income p').text(`鑽石 ${res.data.golds}`);
                 golds = res.data.golds;
                 getConfig();
             } else if (res.code ? res.code == 1444 : JSON.parse(res).code == 401) {
@@ -192,11 +192,11 @@ function getAccounts () {
                             realName = false;
                         } else {
                             realName = true;
-                            $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+                            $('.withdrawal input').attr('placeholder', '請輸入提領鑽石數額');
                             $('.authentication span').text('已實名');
                         }
                     } else {
-                        $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+                        $('.withdrawal input').attr('placeholder', '請輸入提領鑽石數額');
                     }
                     if (accountType == 2) {
                         $('.authentication').show();
@@ -284,9 +284,9 @@ function getAccounts () {
                     return false;
                 })
                 if (golds < minValue) {
-                    $('.withdrawal input').attr('placeholder', '可提領金幣不足');
+                    $('.withdrawal input').attr('placeholder', '可提領鑽石不足');
                 } else if ($('.account span').text() != '未绑定') {
-                    $(`.withdrawal input`).text('請輸入提領金幣數額');
+                    $(`.withdrawal input`).text('請輸入提領鑽石數額');
                     $(`.withdrawal .withdrawalBox`).attr('click', 1);
                 }
             } else if (res.code ? res.code == 1444 : JSON.parse(res).code == 401) {
@@ -322,11 +322,11 @@ $('.switch .pub_in .ok').click(function () {
             realName = false;
         } else {
             realName = true;
-            $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+            $('.withdrawal input').attr('placeholder', '請輸入提領鑽石數額');
             $('.authentication span').text('已實名');
         }
     } else {
-        $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+        $('.withdrawal input').attr('placeholder', '請輸入提領鑽石數額');
     }
 
 })
@@ -334,15 +334,15 @@ $('.switch .pub_in .ok').click(function () {
 $('.goldPub .goldPub_in .but').click(function () {
     var num = $('.goldPub .goldPub_in input').val();
     if (num == '') {
-        toastMsg('請輸入提領金幣數額');
+        toastMsg('請輸入提領鑽石數額');
         return
     }
     if (num < minValue) {
-        toastMsg(`最少申請金幣为${minValue}`);
+        toastMsg(`最少申請鑽石为${minValue}`);
         return
     }
     if (num % 1000 != 0) {
-        toastMsg(`提領金幣必須為1000的整倍數`);
+        toastMsg(`提領鑽石必須為1000的整倍數`);
         return
     }
     calculate();
@@ -412,7 +412,7 @@ $('.butBig').click(function () {
         toastMsg('申請提現失敗，不支援未成年人提現');
         return
     }
-    $('.withDrawalPub .withDrawalPub_in p ').html(`確認通過 <b>${$('.account .active').text()}</b> 提領 <b>${num}</b>金幣?`)
+    $('.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();
 })

view/molistar/modules/h5Income/login.html

@@ -23,7 +23,7 @@
     <div class="box">
         <!-- 賬號登入 -->
         <div class="idLogin">
-            <input type="number" class="id" placeholder="請輸入piko賬號">
+            <input type="number" class="id" placeholder="請輸入MoliStar賬號">
             <input type="password" class="password" placeholder="請輸入密碼">
         </div>
         <!-- 手機號登入 -->
@@ -41,7 +41,7 @@
         </div>
         <!-- 登入按鈕 -->
         <div class="but">登錄</div>
-        <div class="hone">piko手機號登錄</div>
+        <div class="hone">MoliStar手機號登錄</div>
     </div>
     <!-- 區號選擇 -->
     <div class="area">

view/molistar/modules/h5Income/rule.html

@@ -18,13 +18,13 @@
     <!-- 内容 -->
     <div class="box">
         <h3>提領規則</h3>
-        <p>1.金幣是在房間收到的禮物打賞可以收穫金幣。</p>
-        <p>2.1000金幣等於1美元，根據提領地區匯率換算，匯率每週更新</p>
+        <p>1.鑽石是在房間收到的禮物打賞可以收穫鑽石。</p>
+        <p>2.1000鑽石等於1美元，根據提領地區匯率換算，匯率每週更新</p>
         <p>3.每周可申請提領<b class="b2"></b>次，隔天發放，到帳時間以當地銀行處理為準</p>
-        <p>4.金幣數量大於或等於<b class="b1"></b>金幣才能申請提取；</p>
-        <p>5.如您的提領信息有誤無法發放，金幣原路退回帳號，請聯繫客服微信：sd245376</p>
-        <p>6.金幣可兌換為鑽石，兌換比例：1000金幣=1000鑽石。</p>
-        <p>7.台幣提領，請聯繫客服微信：sd245376，如您使用Payoneer帳戶提領，Payoneer要求50美元起付，需要滿足55000金幣後發起，不滿足的提領將會被駁回。</p>
+        <p>4.鑽石數量大於或等於<b class="b1"></b>鑽石才能申請提取；</p>
+        <p>5.如您的提領信息有誤無法發放，鑽石原路退回帳號，請聯繫客服微信：sd245376</p>
+        <p>6.鑽石可兌換為金幣，兌換比例：1000鑽石=1000金幣。</p>
+        <p>7.台幣提領，請聯繫客服微信：sd245376，如您使用Payoneer帳戶提領，Payoneer要求50美元起付，需要滿足55000鑽石後發起，不滿足的提領將會被駁回。</p>
     </div>
 </body>
 

view/molistar/modules/h5Income/withdrawal.html

@@ -19,7 +19,7 @@
     <div class="myInfo">
         <img src="./images/login/logo.png" alt="">
         <div>
-            <p>piko</p>
+            <p>MoliStar</p>
             <b>ID:</b>
         </div>
     </div>
@@ -27,8 +27,8 @@
     <div class="income">
         <div class="rule">提领规则</div>
         <span>我的收益</span>
-        <img src="./images/withdrawal/gold.png" alt="">
-        <p>金币 </p>
+        <img src="./images/index/diamondIcon.png" alt="">
+        <p>鑽石 </p>
     </div>
     <!-- 账户 -->
     <div class="account">
@@ -47,15 +47,15 @@
     <!-- 提领提交 -->
     <div class="withdrawal">
         <img src="./images/withdrawal/icon_mone.png" alt="" class="gold">
-        <div class="title">提领金币</div>
+        <div class="title">提领鑽石</div>
         <input type="number" placeholder="請先選擇提領賬戶" disabled>
         <div class="withdrawalBox"></div>
         <div class="numBox">
             <span>提領到賬數額</span>
-            <b>請輸入提領金幣數額</b>
+            <b>請輸入提領鑽石數額</b>
         </div>
-        <!-- <p>收益金幣達到5000或以上可以申請提領</p>
-        <p>提領金幣必須為100的整倍數</p>
+        <!-- <p>收益鑽石達到5000或以上可以申請提領</p>
+        <p>提領鑽石必須為100的整倍數</p>
         <p>每周可提領次數：<i>y</i></p>
         <p>提領手續費：<i>x%</i></p> -->
     </div>
@@ -69,14 +69,14 @@
             </ul>
         </div>
     </div>
-    <!-- 输入提領金币数额弹窗 -->
+    <!-- 输入提領鑽石数额弹窗 -->
     <div class="goldPub">
         <div class="goldPub_in">
-            <p class="title">輸入提領金幣數額</p>
+            <p class="title">輸入提領鑽石數額</p>
             <div class="num">00</div>
-            <span>金幣余額</span>
+            <span>鑽石余額</span>
             <img src="./images/withdrawal/gold.png" alt="">
-            <input type="number" placeholder="請輸入提領金幣數額">
+            <input type="number" placeholder="請輸入提領鑽石數額">
             <div class="but">確認</div>
         </div>
     </div>
@@ -84,7 +84,7 @@
     <div class="withDrawalPub">
         <div class="withDrawalPub_in">
             <div class="title">確認提領</div>
-            <p>確認通過 <b>中國大陸銀聯</b> 提領 <b>6666</b>金幣?</p>
+            <p>確認通過 <b>中國大陸銀聯</b> 提領 <b>6666</b>鑽石?</p>
             <span>提領到賬數額為 <b>CNY 343.9</b></span>
             <div class="but">確認</div>
         </div>

view/molistar/modules/myincome/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.bb843346557c31268f17149ed3d6d9ae.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fa131b43c166e43d16e4.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.b315c0c33ba30389c9d9.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.bb843346557c31268f17149ed3d6d9ae.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fa131b43c166e43d16e4.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.142c8e9ce2dbb46760ca.js></script></body></html>

view/molistar/vue-project/myincome/src/router/index.js

@@ -41,8 +41,22 @@ routers.beforeEach((to, from, next) => {
         }
 
       } else {
-        var language = info.deviceInfo['Accept-Language'];
-        window.sessionStorage.setItem('language', 'en');
+        // 获取地址栏参数
+        function getQueryString() {
+          var _url = location.search;
+          var theRequest = new Object();
+          if (_url.indexOf('?') != -1) {
+            var str = _url.substr(1);
+            strs = str.split('&');
+            for (var i in strs) {
+              theRequest[strs[i].split('=')[0]] = decodeURI(strs[i].split('=')[1]);
+            }
+          }
+          return theRequest;
+        }
+        var language = getQueryString().lang ? getQueryString().lang : 'en';
+        window.sessionStorage.setItem('language', language);
+        // var language = info.deviceInfo['Accept-Language'];
         // if (language === 'ar') document.documentElement.setAttribute("dir", "rtl")//i18n是我们项目里的全局变量，表示当前选择的语言，ar代表阿拉伯语
       }
       next();