diff --git a/view/peko/activity/act-ocean/css/.sass-cache/dae8761673f9778a5e1522bb223bf9a8f0fdb5a6/index.scssc b/view/peko/activity/act-ocean/css/.sass-cache/dae8761673f9778a5e1522bb223bf9a8f0fdb5a6/index.scssc deleted file mode 100644 index ac9d519..0000000 Binary files a/view/peko/activity/act-ocean/css/.sass-cache/dae8761673f9778a5e1522bb223bf9a8f0fdb5a6/index.scssc and /dev/null differ diff --git a/view/peko/activity/act-ocean/css/.sass-cache/dae8761673f9778a5e1522bb223bf9a8f0fdb5a6/record.scssc b/view/peko/activity/act-ocean/css/.sass-cache/dae8761673f9778a5e1522bb223bf9a8f0fdb5a6/record.scssc deleted file mode 100644 index 52e47b9..0000000 Binary files a/view/peko/activity/act-ocean/css/.sass-cache/dae8761673f9778a5e1522bb223bf9a8f0fdb5a6/record.scssc and /dev/null differ diff --git a/view/peko/common/js/common2.js b/view/peko/common/js/common2.js index 625583f..2889832 100644 --- a/view/peko/common/js/common2.js +++ b/view/peko/common/js/common2.js @@ -823,6 +823,7 @@ function objToParam(a) { // 封装 jquery 请求 // written by zxfxiong function networkRequest(reqObj = {}, type) { + // 关于reqObj内部参数：与 调用原生$.ajax()时传参一致 // 调用该函数前：须保证事先调用了 getInfoFromClient() if (typeof pubInfo.deviceInfo === 'string') { @@ -841,6 +842,7 @@ function networkRequest(reqObj = {}, type) { pub_ticket: pubInfo.ticket, }; + const browser = checkVersion(); if (browser.app) { pubHeader["Accept-Language"] = pubInfo.deviceInfo["Accept-Language"]; } else { diff --git a/view/peko/modules/act-treasureSnatching/css/rule.css b/view/peko/modules/act-treasureSnatching/css/rule.css index 0771dd5..5a66a96 100644 --- a/view/peko/modules/act-treasureSnatching/css/rule.css +++ b/view/peko/modules/act-treasureSnatching/css/rule.css @@ -3,8 +3,7 @@ body { width: 100%; height: 100%; box-sizing: border-box; - padding-top: 0.7333333333rem; - background-color: #007983; } + padding-top: 0.7333333333rem; } .back { width: 0.7466666667rem; diff --git a/view/peko/modules/act-treasureSnatching/css/rule.scss b/view/peko/modules/act-treasureSnatching/css/rule.scss index f10efbf..4b267cb 100644 --- a/view/peko/modules/act-treasureSnatching/css/rule.scss +++ b/view/peko/modules/act-treasureSnatching/css/rule.scss @@ -9,7 +9,7 @@ body { // overflow-y: none; box-sizing: border-box; padding-top: px2rem(55, ); - background-color: #007983; + // background-color: #007983; } .back { diff --git a/view/peko/modules/act-treasureSnatching/js/index.js b/view/peko/modules/act-treasureSnatching/js/index.js index 9535c42..a7edbdb 100644 --- a/view/peko/modules/act-treasureSnatching/js/index.js +++ b/view/peko/modules/act-treasureSnatching/js/index.js @@ -76,7 +76,7 @@ function translateFun() { $('#index_cancel').html(langReplace(localLang.demoModule.index_cancel)) $('#index_buy').html(langReplace(localLang.demoModule.index_buy)) - if (localLang.code == 'zh' || localLang.code == 'en') { + if (localLang.code != 'id') { $('#recharge').addClass('butline') } } diff --git a/view/peko/modules/game/css/.sass-cache/22ed44afda8723448d73a9ee39d3d9ed1b23bd64/register.scssc b/view/peko/modules/game/css/.sass-cache/22ed44afda8723448d73a9ee39d3d9ed1b23bd64/register.scssc deleted file mode 100644 index 1f1b568..0000000 Binary files a/view/peko/modules/game/css/.sass-cache/22ed44afda8723448d73a9ee39d3d9ed1b23bd64/register.scssc and /dev/null differ diff --git a/view/peko/modules/game/js/index.js b/view/peko/modules/game/js/index.js index 7114518..b326b4e 100644 --- a/view/peko/modules/game/js/index.js +++ b/view/peko/modules/game/js/index.js @@ -54,7 +54,9 @@ let shareObj = { let inviteList = [] let userInfo = {} const getInviteList = () => { - showLoading() + const langReplace = window.lang.replace; + const localLang = window.lang; + showLoading(langReplace(localLang.demoModule.loading)) networkRequest({ type: 'GET', url: urlPrefix + '/inviteCode/getListV2', @@ -105,7 +107,9 @@ const getInviteList = () => { const getRule = () => { - showLoading() + const langReplace = window.lang.replace; + const localLang = window.lang; + showLoading(langReplace(localLang.demoModule.loading)) networkRequest({ type: 'GET', url: urlPrefix + '/inviteCode/getInviteTicketInfo', diff --git a/view/peko/modules/level/css/.sass-cache/14ab80a699240845b096e9086c6a546a505e889e/flex.scssc b/view/peko/modules/level/css/.sass-cache/14ab80a699240845b096e9086c6a546a505e889e/flex.scssc deleted file mode 100644 index 3bae2c7..0000000 Binary files a/view/peko/modules/level/css/.sass-cache/14ab80a699240845b096e9086c6a546a505e889e/flex.scssc and /dev/null differ diff --git a/view/peko/modules/level/css/.sass-cache/33f35d294331f90de8b2dc67cc4008085eaa06e0/index.scssc b/view/peko/modules/level/css/.sass-cache/33f35d294331f90de8b2dc67cc4008085eaa06e0/index.scssc deleted file mode 100644 index 16e0f17..0000000 Binary files a/view/peko/modules/level/css/.sass-cache/33f35d294331f90de8b2dc67cc4008085eaa06e0/index.scssc and /dev/null differ diff --git a/view/peko/modules/logout/js/fail.js b/view/peko/modules/logout/js/fail.js index e3f4d6e..2a8a3e6 100644 --- a/view/peko/modules/logout/js/fail.js +++ b/view/peko/modules/logout/js/fail.js @@ -7,6 +7,9 @@ const toastMsg = (content = '操作完成', time = 2) => { skin: 'msg' }) } +if (EnvCheck() == 'test') { + new VConsole(); +} $(function(){ getInfoFromClient() diff --git a/view/peko/modules/logout/js/index.js b/view/peko/modules/logout/js/index.js index 7aa12cf..4f5f7f5 100644 --- a/view/peko/modules/logout/js/index.js +++ b/view/peko/modules/logout/js/index.js @@ -41,7 +41,9 @@ $(function () { } }) $('.next').click(() => { - showLoading() + const langReplace = window.lang.replace; + const localLang = window.lang; + showLoading(langReplace(localLang.demoModule.loading)) networkRequest({ type: 'GET', url: urlPrefix + '/user/cancel/check', diff --git a/view/peko/modules/rule/js/newWishingWellRule.js b/view/peko/modules/rule/js/newWishingWellRule.js index dbdfdcd..9846592 100644 --- a/view/peko/modules/rule/js/newWishingWellRule.js +++ b/view/peko/modules/rule/js/newWishingWellRule.js @@ -26,7 +26,9 @@ const toastMsg = (content = '操作完成', time = 2) => { let wishingWellList = [] const getData = (boxType = 2) => { - showLoading() + const langReplace = window.lang.replace; + const localLang = window.lang; + showLoading(langReplace(localLang.demoModule.loading)) networkRequest({ type: 'GET', url: urlPrefix + '/findLove/rule', diff --git a/view/peko/modules/share_room/css/.sass-cache/14ab80a699240845b096e9086c6a546a505e889e/flex.scssc b/view/peko/modules/share_room/css/.sass-cache/14ab80a699240845b096e9086c6a546a505e889e/flex.scssc deleted file mode 100644 index dbc2f7a..0000000 Binary files a/view/peko/modules/share_room/css/.sass-cache/14ab80a699240845b096e9086c6a546a505e889e/flex.scssc and /dev/null differ diff --git a/view/peko/modules/share_room/css/.sass-cache/26ca1dea052741d3640a64dd244d06ac5bcc6908/index.scssc b/view/peko/modules/share_room/css/.sass-cache/26ca1dea052741d3640a64dd244d06ac5bcc6908/index.scssc deleted file mode 100644 index 2c879ec..0000000 Binary files a/view/peko/modules/share_room/css/.sass-cache/26ca1dea052741d3640a64dd244d06ac5bcc6908/index.scssc and /dev/null differ diff --git a/view/peko/modules/share_room/css/.sass-cache/69b2313c8708bfde568b9b316cbdf4c1112edc5e/index.scssc b/view/peko/modules/share_room/css/.sass-cache/69b2313c8708bfde568b9b316cbdf4c1112edc5e/index.scssc deleted file mode 100644 index 3479863..0000000 Binary files a/view/peko/modules/share_room/css/.sass-cache/69b2313c8708bfde568b9b316cbdf4c1112edc5e/index.scssc and /dev/null differ diff --git a/view/peko/modules/share_room/css/.sass-cache/9ea032484af08e447a685a0232ad0c1928553345/flex.scssc b/view/peko/modules/share_room/css/.sass-cache/9ea032484af08e447a685a0232ad0c1928553345/flex.scssc deleted file mode 100644 index 71498e8..0000000 Binary files a/view/peko/modules/share_room/css/.sass-cache/9ea032484af08e447a685a0232ad0c1928553345/flex.scssc and /dev/null differ diff --git a/view/peko/modules/share_room/index.html b/view/peko/modules/share_room/index.html index f8fd9f7..0b45e3c 100644 --- a/view/peko/modules/share_room/index.html +++ b/view/peko/modules/share_room/index.html @@ -31,9 +31,9 @@

-

邀请你进入 的房间

-

房间ID

- 立即进入 +

+

+