peko1.1.0：新增房间分享ios所需参数；优化账礼物获得文案

2022-10-11 18:31:07 +08:00
parent a09ccc4e85
commit 81664dc139
11 changed files with 70 additions and 60 deletions
--- a/view/peko/activity/act-sail/js/more.js
+++ b/view/peko/activity/act-sail/js/more.js
@@ -4,7 +4,7 @@ let env = EnvCheck();
 if (env == 'test') {
    new VConsole();
 }
-// 封装layer消息提醒框
+// 封裝layer消息提醒框
 let layerIndex
 const showLoading = (content = '加載中...') => {
    layer.open({
@@ -31,7 +31,7 @@ $(function () {
    setTimeout(function () {
        getInfoFromClient()
        setTimeout(function () {
-            // 页面全屏
+            // 頁面全屏
            if (browser.app) {
                if (browser.android) {
                    window.androidJsObj.initShowNav(false)
@@ -39,7 +39,7 @@ $(function () {
                    window.webkit.messageHandlers.initShowNav.postMessage(0)
                }
            };
-            // 顶部返回事件
+            // 頂部返回事件
            $('.back').click(() => {
                if (browser.android) {
                    window.androidJsObj.closeWebView()
@@ -54,10 +54,10 @@ $(function () {
    })
 })

-// 获取用户道具数量
+// 獲取用戶道具數量
 let previousNum
 const getUserPropNum = (param = 0) => {
-    showLoading('获取用户道具数量中...')
+    showLoading('獲取用戶道具數量中...')
    networkRequest({
        type: 'GET',
        url: urlPrefix + '/linearlyPool/userkey',
@@ -81,9 +81,9 @@ const getUserPropNum = (param = 0) => {
 }


-// 获取用户信息
+// 獲取用戶信息
 const getUserInfo = () => {
-    showLoading('获取个人信息中...')
+    showLoading('獲取個人信息中...')
    networkRequest({
        type: 'GET',
        url: urlPrefix + '/activities/draw/queryTicketNum',
@@ -112,10 +112,10 @@ const getUserInfo = () => {
    })
 }

-// 获取礼包信息
+// 獲取禮包信息
 let listPack = []
 const getListPack = () => {
-    showLoading('获取礼包信息中...')
+    showLoading('獲取禮包信息中...')
    networkRequest({
        type: 'GET',
        url: urlPrefix + '/linearlyPool/listPack',
@@ -137,14 +137,14 @@ const getListPack = () => {
        }
    })
 }
-// 渲染礼包
+// 渲染禮包
 let arrTips = [
-    '赠送燃油1个',
-    '赠送燃油7-10个',
-    '赠送燃油70-100个',
-    '赠送燃油700-1000个',
+    '贈送燃油1個',
+    '贈送燃油7-10個',
+    '贈送燃油70-100個',
+    '贈送燃油700-1000個',
 ]
-// 渲染礼包
+// 渲染禮包
 const renderList = () => {
    listPack.map((item, index) => {
        let $li = $('ul.dress_wrap li').eq(index)
@@ -165,15 +165,15 @@ const renderList = () => {
 }


-// 点击购买打开弹窗
+// 點擊購買打開彈窗
 $(".dress_wrap").on('click', '.buy', function () {
    console.log($(this).data());
    if (!$(this).data('name') || !$(this).data('day') || !$(this).data('gold') || !$(this).data('giftId')) {
-        toastMsg('礼包信息不完整')
+        toastMsg('禮包信息不完整')
        return
    }

-    giftObj = {} //头饰礼包信息
+    giftObj = {} //頭飾禮包信息
    giftObj['name'] = $(this).data('name')
    giftObj['day'] = $(this).data('day')
    giftObj['gold'] = $(this).data('gold')
@@ -189,11 +189,11 @@ $(".dress_wrap").on('click', '.buy', function () {
    $('.shade-mask-buy').fadeIn(50)
 })

-// 点击弹窗取消按钮
+// 點擊彈窗取消按鈕
 $('.shade-mask-buy .shade-content-buy .buy-btn .cancel').click(function () {
    $('.shade-mask-buy').hide();
 })
-// 增加购买数量
+// 增加購買數量
 $('.increase').on('click', function () {
    if (giftObj['num'] < 999) {
        giftObj['num']++;
@@ -203,10 +203,10 @@ $('.increase').on('click', function () {
        $('.buy-day span').html(giftObj['day'])
        $('.buy-price span').html(allPrice)
    } else {
-        toastMsg('单次购买数量最多为999')
+        toastMsg('單次購買數量最多為999')
    }
 })
-// 减少购买数量
+// 減少購買數量
 $('.decrease').on('click', function () {
    if ($('.inputNum').val() > 0) {
        giftObj['num']--;
@@ -216,14 +216,14 @@ $('.decrease').on('click', function () {
        $('.buy-day span').html(giftObj['day'])
        $('.buy-price span').html(allPrice)
    } else {
-        toastMsg('最少购买数量为1')
+        toastMsg('最少購買數量為1')
    }
 })
-// 手动输入购买数量
+// 手動輸入購買數量
 $('.inputNum').on('input', function () {
    let exp = /^[0-9]+$/
    if (!exp.test($(this).val())) {
-        toastMsg('请输入数字')
+        toastMsg('請輸入數字')
        return
    }
    if ($(this).val() > 999) {
@@ -238,17 +238,17 @@ $('.inputNum').on('input', function () {
    $('.buy-price span').html(allPrice)
 })

-// 确认购买
+// 確認購買
 let lock = false
 $('.shade-content-buy .buy-btn .confirm').click(function () {
    let exp = /^[0-9]+$/
    if (!exp.test($('.inputNum').val())) {
-        toastMsg('请输入数字')
+        toastMsg('請輸入數字')
        $('.inputNum').val(1)
        return
    }
    if ($('.inputNum').val() == 0) {
-        return toastMsg('最少购买数量为1')
+        return toastMsg('最少購買數量為1')
    }
    if (!lock) {
        lock = true
@@ -265,7 +265,7 @@ $('.shade-content-buy .buy-btn .confirm').click(function () {
                if (res.code === 200) {
                    getUserPropNum(res.data)
                    $('.shade-mask-buy').hide()
-                    toastMsg(`赠送燃油` + giftObj.ticketNum * giftObj.num)
+                    toastMsg(`贈送燃油` + giftObj.ticketNum * giftObj.num)
                } else if (res.code === 2103) {
                    $('.shade-mask-buy').hide()
                    $('.shade-mask-no-money').fadeIn()
@@ -282,7 +282,7 @@ $('.shade-content-buy .buy-btn .confirm').click(function () {
    }

 })
-// 跳转充值
+// 跳轉充值
 $('.recharge').on('click', function () {
    $('.shade-mask-no-money').fadeOut(300)
    $('body').css('overflow', 'auto')
@@ -293,11 +293,11 @@ $('.recharge').on('click', function () {
            window.webkit.messageHandlers.openChargePage.postMessage(null)
        }
    } else {
-        toastMsg('请在app内打开')
+        toastMsg('請在app內打開')
    }
 })

-//从充值页面返回活动页面 重新请求用户信息接口
+//從充值頁面返回活動頁面 重新請求用戶信息接口
 var hiddenProperty = 'hidden' in document ? 'hidden' :
    'webkitHidden' in document ? 'webkitHidden' :
        'mozHidden' in document ? 'mozHidden' : null;
--- a/view/peko/activity/act-sail/js/play_e.js
+++ b/view/peko/activity/act-sail/js/play_e.js
@@ -4,7 +4,7 @@ let env = EnvCheck();
 if (env == 'test') {
    new VConsole();
 }
-// 封装layer消息提醒框
+// 封裝layer消息提醒框
 let layerIndex
 const showLoading = (content = '加載中...') => {
    layer.open({
@@ -31,7 +31,7 @@ $(function () {
    setTimeout(function () {
        getInfoFromClient()
        setTimeout(function () {
-            // 页面全屏
+            // 頁面全屏
            if (browser.app) {
                if (browser.android) {
                    window.androidJsObj.initShowNav(false)
@@ -39,7 +39,7 @@ $(function () {
                    window.webkit.messageHandlers.initShowNav.postMessage(0)
                }
            };
-            // 顶部返回事件
+            // 頂部返回事件
            $('.back').click(() => {
                if (browser.android) {
                    window.androidJsObj.closeWebView()
@@ -52,10 +52,10 @@ $(function () {
    })
 })

-// 获取礼包信息
+// 獲取禮包信息
 let listPack = []
 const getListPack = () => {
-    showLoading('获取礼包信息中...')
+    showLoading('獲取禮包信息中...')
    networkRequest({
        type: 'GET',
        url: urlPrefix + '/linearlyPool/prizes/withRate',
@@ -77,7 +77,7 @@ const getListPack = () => {
        }
    })
 }
-// 渲染礼包
+// 渲染禮包
 const renderList = () => {
    let str = ''
    listPack.map((item, index) => {
--- a/view/peko/activity/act-sail/js/play_i.js
+++ b/view/peko/activity/act-sail/js/play_i.js
@@ -4,7 +4,7 @@ let env = EnvCheck();
 if (env == 'test') {
    new VConsole();
 }
-// 封装layer消息提醒框
+// 封裝layer消息提醒框
 let layerIndex
 const showLoading = (content = '加載中...') => {
    layer.open({
@@ -31,7 +31,7 @@ $(function () {
    setTimeout(function () {
        getInfoFromClient()
        setTimeout(function () {
-            // 页面全屏
+            // 頁面全屏
            if (browser.app) {
                if (browser.android) {
                    window.androidJsObj.initShowNav(false)
@@ -39,7 +39,7 @@ $(function () {
                    window.webkit.messageHandlers.initShowNav.postMessage(0)
                }
            };
-            // 顶部返回事件
+            // 頂部返回事件
            $('.back').click(() => {
                if (browser.android) {
                    window.androidJsObj.closeWebView()
@@ -52,9 +52,9 @@ $(function () {
    })
 })

-// 获取礼包信息
+// 獲取禮包信息
 const getListPack = () => {
-    showLoading('获取礼包信息中...')
+    showLoading('獲取禮包信息中...')
    networkRequest({
        type: 'GET',
        url: urlPrefix + '/linearlyPool/listPack',
--- a/view/peko/activity/act-sail/js/win.js
+++ b/view/peko/activity/act-sail/js/win.js
@@ -4,7 +4,7 @@ let env = EnvCheck();
 if (env == 'test') {
    new VConsole();
 }
-// 封装layer消息提醒框
+// 封裝layer消息提醒框
 let layerIndex
 const showLoading = (content = '加載中...') => {
    layer.open({
@@ -31,7 +31,7 @@ $(function () {
    setTimeout(function () {
        getInfoFromClient()
        setTimeout(function () {
-            // 页面全屏
+            // 頁面全屏
            if (browser.app) {
                if (browser.android) {
                    window.androidJsObj.initShowNav(false)
@@ -39,7 +39,7 @@ $(function () {
                    window.webkit.messageHandlers.initShowNav.postMessage(0)
                }
            };
-            // 顶部返回事件
+            // 頂部返回事件
            $('.back').click(() => {
                if (browser.android) {
                    window.androidJsObj.closeWebView()
@@ -54,7 +54,7 @@ $(function () {

 var isLock = true;
 var pageNum = 1;
-//记录
+//記錄
 function recordFun() {
    showLoading();
    networkRequest({
@@ -92,22 +92,22 @@ function recordFun() {
        }
    })
 }
-// 下拉记录
+// 下拉記錄
 $('.record ul').scroll(function () {
-    let scrollTop = $(this).scrollTop() //网页被卷去的高
-    let scrollHeight = $('.record ul')[0].scrollHeight //网页正文全文高
+    let scrollTop = $(this).scrollTop() //網頁被卷去的高
+    let scrollHeight = $('.record ul')[0].scrollHeight //網頁正文全文高
    let ulHeight = $(this).innerHeight()
    // console.log(scrollTop, scrollHeight, ulHeight);
    // console.log(scrollTop + ulHeight);

    if (scrollTop + ulHeight + 10 >= scrollHeight) {
        if (isLock) {
-            // 请求下一页
+            // 請求下一頁
            isLock = false;
            pageNum = pageNum + 1
            recordFun();
        } else {
-            console.log('没有更多了');
+            console.log('沒有更多了');
        }
    }
 })
--- a/view/peko/modules/myincome/index.html
+++ b/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>peko</title><link href=./static/css/app.f11b334e6fffc50132cb1dc3a4db2f8d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.b7d7bb27375ec0390385.js></script><script type=text/javascript src=./static/js/vendor.e1f3b20580f807878b61.js></script><script type=text/javascript src=./static/js/app.bf94490e3e4d07823af1.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>peko</title><link href=./static/css/app.9bf5cb9af5a397cd4f9087d01557a609.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.8a0e8628731fc754b928.js></script><script type=text/javascript src=./static/js/vendor.e1f3b20580f807878b61.js></script><script type=text/javascript src=./static/js/app.bf94490e3e4d07823af1.js></script></body></html>
--- a/view/peko/modules/myincome/static/css/app.9bf5cb9af5a397cd4f9087d01557a609.css
+++ b/view/peko/modules/myincome/static/css/app.9bf5cb9af5a397cd4f9087d01557a609.css
--- a/view/peko/modules/myincome/static/js/5.57007e04c71f0c47d103.js
+++ b/view/peko/modules/myincome/static/js/5.57007e04c71f0c47d103.js
--- a/view/peko/modules/myincome/static/js/5.60e299173d72cf9a5fba.js
+++ b/view/peko/modules/myincome/static/js/5.60e299173d72cf9a5fba.js
--- a/view/peko/modules/myincome/static/js/manifest.8a0e8628731fc754b928.js
+++ b/view/peko/modules/myincome/static/js/manifest.8a0e8628731fc754b928.js
@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"109500707a3b258d8753",1:"65c8a24141285f752017",2:"a2b32e8c55ba73112c78",3:"d9199c31987c1d8420ff",4:"582a918681a728eba76a",5:"60e299173d72cf9a5fba",6:"83f6e0e15e71cd5ff43a",7:"c4fa50566fd7f80d2aaa",8:"bfc6ce65abb369da9af5",9:"21d60d154d470edce445",10:"8520f094936f10a3326e",11:"d7f680441a68ac544dfb",12:"521e70ac8f056af09bd9"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),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.b7d7bb27375ec0390385.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"109500707a3b258d8753",1:"65c8a24141285f752017",2:"a2b32e8c55ba73112c78",3:"d9199c31987c1d8420ff",4:"582a918681a728eba76a",5:"57007e04c71f0c47d103",6:"83f6e0e15e71cd5ff43a",7:"c4fa50566fd7f80d2aaa",8:"bfc6ce65abb369da9af5",9:"21d60d154d470edce445",10:"8520f094936f10a3326e",11:"d7f680441a68ac544dfb",12:"521e70ac8f056af09bd9"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),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.8a0e8628731fc754b928.js.map
--- a/view/peko/modules/share_room/index.html
+++ b/view/peko/modules/share_room/index.html
@@ -9,6 +9,16 @@
  <meta http-equiv="cache-control" content="no-cache" />
  <meta http-equiv="expires" content="" />
  <title>分享</title>
+  <meta property="og:url" content="" />
+    <meta property="fb:app_id" content="1266232494209868" />
+    <meta property="og:type" content="website" />
+    <meta property="og:title" content="ANAN-全球华人都在玩" />
+    <meta property="og:description" content="聊天交友赚福利" />
+    <!-- https://pic.lecheng163.com/ananLogo256.png -->
+    <meta class="content_image" property="og:image" content="http://beta.img.pekolive.com/logo-512.png?from_wecom=1" />
+    <meta property="og:image:width" content="256">
+    <meta property="og:image:height" content="256">
+    <meta property="og:image:type" content="image/png">
  <link rel="stylesheet" href="../../common/css/reset.css" />
  <link rel="stylesheet" href="./css/index.css?v=1.1" />
  <script src="../../common/js/flexible.js"></script>
--- a/view/peko/vue-project/myincome/src/view/myincome/DiamondLog.vue
+++ b/view/peko/vue-project/myincome/src/view/myincome/DiamondLog.vue
@@ -35,7 +35,7 @@
            v-if="thinkTime(index, item)"
          >
            <span class="time">{{ relDate(item.date) }}</span>
-            <span>{{tab === 11 ? "共收入" : tab == 1 ? '共获得' : '共支出'}}</span>
+            <span>{{tab === 11 ? "共收入" : tab == 1 ? '共获得价值' : '共支出'}}</span>
            <span class="total">{{tab === 1? item.totalGiftGoldNumDailySum: item.total}}</span>
            <span>钻石</span>
          </van-index-anchor>