完成繁体化

view/peko/activity/act-guard-planet/css/index.css

@@ -1115,9 +1115,10 @@ body {
 }
 
 .wrap .popup-record-list .record-list-content ul.record-list li.record-item .result-wrap p img, .wrap .popup-record-list .previous-result-content ul.record-list li.record-item .result-wrap p img, .wrap .pupop-previous-result .record-list-content ul.record-list li.record-item .result-wrap p img, .wrap .pupop-previous-result .previous-result-content ul.record-list li.record-item .result-wrap p img {
-  width: 0.4rem;
+  width: 0.33333rem;
-  height: 0.29333rem;
+  height: 0.33333rem;
-  vertical-align: baseline;
+  vertical-align: middle;
+  margin-top: -0.06667rem;
 }
 
 .wrap .popup-record-list .record-list-content ul.record-list .no-record, .wrap .popup-record-list .previous-result-content ul.record-list .no-record, .wrap .pupop-previous-result .record-list-content ul.record-list .no-record, .wrap .pupop-previous-result .previous-result-content ul.record-list .no-record {

view/peko/activity/act-guard-planet/css/index.scss

@@ -991,9 +991,10 @@ body{
                                 font-size: px2rem(20);
                             }
                             img{
-                                width: px2rem(30);
+                                width: px2rem(25);
-                                height: px2rem(22);
+                                height: px2rem(25);
-                                vertical-align: baseline;
+                                vertical-align: middle;
+                                margin-top: px2rem(-5);
                             }
                         }
                     }

view/peko/activity/act-guard-planet/index.html

@@ -174,9 +174,9 @@
         <!-- 余額不足彈窗 -->
         <div class="shade-mask-no-money">
             <div class="shade-content-no-money">
-                <p class="no-money-title">余額不足</p>
+                <p class="no-money-title">鉆石余額不足</p>
                 <p class="no-money-pic"><img src="./images/mall/no-money.png" alt=""></p>
-                <p class="no-money-tip">親，余額不足~</p>
+                <p class="no-money-tip">親，鉆石余額不足~</p>
                 <p class="no-money-recharge">去充值</p>
             </div>
         </div>

view/peko/activity/act-guard-planet/js/index.js

@@ -606,6 +606,8 @@ const sendUserDrawInfo = (itemId, num) => {
                 if (currentWeaponIndex_top != undefined) {
                     restrainArr[currentWeaponIndex_top]['num_top'] = 0
                 }
+            }else if(res.code === 31005){
+                $('.shade-mask-no-money').show();
             } else {
                 toastMsg(res.message)
             }
@@ -624,6 +626,7 @@ let pageSize = 10
 let canNextUserRecord
 let isLockUserRecord = true
 const getUserRecord = () => {
+    showLoading()
     networkRequest({
         type: 'GET',
         url: urlPrefix + '/act/callBattle/listDrawRecord',
@@ -645,9 +648,11 @@ const getUserRecord = () => {
             } else {
                 toastMsg(res.message)
             }
+            hideLoading(layerIndex)
         },
         error (err) {
             toastMsg('網絡錯誤')
+            hideLoading(layerIndex)
         }
     })
 }
@@ -1286,39 +1291,40 @@ $(function () {
         if ($('.select-num input').val() == 0) {
             return toastMsg('數量不能少於0')
         }
-        if (parseInt(myFragment) < $('.select-num input').val()) {
+        // if (parseInt(myFragment) < $('.select-num input').val()) {
-            console.log('myFragment----', myFragment);
+        //     console.log('myFragment----', myFragment);
-            console.log($('.select-num input').val());
+        //     console.log($('.select-num input').val());
-            let distance = $('.select-num input').val() - myFragment
+        //     let distance = $('.select-num input').val() - myFragment
-            // let listArr = JSON.parse( window.sessionStorage.getItem('listMap'))
+        //     console.log(listMap);
-            // console.log(JSON.parse( window.sessionStorage.getItem('listMap') ));
+        //     // let listArr = JSON.parse( window.sessionStorage.getItem('listMap'))
-            let packItem = {}
+        //     // console.log(JSON.parse( window.sessionStorage.getItem('listMap') ));
-            let giveNum = ''
+        //     let packItem = {}
-            if (distance == 1) {
+        //     let giveNum = ''
-                packItem = listMap[0]
+        //     if (distance == 1) {
-                giveNum = 1
+        //         packItem = listMap[0]
-            } else if (distance <= 10) {
+        //         giveNum = 1
-                packItem = listMap[1]
+        //     } else if (distance <= 10) {
-                giveNum = '7~10'
+        //         packItem = listMap[1]
-            } else if (distance <= 100) {
+        //         giveNum = '7~10'
-                packItem = listMap[2]
+        //     } else if (distance <= 100) {
-                giveNum = '70~100'
+        //         packItem = listMap[2]
-            } else {
+        //         giveNum = '70~100'
-                packItem = listMap[3]
+        //     } else {
-                giveNum = '700~1000'
+        //         packItem = listMap[3]
-            }
+        //         giveNum = '700~1000'
-            console.log(packItem);
+        //     }
-            $('.popup-not-enough .headwear-pic').attr('src', packItem.imgUrl)
+        //     console.log(packItem);
-            $('.popup-not-enough .headwear-name').html(packItem.name + '/天')
+        //     $('.popup-not-enough .headwear-pic').attr('src', packItem.imgUrl)
-            $('.popup-not-enough .headwear-award').html(`獲贈魔法石${giveNum}個`)
+        //     $('.popup-not-enough .headwear-name').html(packItem.name + '/天')
-            $('.popup-not-enough .headwear-price span').html(packItem.sellingPrice)
+        //     $('.popup-not-enough .headwear-award').html(`獲贈魔法石${giveNum}個`)
-            $('.popup-not-enough .diamond-num span').html(userDiamonds)
+        //     $('.popup-not-enough .headwear-price span').html(packItem.sellingPrice)
+        //     $('.popup-not-enough .diamond-num span').html(userDiamonds)
 
-            $('.popup-not-enough .buy-btn').data('id', packItem.id)
+        //     $('.popup-not-enough .buy-btn').data('id', packItem.id)
 
-            $('.popup-not-enough').show()
+        //     $('.popup-not-enough').show()
-            return
+        //     return
-        }
+        // }
 
         // 每個標誌位上的數量
         restrainArr[currentWeaponIndex].costPieceNum += parseInt($('.select-num input').val())
@@ -1618,14 +1624,14 @@ document.addEventListener('visibilitychange', function () {
     }
 })
 //返回頁面 重新請求接口
-// var hiddenProperty = 'hidden' in document ? 'hidden' :
+var hiddenProperty = 'hidden' in document ? 'hidden' :
-//     'webkitHidden' in document ? 'webkitHidden' :
+    'webkitHidden' in document ? 'webkitHidden' :
-//         'mozHidden' in document ? 'mozHidden' : null;
+        'mozHidden' in document ? 'mozHidden' : null;
 
-// var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
+var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
-// var onVisibilityChange = function () {
+var onVisibilityChange = function () {
-//     if (!document[hiddenProperty]) {
+    if (!document[hiddenProperty]) {
-//         location.reload();
+        location.reload();
-//     }
+    }
-// }
+}
-// document.addEventListener(visibilityChangeEvent, onVisibilityChange);
+document.addEventListener(visibilityChangeEvent, onVisibilityChange);

view/peko/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>piko</title><link href=./static/css/app.b49c98e794a924fcac5e6ec2fd273502.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ed376927a01a418468e3.js></script><script type=text/javascript src=./static/js/vendor.549947ec2550614f506c.js></script><script type=text/javascript src=./static/js/app.f56d535f53d3c277e0fd.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>piko</title><link href=./static/css/app.e1c5b4d3113417db88cae215171789bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0c646111b37e0727341b.js></script><script type=text/javascript src=./static/js/vendor.549947ec2550614f506c.js></script><script type=text/javascript src=./static/js/app.f56d535f53d3c277e0fd.js></script></body></html>

view/peko/modules/myincome/static/js/manifest.0c646111b37e0727341b.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,f){for(var a,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,f);s.length;)s.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"ec4de892f04f94b4c2f6",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"fe32c1237c8826c80886",4:"95d3c8221db60b228eb2",5:"6eeb77c8e1705e2c87c0",6:"0e7ac399b5d59483b7f2",7:"c60dff0fd854d6fc291f",8:"43a07f21010bbe7fcd6c",9:"d02156509389fc441584",10:"68b3b250aa24f55d8a82",11:"5d316356ba01de644f13",12:"34fff916cd789ce22038"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,f){for(var a,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,f);s.length;)s.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"ec4de892f04f94b4c2f6",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"fe32c1237c8826c80886",4:"95d3c8221db60b228eb2",5:"cbac951752ffa88e11eb",6:"0e7ac399b5d59483b7f2",7:"c60dff0fd854d6fc291f",8:"43a07f21010bbe7fcd6c",9:"d02156509389fc441584",10:"68b3b250aa24f55d8a82",11:"5d316356ba01de644f13",12:"34fff916cd789ce22038"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.ed376927a01a418468e3.js.map
+//# sourceMappingURL=manifest.0c646111b37e0727341b.js.map

view/peko/vue-project/myincome/src/view/myincome/DiamondLog.vue

@@ -60,11 +60,13 @@
               <p v-else-if="tab === 11 && item1.objType === 96">幸運塔羅收入</p>
               <p v-else-if="tab === 11 && item1.objType === 102">中秋活动瓜分钻石</p>
               <p v-else-if="tab === 11 && item1.objType === 35">官方贈送鉆石</p>
+              <p v-else-if="tab === 11 && item1.objType === 67">守護星球獲得</p>
               <!-- <p v-else-if="tab === 11 || !item1.targetNick">{{ item1.srcNick }}</p> -->
               <p v-if="tab === 12 && item1.objType === 40">全服红包-发生在{{ item1.roomTitle }}</p>
               <p v-else-if="tab === 12 && item1.objType === 39">房间红包-发生在{{ item1.roomTitle }}</p>
               <p v-else-if="tab === 12 && item1.objType === 27">活动礼包支出</p>
               <p v-else-if="tab === 12 && item1.objType === 61">购买门票</p>
+              <p v-else-if="tab === 12 && item1.objType === 66">守護星球支出</p>
               <p v-else-if="tab === 12 && item1.objType === 70">CP邀请支出</p>
               <p v-else-if="tab === 12 && item1.objType === 74">幸運塔羅支出</p>
               <p v-else-if="tab === 12 && item1.objType === 79">赠送头饰支出</p>