新增提现未成年限制

view/peko/activity/gift_changer/css/index.css

@@ -502,6 +502,10 @@ body {
   font-size: 0.34667rem;
 }
 
+.speed_rogress .speed_rogress_top .spanAct {
+  color: #00ffea;
+}
+
 .speed_rogress .speed_rogress_top .speed {
   width: 4.66667rem;
   height: 0.44rem;
@@ -521,6 +525,7 @@ body {
 .speed_rogress .speed_rogress_top .speed div img {
   width: 0;
   height: 0.33333rem;
+  border-radius: 0.33333rem;
   display: block;
 }
 
@@ -719,6 +724,10 @@ body {
   font-style: normal;
 }
 
+.bottom .swiper .swiper-slide div strong .iAct {
+  color: #00ffea;
+}
+
 .bottom .swiper .swiper-slide div strong b {
   color: #7962A7;
   font-size: 0.26667rem;
@@ -730,6 +739,11 @@ body {
 }
 
 .bottom .swiper .swiper-slide .div_active {
+  background-size: 100% 100%;
+  border: none;
+}
+
+.bottom .swiper .swiper-slide .div_active1 {
   background: url(../images/div_active.png) no-repeat;
   background-size: 100% 100%;
   border: none;
@@ -770,10 +784,16 @@ body {
 
 .refining .refining_in p {
   margin-top: 0.98667rem;
-  width: 100%;
+  width: 90%;
   text-align: center;
   color: #fff;
   font-size: 0.32rem;
+  margin: 0.98667rem auto 0;
+  line-height: 0.45rem;
+}
+
+.refining .refining_in p b {
+  color: #00E5F9;
 }
 
 .refining .refining_in div {
@@ -781,7 +801,7 @@ body {
   display: flex;
   justify-content: space-between;
   box-sizing: border-box;
-  margin-top: 0.74667rem;
+  margin-top: 0.53333rem;
   padding: 0 0.73333rem;
 }
 
@@ -967,6 +987,61 @@ body {
   margin: 0 auto;
 }
 
+.investment2 {
+  display: none;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 88;
+}
+
+.investment2 .investment_in {
+  width: 6.88rem;
+  height: 5.57333rem;
+  background: url(../images/add_put.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  left: 50%;
+  top: 40%;
+  transform: translate(-50%, -50%);
+  box-sizing: border-box;
+  padding-top: 0.38667rem;
+}
+
+.investment2 .investment_in p {
+  text-align: center;
+  color: #fff;
+  font-size: 0.32rem;
+  width: 85%;
+  position: absolute;
+  top: 1.5rem;
+  left: 50%;
+  transform: translateX(-50%);
+  line-height: 0.45rem;
+}
+
+.investment2 .investment_in p b {
+  color: #00ffea;
+}
+
+.investment2 .investment_in img {
+  position: absolute;
+  width: 2.50667rem;
+  height: 1rem;
+  top: 3.5rem;
+}
+
+.investment2 .investment_in .close {
+  left: 0.6rem;
+}
+
+.investment2 .investment_in .ok {
+  right: 0.6rem;
+}
+
 .record {
   display: none;
   position: fixed;

view/peko/activity/gift_changer/css/index.scss

@@ -17,6 +17,7 @@
         url('../../../common/fonts/PingFang-Regular.ttf') format('truetype'),
         url('../../../common/fonts/PingFang-Regular.ttf') format('svg');
 }
+
 .back {
     position: fixed;
     top: px2rem(50);
@@ -52,7 +53,8 @@ body {
 
 .step1 {
     display: none;
-    .step_tips{
+
+    .step_tips {
         width: px2rem(684);
         height: px2rem(328);
         // margin: px2rem(553) px2rem(30) 0;
@@ -61,6 +63,7 @@ body {
         left: px2rem(30);
         z-index: 999;
     }
+
     .step_but {
         width: px2rem(108);
         height: px2rem(121);
@@ -71,9 +74,11 @@ body {
         z-index: 999;
     }
 }
+
 .step2 {
     display: none;
-    .step_tips{
+
+    .step_tips {
         width: px2rem(684);
         height: px2rem(328);
         // margin: px2rem(1043) px2rem(30) 0;
@@ -82,6 +87,7 @@ body {
         left: px2rem(30);
         z-index: 999;
     }
+
     .xuxian_qp {
         width: px2rem(126);
         height: px2rem(75);
@@ -90,6 +96,7 @@ body {
         left: px2rem(374);
         z-index: 999;
     }
+
     .xuxian_bar {
         width: 1.8rem;
         height: 1.3rem;
@@ -98,6 +105,7 @@ body {
         right: 0.85rem;
         z-index: 999;
     }
+
     .step_but {
         width: px2rem(108);
         height: px2rem(121);
@@ -108,9 +116,11 @@ body {
         z-index: 999;
     }
 }
+
 .step3 {
     display: none;
-    .step_tips{
+
+    .step_tips {
         width: px2rem(684);
         height: px2rem(328);
         position: absolute;
@@ -118,6 +128,7 @@ body {
         left: px2rem(30);
         z-index: 999;
     }
+
     .xuxian_c {
         width: px2rem(708);
         height: px2rem(295);
@@ -126,6 +137,7 @@ body {
         left: px2rem(21);
         z-index: 999;
     }
+
     .step_but {
         width: px2rem(108);
         height: px2rem(121);
@@ -135,9 +147,11 @@ body {
         z-index: 999;
     }
 }
+
 .step4 {
     display: none;
-    .step_tips{
+
+    .step_tips {
         width: px2rem(684);
         height: px2rem(328);
         position: absolute;
@@ -145,7 +159,8 @@ body {
         left: px2rem(30);
         z-index: 999;
     }
-    .xuxian_c{
+
+    .xuxian_c {
         width: px2rem(690);
         height: px2rem(690);
         position: absolute;
@@ -153,6 +168,7 @@ body {
         left: px2rem(30);
         z-index: 999;
     }
+
     .success_wrap {
         display: none;
         z-index: 999;
@@ -176,15 +192,18 @@ body {
             background: url(../images/qipao3.png) no-repeat;
             background-size: 100% 100%;
         }
+
         span {
             margin-top: px2rem(22);
             font-family: 'pingfang-regular';
             font-size: px2rem(24);
             color: #fff;
+
             b {
                 color: #FDD411;
             }
         }
+
         p {
             margin-top: px2rem(14);
             font-family: 'pingfang-regular';
@@ -192,6 +211,7 @@ body {
             color: #fff;
         }
     }
+
     .bad_wrap {
         display: none;
         z-index: 999;
@@ -214,15 +234,18 @@ body {
             background: url(../images/qipao_bad.png) no-repeat;
             background-size: 100% 100%;
         }
+
         span {
             margin-top: px2rem(22);
             font-family: 'pingfang-regular';
             font-size: px2rem(24);
             color: #fff;
+
             b {
                 color: #FDD411;
             }
         }
+
         p {
             margin-top: px2rem(14);
             font-family: 'pingfang-regular';
@@ -230,12 +253,13 @@ body {
             color: #fff;
         }
     }
-    
+
 }
 
 .head_wrap {
     height: px2rem(1139);
 }
+
 .header {
     width: 100%;
     height: px2rem(1018);
@@ -253,7 +277,7 @@ body {
         left: 50%;
         transform: translateX(-50%);
     }
-    
+
     .record_icon {
         width: px2rem(48);
         height: px2rem(123);
@@ -377,9 +401,11 @@ body {
         width: 100%;
         display: flex;
         justify-content: space-evenly;
+
         .tab_item {
             width: px2rem(188);
             height: px2rem(60);
+
             img {
                 width: 100%;
                 height: 100%;
@@ -460,6 +486,7 @@ body {
         background: url(../images/but_active.png) no-repeat;
         background-size: 100% 100%;
     }
+
     .xs_but_active {
         background: url(../images/xs_but_active.png) no-repeat;
         background-size: 100% 100%;
@@ -482,6 +509,7 @@ body {
         color: #fff;
         font-size: px2rem(22);
         text-align: center;
+
         span {
             color: #FBE5B5;
         }
@@ -511,6 +539,10 @@ body {
             font-size: px2rem(26);
         }
 
+        .spanAct {
+            color: #00ffea;
+        }
+
         .speed {
             width: px2rem(350);
             height: px2rem(33);
@@ -530,6 +562,7 @@ body {
                     width: 0;
                     // width: px2rem(342);
                     height: px2rem(25);
+                    border-radius: px2rem(25);
                     display: block;
                 }
             }
@@ -679,24 +712,6 @@ body {
                 margin-right: 0.6rem;
                 transform: translateX(42%);
 
-                // .div_active {
-                //     background: url(../images/div_active.png) no-repeat;
-                //     background-size: 100% 100%;
-                //     border: none;
-                //     width: px2rem(120);
-                //     height: px2rem(120);
-                //     border-radius: px2rem(12);
-                //     float: left;
-                //     position: relative;
-                //     margin-bottom: px2rem(67);
-                //     box-sizing: border-box;
-                //     margin-right: 0.6rem;
-                //     transform: translateX(42%);
-                //     position: absolute;
-                //     left: -0.1rem;
-                //     top: 0;
-                // }
-
                 img {
                     position: absolute;
                     width: px2rem(101);
@@ -749,6 +764,10 @@ body {
                         font-style: normal;
                     }
 
+                    .iAct {
+                        color: #00ffea;
+                    }
+
                     b {
                         color: #7962A7;
                         font-size: px2rem(20);
@@ -762,6 +781,12 @@ body {
             }
 
             .div_active {
+                // background: url(../images/div_active.png) no-repeat;
+                background-size: 100% 100%;
+                border: none;
+            }
+
+            .div_active1 {
                 background: url(../images/div_active.png) no-repeat;
                 background-size: 100% 100%;
                 border: none;
@@ -803,10 +828,16 @@ body {
 
         p {
             margin-top: px2rem(74);
-            width: 100%;
+            width: 90%;
             text-align: center;
             color: #fff;
             font-size: px2rem(24);
+            margin: px2rem(74) auto 0;
+            line-height: 0.45rem;
+
+            b {
+                color: #00E5F9;
+            }
         }
 
         div {
@@ -814,7 +845,7 @@ body {
             display: flex;
             justify-content: space-between;
             box-sizing: border-box;
-            margin-top: px2rem(56);
+            margin-top: px2rem(40);
             padding: 0 px2rem(55);
 
             img {
@@ -1003,6 +1034,59 @@ body {
     }
 }
 
+.investment2 {
+    display: none;
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    background: rgba(0, 0, 0, 0.6);
+    z-index: 88;
+
+    .investment_in {
+        width: px2rem(516);
+        height: px2rem(418);
+        background: url(../images/add_put.png) no-repeat;
+        background-size: 100% 100%;
+        position: relative;
+        left: 50%;
+        top: 40%;
+        transform: translate(-50%, -50%);
+        // overflow: hidden;
+        box-sizing: border-box;
+        padding-top: px2rem(29);
+
+        p {
+            text-align: center;
+            color: #fff;
+            font-size: 0.32rem;
+            width: 85%;
+            position: absolute;
+            top: 1.5rem;
+            left: 50%;
+            transform: translateX(-50%);
+            line-height: 0.45rem;
+            b{
+                color: #00ffea;
+            }
+        }
+
+        img {
+            position: absolute;
+            width: 2.50667rem;
+            height: 1rem;
+            top: 3.5rem;
+        }
+        .close{
+            left: 0.6rem;
+        }
+        .ok{
+            right: 0.6rem;
+        }
+    }
+}
+
 .record {
     display: none;
     position: fixed;
@@ -1050,6 +1134,7 @@ body {
                     border-radius: 50%;
                     border: 1px solid #C6ADFF;
                 }
+
                 .no_tx {
                     display: block;
                     width: px2rem(73);
@@ -1239,15 +1324,18 @@ body {
             background: url(../images/qipao3.png) no-repeat;
             background-size: 100% 100%;
         }
+
         span {
             margin-top: px2rem(22);
             font-family: 'pingfang-regular';
             font-size: px2rem(24);
             color: #fff;
+
             b {
                 color: #FDD411;
             }
         }
+
         p {
             margin-top: px2rem(14);
             font-family: 'pingfang-regular';
@@ -1296,15 +1384,18 @@ body {
             background: url(../images/qipao3.png) no-repeat;
             background-size: 100% 100%;
         }
+
         span {
             margin-top: px2rem(22);
             font-family: 'pingfang-regular';
             font-size: px2rem(24);
             color: #fff;
+
             b {
                 color: #FDD411;
             }
         }
+
         p {
             margin-top: px2rem(14);
             font-family: 'pingfang-regular';
@@ -1353,15 +1444,18 @@ body {
             background: url(../images/qipao_bad.png) no-repeat;
             background-size: 100% 100%;
         }
+
         span {
             margin-top: px2rem(22);
             font-family: 'pingfang-regular';
             font-size: px2rem(24);
             color: #fff;
+
             b {
                 color: #FDD411;
             }
         }
+
         p {
             margin-top: px2rem(14);
             font-family: 'pingfang-regular';
@@ -1378,4 +1472,4 @@ body {
         transform: translateX(-50%);
         top: 56%;
     }
-}
+}

view/peko/activity/gift_changer/index.html

@@ -8,7 +8,7 @@
     <title>魔法小屋</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/swiper-bundle.min.css">
-    <link rel="stylesheet" href="./css/index.css?v=1.2">
+    <link rel="stylesheet" href="./css/index.css?v=1.20">
 </head>
 
 <body>
@@ -150,7 +150,7 @@
         </div>
     </div>
     <!-- 添加減少彈框 -->
-    <div class="investment">
+    <div class="investment" style="z-index: 99;">
         <div class="investment_in">
             <!-- <img src="./images/del.png" alt="" class="closeBut"> -->
             <p class="title">選擇投入：</p>
@@ -166,6 +166,14 @@
             <div class="but"></div>
         </div>
     </div>
+    <!-- 超出弹窗提醒 -->
+    <div class="investment2" style="z-index: 100;">
+        <div class="investment_in">
+            <p>投入禮物的價值將<b>高於</b>合成所需價值，確認繼續投入嗎?</p>
+            <img class="close" src="./images/refining_close.png" alt="">
+            <img class="ok" src="./images/refining_ok.png" alt="">
+        </div>
+    </div>
 
     <!-- 規則寶典 -->
     <div class="rule">
@@ -245,4 +253,4 @@
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="../../common/js/route-constant.js"></script>
 <script src="./js/swiper-bundle.min.js"></script>
-<script src="./js/index.js?v=1.2"></script>
+<script src="./js/index.js?v=1.20"></script>

view/peko/activity/gift_changer/js/index.js

@@ -7,7 +7,7 @@ const showLoading = (content = '加載中...') => {
         type: 2,
         shadeClose: false,
         content,
-        success(e) {
+        success (e) {
             layerIndex = $(e).attr('index')
         }
     })
@@ -25,7 +25,7 @@ const toastMsg = (content = '操作完成', time = 2) => {
 
 
 var mySwiper
-function swiperFun(mySwiper) {
+function swiperFun (mySwiper) {
     mySwiper = new Swiper('.swiper', {
         loop: false, // 循環模式選項
         // 如果需要分頁器
@@ -80,31 +80,31 @@ $(function () {
                 window.webkit.messageHandlers.initShowNav.postMessage(0)
             }
         }
-        document.addEventListener('touchstart', function (event) {
+        // document.addEventListener('touchstart', function (event) {
 
-            if (event.touches.length > 1) {
+        //     if (event.touches.length > 1) {
 
-                event.preventDefault();
+        //         event.preventDefault();
 
-            }
+        //     }
 
-        })
+        // })
 
-        var lastTouchEnd = 0;
+        // var lastTouchEnd = 0;
 
-        document.addEventListener('touchend', function (event) {
+        // document.addEventListener('touchend', function (event) {
 
-            var now = (new Date()).getTime();
+        //     var now = (new Date()).getTime();
 
-            if (now - lastTouchEnd <= 300) {
+        //     if (now - lastTouchEnd <= 300) {
 
-                event.preventDefault();
+        //         event.preventDefault();
 
-            }
+        //     }
 
-            lastTouchEnd = now;
+        //     lastTouchEnd = now;
 
-        }, false)
+        // }, false)
         changeTab(tabIndex)
         noticeFun();
         getXsDataFun();
@@ -113,7 +113,7 @@ $(function () {
     }, 100);
 })
 // 播放svg
-function svgaFun() {
+function svgaFun () {
     player1 = new SVGA.Player('.luzis');
     parser1 = new SVGA.Parser('.luzis');
     parser1.load('./images/luzi.svga', function (videoItem) {
@@ -132,7 +132,7 @@ function svgaFun() {
         })
     })
 }
-function xsSvgaFun() {
+function xsSvgaFun () {
     player1 = new SVGA.Player('.luzis');
     parser1 = new SVGA.Parser('.luzis');
     parser1.load('./images/xs_luzi.svga', function (videoItem) {
@@ -150,9 +150,18 @@ function xsSvgaFun() {
 // 練造按鈕
 $('.header .but').click(function () {
     var ifs = $(this).attr('ifckick') == undefined ? 0 : 1;
-    if (ifs == 1) {
+    var valArr = $('.speed_rogress .speed_rogress_top p').text().match(/\d+(\.\d+)?/g);
+    if (ifs == 1 && valArr[0] >= valArr[1]) {
         if (headerBut) {
             headerBut = false;
+            // console.log(valArr[0])
+            // console.log(valArr[1] * 0.5)
+            // console.log((valArr[0] - valArr[1])>= valArr[1]* 0.5 ? '超过百分之五十了':'合理范围内');
+            if ((valArr[0] - valArr[1]) > 1000) {
+                $('.refining .refining_in p').html('當前投入禮物值<b>已超過</b>煉制進度值，確認繼續煉制嗎?')
+            } else {
+                $('.refining .refining_in p').html('確認選擇這些背包禮物進行煉制嗎？')
+            }
             $('.refining').show();
         }
     } else {
@@ -160,7 +169,7 @@ $('.header .but').click(function () {
     }
 })
 //公告欄
-function guangGao() {
+function guangGao () {
     clearInterval(timeInterval);
     timeInterval = setInterval(function () {
         $('.header .notice ul').animate({
@@ -173,12 +182,12 @@ function guangGao() {
     }, 2000);
 }
 // 輪播
-function noticeFun() {
+function noticeFun () {
     showLoading();
     networkRequest({
         type: 'GET',
         url: urlPrefix + '/gift/compound/record/top',
-        success(res) {
+        success (res) {
             if (res.code === 200) {
                 var str = ``;
                 res.data.forEach(res => {
@@ -193,18 +202,18 @@ function noticeFun() {
             }
             hideLoading(layerIndex);
         },
-        error(err) {
+        error (err) {
             toastMsg('網絡錯誤，請退出重進');
         }
     })
 }
 // 合成禮物列錶
-function getDataFun() {
+function getDataFun () {
     showLoading();
     networkRequest({
         type: 'GET',
         url: urlPrefix + '/gift/compound/giftList',
-        success(res) {
+        success (res) {
             if (res.code === 200) {
                 getDataArr = res.data;
                 getDataArr.forEach((res, index) => {
@@ -217,18 +226,18 @@ function getDataFun() {
             }
             hideLoading(layerIndex);
         },
-        error(err) {
+        error (err) {
             toastMsg('網絡錯誤，請退出重進');
         }
     })
 }
 // 限時合成禮物列錶
-function getXsDataFun() {
+function getXsDataFun () {
     showLoading();
     networkRequest({
         type: 'GET',
         url: urlPrefix + '/gift/compound/limit/giftList',
-        success(res) {
+        success (res) {
             if (res.code === 200) {
                 if (tabIndex == 1) {
                     console.log('渲染限時合成禮物');
@@ -241,32 +250,31 @@ function getXsDataFun() {
                 }
                 xsOpen = true;
                 $(".header .tab_wrap").show();
-            } else if(res.code === 26001){
+            } else if (res.code === 26001) {
                 xsOpen = false;
                 $(".header .tab_wrap").hide();
-            }else if(res.code === 26002){
+            } else if (res.code === 26002) {
                 $(".header .tab_wrap").show();
                 xsOpen = false;
-            }else {
+            } else {
                 toastMsg(res.message);
                 // console.log(res);
             }
             hideLoading(layerIndex);
         },
-        error(err) {
+        error (err) {
             toastMsg('網絡錯誤，請退出重進');
         }
     })
 }
 // 初始化渲染合成禮物
-function dataRendering(getDataArrIndex) {
+function dataRendering (getDataArrIndex) {
     // console.log('getDataArrIndex',getDataArr);
     $('.header .qipao img').attr('src', getDataArr[getDataArrIndex].giftUrl);
     $('.header .qipao img').attr('RewardId', getDataArr[getDataArrIndex].compoundRewardId);
     $('.header .qipao img').attr('giftId', getDataArr[getDataArrIndex].giftId);
     $('.header .qipao p').html(`<span>${getDataArr[getDataArrIndex].giftName}</span>（${getDataArr[getDataArrIndex].goldPrice}鉆）`);
-    $('.speed_rogress .speed_rogress_top p').html(`<span>${getDataArr[0].fraction}</span>/${getDataArr[getDataArrIndex].expendValue}`);
+    $('.speed_rogress .speed_rogress_top p').html(`<span class='span'>${getDataArr[0].fraction}</span>/${getDataArr[getDataArrIndex].expendValue}`);
-    // console.log(Number($('.speed_rogress .speed_rogress_top p span').text()) / getDataArr[getDataArrIndex].goldPrice * 100)
     let percent = Number($('.speed_rogress .speed_rogress_top p span').text()) / getDataArr[getDataArrIndex].expendValue * 100
     if (percent > 100) {
         $('.speed_rogress .speed_rogress_top .bar_wrap .line').css({ 'width': '100%' })
@@ -334,29 +342,16 @@ $('.header .right_but').click(function () {
     }
 })
 // 獲取背包禮物
-function listUserBackpackFun() {
+function listUserBackpackFun () {
     showLoading();
     networkRequest({
         type: 'GET',
         url: urlPrefix + '/backpack/listUserBackpack',
         data: { uid: pubInfo.uid },
-        success(res) {
+        success (res) {
             if (res.code === 200) {
                 if (res.data.length == 0) {
-                    // $('.bottom .b_Top').after(`
-                    //     <div class="swiper">
-                    //         <div class="swiper-wrapper">
-                    //             <div class="not">
-                    //                 <div>
-                    //                     <p>當前暫無多余背包禮物，</p>
-                    //                     <p>無法煉制合成禮物哦~</p>
-                    //                 </div>
-                    //             </div>
-                    //         </div>
-                    //     </div>
-                    // `);
                     $('.bottom .swiper .not').show();
-                    // $('.bottom .swiper .swiper-slide').hide();
                 } else {
                     // 為了解決tab切換時swiper插件重復初始化導致分頁原點錯亂問題，每次都重新創建swiper的盒子
                     $('.bottom .swiper').remove();
@@ -408,7 +403,7 @@ function listUserBackpackFun() {
                     // 點擊背包禮物列錶
                     $('.bottom .swiper .swiper-slide div').click(function () {
                         // 防止合成時點擊繼續添加
-                        if(headerBut){
+                        if (headerBut) {
                             // console.log('防止合成時點擊繼續添加');
                             $(this).parent().siblings().children().removeClass('div_active');
                             $(this).addClass('div_active').siblings().removeClass('div_active');
@@ -418,7 +413,6 @@ function listUserBackpackFun() {
                             $('.investment .investment_in .num input').val(objs[Number($('.bottom .swiper .swiper-slide .div_active').attr('giftid'))].num);
                             var srcs = $('.bottom .swiper .swiper-slide .div_active img').attr('src');
                             $('.investment .investment_in .qipao img').attr("src", srcs);
-                            // $('.bottom .swiper .swiper-slide div strong i')
                             $(this).children('strong').children('i').text(objs[Number($(this).attr('giftid'))].num);
                             $('.investment').show();
                             size1 = Number($('.investment .investment_in .num input').val());
@@ -432,19 +426,19 @@ function listUserBackpackFun() {
             }
             hideLoading(layerIndex);
         },
-        error(err) {
+        error (err) {
             toastMsg('網絡錯誤，請退出重進');
         }
     })
 }
 //合成記錄
-function recordFun(pageNum) {
+function recordFun (pageNum) {
     showLoading();
     networkRequest({
         type: 'GET',
         url: urlPrefix + '/gift/compound/record',
         data: { pageNum, pageSize: 10 },
-        success(res) {
+        success (res) {
             if (res.code === 200) {
                 if (res.data.length == 0 && pageNum == 1) {
                     $('.record').hide();
@@ -487,7 +481,7 @@ function recordFun(pageNum) {
             }
             hideLoading(layerIndex);
         },
-        error(err) {
+        error (err) {
             isLock = true;
             toastMsg('網絡錯誤，請退出重進');
         }
@@ -496,7 +490,7 @@ function recordFun(pageNum) {
 var isJL = false;
 // 確認投入按鈕
 $('.investment .investment_in .but').click(function () {
-    // $('.bottom .swiper .swiper-slide .div_active strong').show();
+    var valArr = $('.speed_rogress .speed_rogress_top p').text().match(/\d+(\.\d+)?/g);
     var giftIds = $('.bottom .swiper .swiper-slide .div_active').attr('giftId');
     var val = $('.investment .investment_in .num input').val();
     objs[Number($('.bottom .swiper .swiper-slide .div_active').attr('giftid'))].num = val;
@@ -504,19 +498,11 @@ $('.investment .investment_in .but').click(function () {
     var goldprice = Number($('.bottom .swiper .swiper-slide .div_active').attr(`goldprice`))
     compoundParam.compoundList.push({ giftId: Number(giftIds), num: giftNum })
     size2 = Number($('.investment .investment_in .num input').val());
-    console.log('isJL', isJL);
-    console.log('size1', size1);
-    console.log('size2', size2);
 
 
     if (isJL) {
         if (size1 < size2) {
             console.log('增加了');
-            //++
-            // if ($('.speed_rogress .speed_rogress_top p span').text() == 0) {
-            // Number($('.speed_rogress .speed_rogress_top p span').text())
-            // getDataArr[0].fraction = Number($('.bottom .swiper .swiper-slide .div_active').attr(`ad`)) + goldprice * val;
-            // }
             var goldprice = Number($('.bottom .swiper .swiper-slide .div_active').attr(`goldprice`));
             var num = $('.bottom .swiper .swiper-slide .div_active').attr(`num`);
             getDataArr[0].fraction = Number($('.bottom .swiper .swiper-slide .div_active').attr(`ad`)) + goldprice * (val - num);
@@ -526,27 +512,47 @@ $('.investment .investment_in .but').click(function () {
         } else {
             console.log('減少了');
             //--
-            // getDataArr[0].fraction = Number($('.speed_rogress .speed_rogress_top p span').text()) - ($('.bottom .swiper .swiper-slide .div_active strong i').text() - val) * goldprice;
             var goldprice = Number($('.bottom .swiper .swiper-slide .div_active').attr(`goldprice`));
             var num = $('.bottom .swiper .swiper-slide .div_active').attr(`num`);
             getDataArr[0].fraction = Number($('.bottom .swiper .swiper-slide .div_active').attr(`ad`)) + goldprice * (val - num);
         }
         $('.bottom .swiper .swiper-slide .div_active strong i').text(val)
     }
-    // else {
-    //     if (isAdd) {
-    //         // getDataArr[0].fraction = Number($('.speed_rogress .speed_rogress_top p span').text()) + goldprice;
-    //         getDataArr[0].fraction = Number($('.speed_rogress .speed_rogress_top p span').text()) + goldprice * val;
-    //     } else {
-    //         // getDataArr[0].fraction = Number($('.speed_rogress .speed_rogress_top p span').text()) - goldprice;
-    //         getDataArr[0].fraction = Number($('.speed_rogress .speed_rogress_top p span').text()) - ($('.bottom .swiper .swiper-slide .div_active strong i').text() - val) * goldprice;
-    //     }
-    // }
-    $('.bottom .swiper .swiper-slide div').removeClass('div_active');
-    $('.investment').hide();
     dataRendering(getDataArrIndex);
     lastNum = $('.speed_rogress .speed_rogress_top p span').text();
     isJL = false;
+
+    console.log($('.bottom .swiper .swiper-slide .div_active').index());
+    if (giftNum > 0) {
+        $('.bottom .swiper .swiper-slide .div_active strong i').addClass('iAct');
+        $('.bottom .swiper .swiper-slide .div_active').addClass('div_active1');
+
+    } else {
+        $('.bottom .swiper .swiper-slide .div_active strong i').removeClass('iAct');
+        $('.bottom .swiper .swiper-slide .div_active').removeClass('div_active1');
+    }
+    if (Number(lastNum) > Number(valArr[1])) {
+        $('.speed_rogress .speed_rogress_top p .span').addClass('spanAct');
+    } else {
+        $('.speed_rogress .speed_rogress_top p .span').removeClass('spanAct');
+    }
+    if (Number(lastNum) - Number(valArr[1]) > 1000) {
+        $('.investment2').show();
+    } else {
+        $('.investment').hide();
+        $('.bottom .swiper .swiper-slide div').removeClass('div_active');
+    }
+})
+// 取消提醒超出弹窗
+$('.investment2 .investment_in .close').click(function () {
+    // $('.investment2').show();
+    $('.investment2').hide();
+})
+// 确认提醒超出弹窗
+$('.investment2 .investment_in .ok').click(function () {
+    $('.bottom .swiper .swiper-slide div').removeClass('div_active');
+    $('.investment2').hide();
+    $('.investment').hide();
 })
 // 關閉投入
 $('.investment .investment_in .closeBut').click(function () {
@@ -562,7 +568,6 @@ $('.investment .investment_in .closeBut').click(function () {
     $('.investment .investment_in .num input').val(val);
     $('.bottom .swiper .swiper-slide .div_active strong i').text(val);
     dataRendering(getDataArrIndex);
-    // $('.bottom .swiper .swiper-slide div strong').hide();
     $('.investment').hide();
 })
 
@@ -577,40 +582,17 @@ $(".investment .investment_in .num input").on("input", function () {
     var val = $(this).val();
     var goldprice = Number($('.bottom .swiper .swiper-slide .div_active').attr(`goldprice`));
     var num = $('.speed_rogress .speed_rogress_top p span').text();
-
-    // $('.bottom .swiper .swiper-slide .div_active strong i').text(val);
     if (val > Number($('.bottom .swiper .swiper-slide .div_active strong b').text())) {
         val = 0;
         $(this).val(0);
-        toastMsg('超出已擁有數量');
+        toastMsg('背包庫存數量不足');
         getDataArr[0].fraction = lastNum;
-        // $('.bottom .swiper .swiper-slide .div_active strong i').text("0");
     } else if (val == '') {
         val = 0;
         $(this).val(0);
         getDataArr[0].fraction = lastNum;
-        // $('.bottom .swiper .swiper-slide .div_active strong i').text(0);
     }
-
-    // if (Number($('.speed_rogress .speed_rogress_top p span').text()) == 0 || Number($('.investment .investment_in .num input').val()) == 0) {
-    //     if (Number($('.speed_rogress .speed_rogress_top p span').text()) == 0) {
-    //         getDataArr[0].fraction = 123123123;
-    //     } else {
-    //         getDataArr[0].fraction = num;
-    //     }
-    // } else {
-    //     getDataArr[0].fraction = $(this).val() * goldprice + Number($('.speed_rogress .speed_rogress_top p span').text());
-    // }
-    // if ($('.speed_rogress .speed_rogress_top p span').text() == 0) {
-    //     getDataArr[0].fraction = $(this).val() * goldprice + Number($('.speed_rogress .speed_rogress_top p span').text());
-    // } else if ($('.speed_rogress .speed_rogress_top p span').text() != 0) {
-    //     getDataArr[0].fraction = Number($('.speed_rogress .speed_rogress_top p span').text()) + Number($(this).val())
-    // }
-    // if ($('.bottom .swiper .swiper-slide div strong i').text() == 00) {
-    //     $('.bottom .swiper .swiper-slide div strong i').text(0)
-    // }
     $(this).val(val);
-    // dataRendering(getDataArrIndex);
 })
 // 增加煉制按鈕
 var number = 0;
@@ -630,23 +612,11 @@ $('.investment .investment_in .num .add').click(function (event) {
     console.log(indes);
     arrs[indes].goldprice = goldprice;
     if (val > num) {
-        toastMsg('已超出現有數量');
+        toastMsg('背包庫存數量不足');
         val = val - 1;
         $('.bottom .swiper .swiper-slide .div_active').attr(`nums`, val);
         arrs[indes].num = Number($('.bottom .swiper .swiper-slide .div_active').attr('nums'));
-    } else {//Number($('.speed_rogress .speed_rogress_top p span').text())
+    } else {
-        // getDataArr[0].fraction = Number($('.bottom .swiper .swiper-slide .div_active').attr(`ad`)) + goldprice * val;
-        // $('.bottom .swiper .swiper-slide .div_active').attr(`ad`, getDataArr[0].fraction);
-        // $('.bottom .swiper .swiper-slide .div_active').attr(`nums`, val);
-        // arrs[indes].num = Number($('.bottom .swiper .swiper-slide .div_active').attr('nums'));
-        // // if (isAdd) {
-        // arrs.forEach((res, index) => {
-        //     number += res.num * res.goldprice;
-        // })
-        // getDataArr[0].fraction = number;
-        // console.log(arrs);
-        // console.log(number);
-        // }
         var goldprice = Number($('.bottom .swiper .swiper-slide .div_active').attr(`goldprice`));
         var num = $('.bottom .swiper .swiper-slide .div_active').attr(`num`);
         getDataArr[0].fraction = Number($('.bottom .swiper .swiper-slide .div_active').attr(`ad`)) + goldprice * (val - num);
@@ -669,7 +639,6 @@ $('.investment .investment_in .num .reduce').click(function (event) {
     } else {
         var giftNum = objs[Number($('.bottom .swiper .swiper-slide .div_active').attr('giftid'))].num;
         var goldprice = Number($('.bottom .swiper .swiper-slide .div_active').attr(`goldprice`));
-        //Number($('.speed_rogress .speed_rogress_top p span').text())
         var num = $('.bottom .swiper .swiper-slide .div_active').attr(`num`);
         //
         console.log(Number($('.bottom .swiper .swiper-slide .div_active').attr(`ad`)));
@@ -678,7 +647,6 @@ $('.investment .investment_in .num .reduce').click(function (event) {
         console.log(goldprice * (val - num));
 
         getDataArr[0].fraction = Number($('.bottom .swiper .swiper-slide .div_active').attr(`ad`)) + goldprice * (val - num);
-        // $('.bottom .swiper .swiper-slide .div_active').attr(`ad`, getDataArr[0].fraction);
     }
     $('.bottom .swiper .swiper-slide .div_active').attr(`nums`, val);
     // dataRendering(getDataArrIndex)
@@ -701,9 +669,9 @@ $('.refining .refining_in div .ok').click(function () {
         }
     })
     // console.log('arr22222',arr2);
-    arr2.map((item,index)=>{
+    arr2.map((item, index) => {
-        if(item.num !=''){
+        if (item.num != '') {
-            if(parseInt(item.num) != 0){
+            if (parseInt(item.num) != 0) {
                 // console.log(item,index);
                 arr3.push(item)
             }
@@ -715,7 +683,7 @@ $('.refining .refining_in div .ok').click(function () {
     setTimeout(() => {
         $('.header .luzi').css({ "background": "none" });
     }, 120);
-    console.log('compoundParam',compoundParam);
+    console.log('compoundParam', compoundParam);
     $('.refining').hide();
     if (tabIndex == 0) {
         svgaFun();
@@ -730,13 +698,13 @@ $('.refining .refining_in div .ok').click(function () {
             contentType: 'application/json;charset=UTF-8',
             url: urlPrefix + '/gift/compound',
             data: JSON.stringify(compoundParam),
-            success(res) {
+            success (res) {
                 if (res.code === 200) {
                     $('.speed_rogress .speed_rogress_top p span').text(0)
                     $('.investment .investment_in .num input').val(0)
 
                     if (tabIndex == 0) {
-                        $('.gxn .gxn_in .qb img').attr('src',res.data.picUrl);
+                        $('.gxn .gxn_in .qb img').attr('src', res.data.picUrl);
                         $('.gxn .gxn_in p b').text(res.data.giftName);
                         changeTab(0)
                         noticeFun();
@@ -773,7 +741,7 @@ $('.refining .refining_in div .ok').click(function () {
                 }
                 hideLoading(layerIndex);
             },
-            error(err) {
+            error (err) {
                 toastMsg('網絡錯誤，請退出重進');
             }
         })
@@ -851,14 +819,18 @@ $('.bottom .b_Top img').click(function () {
     $('.bottom .swiper .swiper-slide').remove();
     $('.investment .investment_in .num input').val(0)
     $('.investment').hide();
+    $('.speed_rogress .speed_rogress_top .spanAct').removeClass('spanAct')
+    listUserBackpackFun();
+    changeTab(tabIndex)
+    noticeFun();
+    getXsDataFun();
+    getDataFun();
     listUserBackpackFun();
-
-
 })
 
 // tab切換
 var tabIndex = 0;
-function changeTab(tabIndex) {
+function changeTab (tabIndex) {
     if (tabIndex == 0) {
         $("body").css('background', '#462978');
         $('.tab_wrap .tab_item').eq(0).find('img').attr('src', "./images/pt_tab_active.png");
@@ -965,7 +937,7 @@ $('.tab_wrap .tab_item').click(function () {
 })
 
 // 用戶首次進入限時爐引導
-function firstEnterFun() {
+function firstEnterFun () {
     $('.step_wrap .step1').show();
     $('.guide_mask').show();
 }

view/peko/common/js/common2.js

@@ -563,6 +563,9 @@ function getInfoFromClient () {
 fontConvert(true);//调用字体转换函数
 // }, 1000)
 function fontConvert (fontConvertBool) {
+    if (window.location.pathname.match(/identity/)) {
+        return false;
+    }
     function SconvertT () {//简体转换繁体
         document.head.innerHTML = s2t(document.head.innerHTML);
         document.body.innerHTML = s2t(document.body.innerHTML);
@@ -778,7 +781,7 @@ function networkRequest (reqObj = {}, type) {
     if (browser.app) {
         pubHeader.pub_ticket = pubInfo.ticket
     } else {
-        pubHeader.h5_token =sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
+        pubHeader.h5_token = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
     }
     const url = reqObj.url;
     const commParams = objToParam(pubHeader);

view/peko/modules/h5Income/chainBank.html

@@ -9,7 +9,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <title>賬戶資料</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/chainBank.css">
+    <link rel="stylesheet" href="./css/chainBank.css?v=1.2">
 </head>
 
 <body>
@@ -60,7 +60,7 @@
                     style="opacity: 0;">
             </div>
             <!-- 反面 -->
-            <div class="f">
+            <div class="f"> 
                 <img src="./images/chainBank/documents_reverse.png" alt="" class="documents">
                 <img src="./images/chainBank/icon_camera.png" alt="" class="icon_camera">
                 <span>請上傳反面照片</span>
@@ -82,6 +82,14 @@
         <p>6.首次進行提領流程時，會需要上傳您的身份證相關信息；</p>
         <p>7.如有疑問請聯繫Wechat:sd245376</p>
     </div>
+    <!-- 二次确认修改大陆银行卡信息按钮 -->
+    <div class="mainlandInfo">
+        <div class="mainlandInfo_in">
+            <p>确认提交账户信息?</p>
+            <div class="close">取消</div>
+            <div class="ok">确认</div>
+        </div>
+    </div>
 </body>
 
 </html>
@@ -93,4 +101,4 @@
 <script src="../../common/js/route-constant.js"></script>
 <script src="../../common/js/svga.min.js"></script>
 <script src="./js/qiniu.min.js"></script>
-<script src="./js/chainBank.js?v=1.0"></script>
+<script src="./js/chainBank.js?v=1.5"></script>

view/peko/modules/h5Income/css/chainBank.css

@@ -7,16 +7,16 @@ body {
 .back {
   position: fixed;
   z-index: 9;
-  width: 0.7466666667rem;
+  width: 0.74667rem;
-  height: 0.7466666667rem;
+  height: 0.74667rem;
-  left: 0.5333333333rem;
+  left: 0.53333rem;
   top: 0.2rem;
 }
 
 h3 {
   width: 100%;
-  margin-top: 0.5333333333rem;
+  margin-top: 0.53333rem;
-  margin-bottom: 0.4266666667rem;
+  margin-bottom: 0.42667rem;
   text-align: center;
   color: #1F1B4F;
   font-size: 0.48rem;
@@ -28,123 +28,136 @@ input {
   border: none;
   outline: none;
   box-sizing: border-box;
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
 }
+
 input::placeholder {
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
   color: #8A8CAB;
 }
 
 .box1 {
-  width: 9.1466666667rem;
+  width: 9.14667rem;
-  height: 2.7733333333rem;
+  height: 2.77333rem;
   background: #fff;
-  border-radius: 0.2666666667rem;
+  border-radius: 0.26667rem;
   box-sizing: border-box;
-  padding: 0 0.5333333333rem;
+  padding: 0 0.53333rem;
   margin: 0 auto 0.32rem;
   overflow: hidden;
 }
+
 .box1 div {
   width: 100%;
-  height: 1.3733333333rem;
+  height: 1.37333rem;
-  line-height: 1.3733333333rem;
+  line-height: 1.37333rem;
-  border-bottom: 0.0133333333rem solid #EBEEF5;
+  border-bottom: 0.01333rem solid #EBEEF5;
   display: flex;
 }
+
 .box1 div span {
   flex: 3;
   height: 100%;
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
   color: #1F1B4F;
 }
+
 .box1 div input {
   flex: 7;
   height: 100%;
   text-align: right;
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
   color: #1F1B4F;
 }
 
 .box2 {
-  width: 9.1466666667rem;
+  width: 9.14667rem;
-  height: 5.5466666667rem;
+  height: 5.54667rem;
   background: #fff;
-  border-radius: 0.2666666667rem;
+  border-radius: 0.26667rem;
   box-sizing: border-box;
-  padding: 0 0.5333333333rem;
+  padding: 0 0.53333rem;
   margin: 0 auto 0.32rem;
   overflow: hidden;
 }
+
 .box2 div {
   width: 100%;
-  height: 1.3733333333rem;
+  height: 1.37333rem;
-  line-height: 1.3733333333rem;
+  line-height: 1.37333rem;
-  border-bottom: 0.0133333333rem solid #EBEEF5;
+  border-bottom: 0.01333rem solid #EBEEF5;
   display: flex;
 }
+
 .box2 div span {
   flex: 3;
   height: 100%;
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
   color: #1F1B4F;
 }
+
 .box2 div input {
   flex: 7;
   height: 100%;
   text-align: right;
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
   color: #1F1B4F;
 }
 
 .box3 {
-  width: 9.1466666667rem;
+  width: 9.14667rem;
-  height: 5.5466666667rem;
+  height: 5.54667rem;
   background: #fff;
-  border-radius: 0.2666666667rem;
+  border-radius: 0.26667rem;
   box-sizing: border-box;
-  padding: 0 0.5333333333rem;
+  padding: 0 0.53333rem;
-  margin: 0 auto 0.5333333333rem;
+  margin: 0 auto 0.53333rem;
   overflow: hidden;
 }
+
 .box3 p {
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
   color: #1F1B4F;
-  margin-top: 0.4266666667rem;
+  margin-top: 0.42667rem;
 }
+
 .box3 .idBox {
   width: 100%;
   display: flex;
   justify-content: space-between;
-  margin-top: 0.4266666667rem;
+  margin-top: 0.42667rem;
 }
+
 .box3 .idBox .z,
 .box3 .idBox .f {
   width: 3.84rem;
-  height: 3.1466666667rem;
+  height: 3.14667rem;
   background: #F3F5FA;
-  border-radius: 0.2666666667rem;
+  border-radius: 0.26667rem;
   position: relative;
 }
+
 .box3 .idBox .z .documents,
 .box3 .idBox .f .documents {
   position: absolute;
-  width: 3.0933333333rem;
+  width: 3.09333rem;
   height: 1.92rem;
   left: 50%;
   transform: translateX(-50%);
-  top: 0.3733333333rem;
+  top: 0.37333rem;
 }
+
 .box3 .idBox .z .icon_camera,
 .box3 .idBox .f .icon_camera {
   position: absolute;
-  width: 1.0666666667rem;
+  width: 1.06667rem;
-  height: 1.0666666667rem;
+  height: 1.06667rem;
   left: 50%;
   top: 0.8rem;
   transform: translateX(-50%);
   z-index: 2;
 }
+
 .box3 .idBox .z span,
 .box3 .idBox .f span {
   position: absolute;
@@ -156,14 +169,15 @@ input::placeholder {
   width: 100%;
   text-align: center;
 }
+
 .box3 .idBox .z .upload,
 .box3 .idBox .f .upload {
   position: absolute;
-  width: 3.0933333333rem;
+  width: 3.09333rem;
   height: 1.92rem;
   left: 50%;
   transform: translateX(-50%);
-  top: 0.3733333333rem;
+  top: 0.37333rem;
   z-index: 2;
 }
 
@@ -174,7 +188,7 @@ input::placeholder {
   border-radius: 1.28rem;
   margin: 0 auto 0.64rem;
   text-align: center;
-  font-size: 0.4266666667rem;
+  font-size: 0.42667rem;
   color: #FFFFFF;
   background: linear-gradient(90deg, #EEDCFF 0%, #DEE4FF 50%, #CCF8F9 100%);
 }
@@ -185,13 +199,76 @@ input::placeholder {
 
 .rule {
   width: 8.72rem;
-  margin: 0 auto 0.6666666667rem;
+  margin: 0 auto 0.66667rem;
   color: #8A8CAB;
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
 }
+
 .rule p {
-  margin-bottom: 0.1333333333rem;
+  margin-bottom: 0.13333rem;
   line-height: 0.45rem;
 }
 
-/*# sourceMappingURL=chainBank.css.map */
+.mainlandInfo {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 99;
+  background: rgba(0, 0, 0, 0.6);
+  display: none;
+}
+
+.mainlandInfo .mainlandInfo_in {
+  width: 8.50667rem;
+  height: 4.96rem;
+  border-radius: 0.53333rem;
+  background: #fff;
+  box-sizing: border-box;
+  padding-top: 1.6rem;
+  position: relative;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.mainlandInfo .mainlandInfo_in p {
+  width: 100%;
+  text-align: center;
+  color: #1F1B4F;
+  font-size: 0.37333rem;
+  margin-bottom: 0.32rem;
+}
+
+.mainlandInfo .mainlandInfo_in p b {
+  font-weight: bold;
+}
+
+.mainlandInfo .mainlandInfo_in p span {
+  color: #9168FA;
+  font-size: 0.42667rem;
+}
+
+.mainlandInfo .mainlandInfo_in .close,
+.mainlandInfo .mainlandInfo_in .ok {
+  position: absolute;
+  width: 3.30667rem;
+  height: 1.17333rem;
+  line-height: 1.17333rem;
+  border-radius: 1.17333rem;
+  color: #fff;
+  font-size: 0.42667rem;
+  top: 3.14667rem;
+  text-align: center;
+}
+
+.mainlandInfo .mainlandInfo_in .close {
+  background: #E6E6F0;
+  left: 0.74667rem;
+}
+
+.mainlandInfo .mainlandInfo_in .ok {
+  left: 4.45333rem;
+  background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
+}

view/peko/modules/h5Income/css/chainBank.scss

@@ -1,5 +1,5 @@
-@function px2rem($px, $rem:75) {
+@function px2rem($px) {
-    @return $px / $rem+rem;
+    @return $px / 75+rem;
 }
 
 html,
@@ -11,20 +11,20 @@ body {
 .back {
     position: fixed;
     z-index: 9;
-    width: px2rem(56, );
+    width: px2rem(56);
-    height: px2rem(56, );
+    height: px2rem(56);
-    left: px2rem(40, );
+    left: px2rem(40);
     top: 0.2rem;
     // display: none;
 }
 
 h3 {
     width: 100%;
-    margin-top: px2rem(40, );
+    margin-top: px2rem(40);
-    margin-bottom: px2rem(32, );
+    margin-bottom: px2rem(32);
     text-align: center;
     color: #1F1B4F;
-    font-size: px2rem(36, );
+    font-size: px2rem(36);
     font-weight: bold;
 }
 
@@ -33,35 +33,35 @@ input {
     border: none;
     outline: none;
     box-sizing: border-box;
-    font-size: px2rem(28, );
+    font-size: px2rem(28);
 
     &::placeholder {
-        font-size: px2rem(28, );
+        font-size: px2rem(28);
         color: #8A8CAB;
     }
 }
 
 .box1 {
-    width: px2rem(686, );
+    width: px2rem(686);
-    height: px2rem(208, );
+    height: px2rem(208);
     background: #fff;
-    border-radius: px2rem(20, );
+    border-radius: px2rem(20);
     box-sizing: border-box;
-    padding: 0 px2rem(40, );
+    padding: 0 px2rem(40);
-    margin: 0 auto px2rem(24, );
+    margin: 0 auto px2rem(24);
     overflow: hidden;
 
     div {
         width: 100%;
-        height: px2rem(103, );
+        height: px2rem(103);
-        line-height: px2rem(103, );
+        line-height: px2rem(103);
-        border-bottom: px2rem(1, ) solid #EBEEF5;
+        border-bottom: px2rem(1) solid #EBEEF5;
         display: flex;
 
         span {
             flex: 3;
             height: 100%;
-            font-size: px2rem(28, );
+            font-size: px2rem(28);
             color: #1F1B4F;
         }
 
@@ -69,33 +69,33 @@ input {
             flex: 7;
             height: 100%;
             text-align: right;
-            font-size: px2rem(28, );
+            font-size: px2rem(28);
             color: #1F1B4F;
         }
     }
 }
 
 .box2 {
-    width: px2rem(686, );
+    width: px2rem(686);
-    height: px2rem(416, );
+    height: px2rem(416);
     background: #fff;
-    border-radius: px2rem(20, );
+    border-radius: px2rem(20);
     box-sizing: border-box;
-    padding: 0 px2rem(40, );
+    padding: 0 px2rem(40);
-    margin: 0 auto px2rem(24, );
+    margin: 0 auto px2rem(24);
     overflow: hidden;
 
     div {
         width: 100%;
-        height: px2rem(103, );
+        height: px2rem(103);
-        line-height: px2rem(103, );
+        line-height: px2rem(103);
-        border-bottom: px2rem(1, ) solid #EBEEF5;
+        border-bottom: px2rem(1) solid #EBEEF5;
         display: flex;
 
         span {
             flex: 3;
             height: 100%;
-            font-size: px2rem(28, );
+            font-size: px2rem(28);
             color: #1F1B4F;
         }
 
@@ -103,57 +103,57 @@ input {
             flex: 7;
             height: 100%;
             text-align: right;
-            font-size: px2rem(28, );
+            font-size: px2rem(28);
             color: #1F1B4F;
         }
     }
 }
 
 .box3 {
-    width: px2rem(686, );
+    width: px2rem(686);
-    height: px2rem(416, );
+    height: px2rem(416);
     background: #fff;
-    border-radius: px2rem(20, );
+    border-radius: px2rem(20);
     box-sizing: border-box;
-    padding: 0 px2rem(40, );
+    padding: 0 px2rem(40);
-    margin: 0 auto px2rem(40, );
+    margin: 0 auto px2rem(40);
     overflow: hidden;
 
     p {
-        font-size: px2rem(28, );
+        font-size: px2rem(28);
         color: #1F1B4F;
-        margin-top: px2rem(32, );
+        margin-top: px2rem(32);
     }
 
     .idBox {
         width: 100%;
         display: flex;
         justify-content: space-between;
-        margin-top: px2rem(32, );
+        margin-top: px2rem(32);
 
         .z,
         .f {
-            width: px2rem(288, );
+            width: px2rem(288);
-            height: px2rem(236, );
+            height: px2rem(236);
             background: #F3F5FA;
-            border-radius: px2rem(20, );
+            border-radius: px2rem(20);
             position: relative;
 
             .documents {
                 position: absolute;
-                width: px2rem(232, );
+                width: px2rem(232);
-                height: px2rem(144, );
+                height: px2rem(144);
                 left: 50%;
                 transform: translateX(-50%);
-                top: px2rem(28, );
+                top: px2rem(28);
             }
 
             .icon_camera {
                 position: absolute;
-                width: px2rem(80, );
+                width: px2rem(80);
-                height: px2rem(80, );
+                height: px2rem(80);
                 left: 50%;
-                top: px2rem(60, );
+                top: px2rem(60);
                 transform: translateX(-50%);
                 z-index: 2;
             }
@@ -161,9 +161,9 @@ input {
             span {
                 position: absolute;
                 color: #8A8CAB;
-                font-size: px2rem(24, );
+                font-size: px2rem(24);
                 left: 50%;
-                top: px2rem(180, );
+                top: px2rem(180);
                 transform: translateX(-50%);
                 width: 100%;
                 text-align: center;
@@ -171,11 +171,11 @@ input {
 
             .upload {
                 position: absolute;
-                width: px2rem(232, );
+                width: px2rem(232);
-                height: px2rem(144, );
+                height: px2rem(144);
                 left: 50%;
                 transform: translateX(-50%);
-                top: px2rem(28, );
+                top: px2rem(28);
                 z-index: 2;
             }
         }
@@ -183,28 +183,93 @@ input {
 }
 
 .but {
-    width: px2rem(606, );
+    width: px2rem(606);
-    height: px2rem(96, );
+    height: px2rem(96);
-    line-height: px2rem(96, );
+    line-height: px2rem(96);
-    border-radius: px2rem(96, );
+    border-radius: px2rem(96);
-    margin: 0 auto px2rem(48, );
+    margin: 0 auto px2rem(48);
     text-align: center;
-    font-size: px2rem(32, );
+    font-size: px2rem(32);
     color: #FFFFFF;
     background: linear-gradient(90deg, #EEDCFF 0%, #DEE4FF 50%, #CCF8F9 100%);
 }
-.active{
+
+.active {
     background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
 }
 
 .rule {
-    width: px2rem(654, );
+    width: px2rem(654);
-    margin: 0 auto px2rem(50, );
+    margin: 0 auto px2rem(50);
     color: #8A8CAB;
-    font-size: px2rem(28, );
+    font-size: px2rem(28);
 
     p {
-        margin-bottom: px2rem(10, );
+        margin-bottom: px2rem(10);
         line-height: 0.45rem;
     }
+}
+
+.mainlandInfo {
+    position: fixed; 
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 99;
+    background: rgba(0, 0, 0, .6);
+    display: none;
+
+    .mainlandInfo_in {
+        width: px2rem(638);
+        height: px2rem(372);
+        border-radius: px2rem(40);
+        background: #fff;
+        box-sizing: border-box;
+        padding-top: 1.6rem;
+        position: relative;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+
+        p {
+            width: 100%;
+            text-align: center;
+            color: #1F1B4F;
+            font-size: px2rem(28);
+            margin-bottom: px2rem(24);
+
+            b {
+                font-weight: bold;
+            }
+
+            span {
+                color: #9168FA;
+                font-size: px2rem(32);
+            }
+        }
+
+        .close,
+        .ok {
+            position: absolute;
+            width: px2rem(248);
+            height: px2rem(88);
+            line-height: px2rem(88);
+            border-radius: px2rem(88);
+            color: #fff;
+            font-size: px2rem(32);
+            top: px2rem(236);
+            text-align: center;
+        }
+
+        .close {
+            background: #E6E6F0;
+            left: px2rem(56);
+        }
+
+        .ok {
+            left: px2rem(334);
+            background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
+        }
+    }
 }

view/peko/modules/h5Income/css/withdrawal.css

@@ -158,6 +158,56 @@ body {
   font-weight: bold;
 }
 
+.authentication {
+  width: 9.14667rem;
+  height: 1.6rem;
+  line-height: 1.6rem;
+  background: #fff;
+  border-radius: 0.26667rem;
+  margin: 0 auto 0.42667rem;
+  position: relative;
+}
+
+.authentication .icon_authentication {
+  position: absolute;
+  left: 0.53333rem;
+  top: 0.53333rem;
+  width: 0.53333rem;
+  height: 0.53333rem;
+}
+
+.authentication .arrow_right {
+  position: absolute;
+  right: 0.53333rem;
+  top: 0.53333rem;
+  width: 0.53333rem;
+  height: 0.53333rem;
+}
+
+.authentication div {
+  height: 100%;
+  color: #1F1B4F;
+  font-size: 0.42667rem;
+  font-weight: bold;
+  position: absolute;
+  top: 0;
+  left: 1.22667rem;
+}
+
+.authentication span {
+  height: 100%;
+  color: #B3B3C3;
+  font-size: 0.32rem;
+  position: absolute;
+  top: 0;
+  right: 1.06667rem;
+}
+
+.authentication .active {
+  color: #1F1B4F;
+  font-weight: bold;
+}
+
 .withdrawal {
   width: 9.14667rem;
   margin: 0 auto 0.53333rem;
@@ -296,6 +346,17 @@ body {
   height: 1.38667rem;
   line-height: 1.38667rem;
   border-bottom: 0.01333rem solid #EBEEF5;
+  position: relative;
+}
+
+.accountPub .accountPub_in ul li i {
+  font-style: normal;
+  color: #B3B3C3;
+  font-size: 0.32rem;
+  position: absolute;
+  right: 0.64rem;
+  top: 50%;
+  transform: translateY(-50%);
 }
 
 .accountPub .accountPub_in ul .active {
@@ -623,3 +684,66 @@ body {
   right: 0.74667rem;
   bottom: 0.64rem;
 }
+
+.mainlandInfo {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 99;
+  background: rgba(0, 0, 0, 0.6);
+  display: none;
+}
+
+.mainlandInfo .mainlandInfo_in {
+  width: 8.50667rem;
+  height: 4.96rem;
+  border-radius: 0.53333rem;
+  background: #fff;
+  box-sizing: border-box;
+  padding-top: 1.12rem;
+  position: relative;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.mainlandInfo .mainlandInfo_in p {
+  width: 100%;
+  text-align: center;
+  color: #1F1B4F;
+  font-size: 0.37333rem;
+  margin-bottom: 0.32rem;
+}
+
+.mainlandInfo .mainlandInfo_in p b {
+  font-weight: bold;
+}
+
+.mainlandInfo .mainlandInfo_in p span {
+  color: #9168FA;
+  font-size: 0.42667rem;
+}
+
+.mainlandInfo .mainlandInfo_in .close, .mainlandInfo .mainlandInfo_in .ok {
+  position: absolute;
+  width: 3.30667rem;
+  height: 1.17333rem;
+  line-height: 1.17333rem;
+  border-radius: 1.17333rem;
+  color: #fff;
+  font-size: 0.42667rem;
+  top: 3.14667rem;
+  text-align: center;
+}
+
+.mainlandInfo .mainlandInfo_in .close {
+  background: #E6E6F0;
+  left: 0.74667rem;
+}
+
+.mainlandInfo .mainlandInfo_in .ok {
+  left: 4.45333rem;
+  background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
+}

view/peko/modules/h5Income/css/withdrawal.scss

@@ -165,6 +165,56 @@ body {
     }
 }
 
+.authentication {
+    width: px2rem(686);
+    height: px2rem(120);
+    line-height: px2rem(120);
+    background: #fff;
+    border-radius: px2rem(20);
+    margin: 0 auto px2rem(32);
+    position: relative;
+
+    .icon_authentication {
+        position: absolute;
+        left: px2rem(40);
+        top: px2rem(40);
+        width: px2rem(40);
+        height: px2rem(40);
+    }
+
+    .arrow_right {
+        position: absolute;
+        right: px2rem(40);
+        top: px2rem(40);
+        width: px2rem(40);
+        height: px2rem(40);
+    }
+
+    div {
+        height: 100%;
+        color: #1F1B4F;
+        font-size: px2rem(32);
+        font-weight: bold;
+        position: absolute;
+        top: 0;
+        left: px2rem(92);
+    }
+
+    span {
+        height: 100%;
+        color: #B3B3C3;
+        font-size: px2rem(24);
+        position: absolute;
+        top: 0;
+        right: px2rem(80);
+    }
+
+    .active {
+        color: #1F1B4F;
+        font-weight: bold;
+    }
+}
+
 .withdrawal {
     width: px2rem(686);
     // height: px2rem(572);
@@ -302,6 +352,17 @@ body {
                 height: px2rem(104);
                 line-height: px2rem(104);
                 border-bottom: px2rem(1) solid #EBEEF5;
+                position: relative;
+
+                i {
+                    font-style: normal;
+                    color: #B3B3C3;
+                    font-size: px2rem(24);
+                    position: absolute;
+                    right: px2rem(48);
+                    top: 50%;
+                    transform: translateY(-50%);
+                }
             }
 
             .active {
@@ -631,4 +692,64 @@ body {
             bottom: px2rem(48);
         }
     }
+}
+
+.mainlandInfo {
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 99;
+    background: rgba(0, 0, 0, .6);
+    display: none;
+
+    .mainlandInfo_in {
+        width: px2rem(638);
+        height: px2rem(372);
+        border-radius: px2rem(40);
+        background: #fff;
+        box-sizing: border-box;
+        padding-top: px2rem(84);
+        position: relative;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+
+        p {
+            width: 100%;
+            text-align: center;
+            color: #1F1B4F;
+            font-size: px2rem(28);
+            margin-bottom: px2rem(24);
+
+            b {
+                font-weight: bold;
+            }
+
+            span {
+                color: #9168FA;
+                font-size: px2rem(32);
+            }
+        }
+        .close,.ok{
+            position: absolute;
+            width: px2rem(248);
+            height: px2rem(88);
+            line-height: px2rem(88);
+            border-radius: px2rem(88);
+            color: #fff;
+            font-size: px2rem(32);
+            top: px2rem(236);
+            text-align: center;
+        }
+        .close{
+            background: #E6E6F0;
+            left: px2rem(56);
+        }
+        .ok{
+            left: px2rem(334);
+            background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
+        }
+    }
 }

view/peko/modules/h5Income/js/chainBank.js

@@ -27,7 +27,7 @@ const toastMsg = (content = '操作完成', time = 2) => {
         skin: 'msg'
     })
 }
-
+var photoBool = false;
 $(function () {
     setTimeout(function () {
         getInfoFromClient()
@@ -35,6 +35,20 @@ $(function () {
             $('.back').hide();
         }
         setTimeout(function () {
+            var info = JSON.parse(url.userInfo);
+            if (info) {
+                console.log(info);
+                $('.box1 div .name').val(info.name);
+                $('.box1 div .card').val(info.idCardNo);
+                $('.box2 div .bankCard').val(info.accountNo);
+                $('.box2 div .phone').val(info.contact);
+                $('.box2 div .alipay').val(info.thirdAccountNo);
+                $('.box2 div .address').val(info.address);
+                $('.box3 .idBox .z .documents').attr('src', info.frontPhoto)
+                $('.box3 .idBox .f .documents').attr('src', info.backPhoto)
+                $('.but').addClass('active')
+                photoBool = true;
+            }
         }, 100)
     })
 })
@@ -101,16 +115,16 @@ function getUploadToken (type) {
     })
 }
 // 确认绑定按钮
-$('.but').click(function () {
+// $('.but').click(function () {
-    if (listenFun()) {
+//     if (listenFun()) {
-        var filesList = document.querySelector('#frontImageUpload').files;
+//         var filesList = document.querySelector('#frontImageUpload').files;
-        var backImageUpload = document.querySelector('#backImageUpload').files;
+//         var backImageUpload = document.querySelector('#backImageUpload').files;
-        if (filesList.length == 0 || backImageUpload.length == 0) {
+//         if (filesList.length == 0 || backImageUpload.length == 0) {
-            toastMsg('請上傳身份證照片')
+//             toastMsg('請上傳身份證照片')
-            return;
+//             return;
-        }
+//         }
-    }
+//     }
-})
+// })
 //监听是否完善信息
 function listenFun () {
     var num1 = $(".box1 div .name").val();
@@ -133,18 +147,34 @@ $(".box1 div .name,.box1 div .card,.box2 div .bankCard,.box2 div .phone,.box2 di
 // 
 // 保存绑定
 function withdrawUserAccount (name, idCardNo, accountNo, contact, thirdAccountNo, address, frontPhoto, backPhoto) {
-    var obj = {
+    if (url.modifyId == undefined) {
-        uid: pubInfo.uid,
+        var obj = {
-        accountType: url.accountType,
+            uid: pubInfo.uid,
-        name,
+            accountType: url.accountType,
-        idCardNo,
+            name,
-        accountNo,
+            idCardNo,
-        contact,
+            accountNo,
-        thirdAccountNo,
+            contact,
-        address,
+            thirdAccountNo,
-        frontPhoto,
+            address,
-        backPhoto,
+            frontPhoto,
-    };
+            backPhoto,
+        };
+    } else {
+        var obj = {
+            id: url.modifyId,
+            uid: pubInfo.uid,
+            accountType: url.accountType,
+            name,
+            idCardNo,
+            accountNo,
+            contact,
+            thirdAccountNo,
+            address,
+            frontPhoto,
+            backPhoto,
+        };
+    }
     showLoading()
     networkRequest({
         type: 'POST',
@@ -174,17 +204,30 @@ $('.but').click(function () {
     var frontImageUpload = document.querySelector('#frontImageUpload').files;
     var backImageUpload = document.querySelector('#backImageUpload').files;
     if (listenFun()) {
-        if (frontImageUpload.length == 0 || backImageUpload.length == 0) {
+        if (photoBool) {
+            $('.mainlandInfo').show();
+            return;
+        } else if (frontImageUpload.length == 0 || backImageUpload.length == 0) {
             toastMsg('請上傳身份證');
             return;
         }
-        withdrawUserAccount($('.box1 div .name').val(),
+        $('.mainlandInfo').show();
-            $('.box1 div .card').val(),
-            $('.box2 div .bankCard').val(),
-            $('.box2 div .phone').val(),
-            $('.box2 div .alipay').val(),
-            $('.box2 div .address').val(),
-            $('.box3 .idBox .z .documents').attr('src'),
-            $('.box3 .idBox .f .documents').attr('src'));
     }
+})
+// 二次取消 
+$('.mainlandInfo .mainlandInfo_in .close').click(function () {
+    $('.mainlandInfo').hide();
+})
+// 二次确认
+$('.mainlandInfo .mainlandInfo_in .ok').click(function () {
+    withdrawUserAccount($('.box1 div .name').val(),
+        $('.box1 div .card').val(),
+        $('.box2 div .bankCard').val(),
+        $('.box2 div .phone').val(),
+        $('.box2 div .alipay').val(),
+        $('.box2 div .address').val(),
+        $('.box3 .idBox .z .documents').attr('src'),
+        $('.box3 .idBox .f .documents').attr('src')
+    );
+    $('.mainlandInfo').hide();
 })

view/peko/modules/h5Income/js/withdrawal.js

@@ -31,6 +31,10 @@ var minValue;//最小提領金币数量
 var golds;//当前剩余金币
 var weekLimitCount;//本周剩余次数
 var weekMaxValue;//本周剩余最大金额
+var realName = false;//默认大陆未实名
+var modifyId = null;
+var userInfo = {}//账户信息暂存
+var idCard;//获取大陆身份证号
 $(function () {
     setTimeout(function () {
         getInfoFromClient()
@@ -44,6 +48,7 @@ $(function () {
 })
 // 提領配置接口接口
 function getConfig () {
+    $('.withdrawal p').remove();
     showLoading()
     networkRequest({
         type: 'GET',
@@ -130,6 +135,9 @@ function getUser () {
     })
 }
 // 提領賬戶管理接口 
+var isPrevBool = false;
+var isRealCertifyBool = 1;
+var updateNums = 0;
 function getAccounts () {
     showLoading()
     networkRequest({
@@ -139,23 +147,85 @@ function getAccounts () {
         success (res) {
             if (res.code === 200) {
                 var str = '';
-                res.data.forEach(res => {
+                res.data.forEach((res) => {
                     str += `
-                    <li accountType=${res.accountType} isBind=${res.isBind}>${res.accountName}${res.isBind == 0 ? "（未綁定）" : ''}</li>
+                    <li backPhoto=${res.backPhoto} frontPhoto=${res.frontPhoto} address=${res.address} thirdAccountNo=${res.thirdAccountNo} contact=${res.contact} accountNo=${res.accountNo} idCardNo=${res.idCardNo} name=${res.name} id=${res.id} accountTypesText=${res.accountName} accountType=${res.accountType} isBind=${res.isBind}>${res.accountName}${res.isBind == 0 ? "（未綁定）" : ''}<i>${res.accountType == 2 ? '修改&nbsp;&nbsp;>' : ''}</i></li>
                `
+
+                    // if (res.isPrev == 1) {
+                    //     isPrevBool = true;
+                    //     accountType = res.accountType
+                    //     $('.account span').text(res.accountName);
+                    //     $('.account span').addClass('active');
+                    // } else {
+                    //     if (res.isBind == 1 && isPrevBool == false) {
+                    //         accountType = res.accountType
+                    //         $('.account span').text(res.accountName);
+                    //         $('.account span').addClass('active');
+                    //     }
+                    // }
+                    // if (res.isPrev == 1) {
+                    //     isPrevBool = true;
+                    //     accountType = res.accountType
+                    //     $('.account span').text(res.accountName);
+                    //     $('.account span').addClass('active');
+                    // }
                     if (res.isPrev == 1) {
+                        isPrevBool = true;
                         accountType = res.accountType
                         $('.account span').text(res.accountName);
                         $('.account span').addClass('active');
-                    } else {
+                    }
-                        if (res.isBind == 1) {
+                    if (res.isBind == 1 && isPrevBool == false) {
-                            accountType = res.accountType
+                        accountType = res.accountType
-                            $('.account span').text(res.accountName);
+                        $('.account span').text(res.accountName);
-                            $('.account span').addClass('active');
+                        $('.account span').addClass('active');
+                    }
+                    if (res.accountType == 2) {
+                        idCard = res.idCardNo;
+                        updateNums = res.updateNum;
+                        isRealCertifyBool = res.isRealCertify;
+                        // 判断是否认证
+                        if (isRealCertifyBool == 0) {
+                            $('.withdrawal input').attr('placeholder', '請先進行實名認證');
+                            $('.authentication span').text('未實名');
+                            realName = false;
+                        } else {
+                            realName = true;
+                            $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+                            $('.authentication span').text('已實名');
                         }
+                    } else {
+                        $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+                    }
+                    if (accountType == 2) {
+                        $('.authentication').show();
+                    } else {
+                        $('.authentication').hide();
                     }
                 });
                 $('.accountPub .accountPub_in ul').append(str);
+                // 判断是否展示修改
+                if (updateNums >= 1) {
+                    $('.mainlandInfo .mainlandInfo_in p span').text(updateNums + '次');
+                    $('.accountPub .accountPub_in ul li i').show();
+                } else {
+                    $('.accountPub .accountPub_in ul li i').hide();
+                }
+                // 修改大陆银行卡按钮
+                $('.accountPub .accountPub_in ul li i').click(function () {
+                    modifyId = $(this).parents('li').attr('id');
+                    userInfo.name = $(this).parents('li').attr('name');
+                    userInfo.idCardNo = $(this).parents('li').attr('idCardNo');
+                    userInfo.accountNo = $(this).parents('li').attr('accountNo');
+                    userInfo.contact = $(this).parents('li').attr('contact');
+                    userInfo.thirdAccountNo = $(this).parents('li').attr('thirdAccountNo');
+                    userInfo.address = $(this).parents('li').attr('address');
+                    userInfo.frontPhoto = $(this).parents('li').attr('frontPhoto');
+                    userInfo.backPhoto = $(this).parents('li').attr('backPhoto');
+                    $('.mainlandInfo').show();
+                    return false;
+                })
                 // 跳轉綁定賬戶或選擇賬戶
                 $('.accountPub .accountPub_in ul li').click(function () {
                     var isBind = $(this).attr('isBind');//是否綁定 0 否 1 是
@@ -171,7 +241,7 @@ function getAccounts () {
                             $('.switch .pub_in p').text('是否切換到新加坡銀行提領 ');
                         }
                         $('.switch .pub_in .ok').attr('accounttype', accountTypes);
-                        $('.switch .pub_in .ok').attr('text', $(this).text());
+                        $('.switch .pub_in .ok').attr('text', $(this).attr('accountTypesText'));
                         $('.switch').show();
                     } else {
                         var accountTypes = $(this).attr('accounttype');//1 其它賬戶 2 中國大陸銀聯 4 馬來西亞銀行 8 新加坡銀行
@@ -196,8 +266,15 @@ function getAccounts () {
                             } else if (accountTypes == 8) {
                                 window.location.href = `./singapore.html?accountType=${accountTypes}`;
                             }
+                            return false;
                         })
                     }
+                    if (accountTypes == 2) {
+                        $('.authentication').show();
+                    } else {
+                        $('.authentication').hide();
+                    }
+                    console.log(accountTypes);
                     return false;
                 })
                 if (golds < minValue) {
@@ -231,6 +308,21 @@ $('.switch .pub_in .ok').click(function () {
     $('.accountPub').hide();
     $('.switch').hide();
     calculate();
+    if (accountType == 2) {
+        // 判断是否认证
+        if (isRealCertifyBool == 0) {
+            $('.withdrawal input').attr('placeholder', '請先進行實名認證');
+            $('.authentication span').text('未實名');
+            realName = false;
+        } else {
+            realName = true;
+            $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+            $('.authentication span').text('已實名');
+        }
+    } else {
+        $('.withdrawal input').attr('placeholder', '請輸入提領金幣數額');
+    }
+
 })
 // 确定输入提領弹窗按钮
 $('.goldPub .goldPub_in .but').click(function () {
@@ -263,7 +355,7 @@ function calculate () {
             if (res.code === 200) {
                 $('.withdrawal .numBox b').addClass('active');
                 $('.withdrawal input').val(num);
-                $('.withdrawal .numBox b').text(`${res.data.currency} ${res.data.currencyAmount}`);
+                $('.withdrawal .numBox b').text(`${res.data.currency == undefined ? '' : res.data.currency} ${res.data.currencyAmount}`);
                 $('.goldPub').hide();
                 $('.goldPub .goldPub_in input').val('');
                 $('.butBig').addClass('butBigActive');
@@ -297,6 +389,19 @@ $('.butBig').click(function () {
         toastMsg('超出本周最大提领次数')
         return
     }
+    let birthday = idCard.substring(6, 14);
+    let nowTime = moment(new Date()).format('YYYY-MM-DD');
+    birthday = moment(birthday).format('YYYY-MM-DD');
+    // return
+    if (accountType == 2 && isRealCertifyBool == 0) {
+        toastMsg('請先進行實名認證')
+        return
+    }
+    // console.log(isAdult(idCard));
+    if (accountType == 2 && (moment(nowTime).isBefore(moment(birthday).add(18, 'years')))) {//
+        toastMsg('申請提現失敗，不支援未成年人提現');
+        return
+    }
     $('.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();
@@ -331,6 +436,15 @@ $('.withDrawalPub .withDrawalPub_in .but').click(function () {
 // 点击输入提領数额按钮
 $('.withdrawal .withdrawalBox').click(function () {
     var status = $(this).attr('click');
+    if (accountType == null || accountType == undefined) {
+        toastMsg('請先選擇提領賬戶');
+        return false;
+    }
+    console.log(realName);
+    if (realName == false && accountType == 2) {
+        toastMsg('請先進行實名認證');
+        return false;
+    }
     if (status == 1) {
         $('.goldPub .goldPub_in .num').text(golds);
         $('.goldPub').show();
@@ -364,15 +478,29 @@ $('.back').click(function () {
 $('.income .rule').click(function () {
     window.location.href = './rule.html';
 })
-//返回页面 重新请求接口
+// 确认修改大陆信息按钮
-var hiddenProperty = 'hidden' in document ? 'hidden' :
+$('.mainlandInfo .mainlandInfo_in .ok').click(function () {
-    'webkitHidden' in document ? 'webkitHidden' :
+    window.location.href = `./chainBank.html?accountType=${2}&modifyId=${modifyId}&userInfo=${JSON.stringify(userInfo)}`;
-        'mozHidden' in document ? 'mozHidden' : null;
+})
-
+// 取消修改大陆信息按钮
-var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
+$('.mainlandInfo .mainlandInfo_in .close').click(function () {
-var onVisibilityChange = function () {
+    $('.mainlandInfo').hide();
-    if (!document[hiddenProperty]) {
+})
-        location.reload()
+// 跳转实名认证按钮
+$('.authentication').click(function () {
+    if (realName == false) {
+        window.location.href = `../identity/new.html`
     }
-}
+})
-document.addEventListener(visibilityChangeEvent, onVisibilityChange);
+//返回页面 重新请求接口
+// var hiddenProperty = 'hidden' in document ? 'hidden' :
+//     'webkitHidden' in document ? 'webkitHidden' :
+//         'mozHidden' in document ? 'mozHidden' : null;
+
+// var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
+// var onVisibilityChange = function () {
+//     if (!document[hiddenProperty]) {
+//         location.reload()
+//     }
+// }
+// document.addEventListener(visibilityChangeEvent, onVisibilityChange);

view/peko/modules/h5Income/withdrawal.html

@@ -9,7 +9,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <title>收益提領</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/withdrawal.css?v=1.0">
+    <link rel="stylesheet" href="./css/withdrawal.css?v=1.1">
 </head>
 
 <body>
@@ -37,6 +37,13 @@
         <div>提领账户</div>
         <span>未绑定</span>
     </div>
+    <!-- 实名认证 -->
+    <div class="authentication">
+        <img src="./images/withdrawal/icon_authentication.png" alt="" class="icon_authentication">
+        <img src="./images/withdrawal/arrow_right.png" alt="" class="arrow_right">
+        <div>實名認證</div>
+        <span>未實名</span>
+    </div>
     <!-- 提领提交 -->
     <div class="withdrawal">
         <img src="./images/withdrawal/icon_mone.png" alt="" class="gold">
@@ -99,9 +106,18 @@
             <div class="close">取消</div>
             <div class="ok">确认</div>
         </div>
-    </div> 
+    </div>
+    <!-- 二次确认修改大陆银行卡信息按钮 -->
+    <div class="mainlandInfo">
+        <div class="mainlandInfo_in">
+            <p>是否確認修改 <b>中國大陸銀聯</b> 的提領賬戶？</p>
+            <p>提领账户只可修改 <span>1次</span>，请谨慎操作</p>
+            <div class="close">取消</div>
+            <div class="ok">确认</div>
+        </div>
+    </div>
 </body>
-
+ 
 </html>
 <script src="../../common/js/flexible.js"></script>
 <script src="../../common/js/jquery-3.2.1.min.js"></script>
@@ -110,4 +126,5 @@
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="../../common/js/route-constant.js"></script>
 <script src="../../common/js/svga.min.js"></script>
-<script src="./js/withdrawal.js?v=1.5"></script>
+<script src="./js/moment.js"></script>
+<script src="./js/withdrawal.js?v=2.1"></script>

view/peko/modules/identity/js/new.js

@@ -2,372 +2,400 @@
  * Created by raymondjack on 2018/12/21.
  */
 
-var info = {};
+// var pubInfo = {};
 var $toast = $('.toast');
 var $mask = $('.status-mask');
 var lockBol = false;
+let urlPrefix = getUrlPrefix()
+var goToPage = null;
+// 封装layer消息提醒框
+let layerIndex
+const showLoading = (content = '获取结果中...') => {
+    layer.open({
+        type: 2,
+        shadeClose: false,
+        content,
+        success (e) {
+            layerIndex = $(e).attr('index')
+        }
+    })
+}
+const hideLoading = (index) => {
+    layer.close(index)
+}
+const toastMsg = (content = '操作完成', time = 2) => {
+    layer.open({
+        content,
+        time,
+        skin: 'msg'
+    })
+}
 $(function () {
-  var browser = checkVersion();
+    getInfoFromClient()
-  var api = getUrlPrefix();
+    var browser = checkVersion();
-  var timer = null;
+    var api = getUrlPrefix();
-  var env = EnvCheck();
+    var timer = null;
-  var urlObj = getQueryString();
+    var env = EnvCheck();
-  if (env == 'test') {
+    var urlObj = getQueryString();
-    var vConsole = new VConsole();
+    console.log(urlObj.uid);
-  }
+    if (urlObj.uid) {
-
+        sessionStorage.setItem("uid", urlObj.uid);
-  getInfoFromClient && getInfoFromClient()
+        sessionStorage.setItem("ticket", urlObj.ticket);
-  if (browser.app) {
+    }
-    if (browser.android) {
+    if (env == 'test') {
-      let channel = JSON.parse(pubInfo.deviceInfo).channel
+        var vConsole = new VConsole();
-      if (channel.indexOf('toutiao') != -1 || channel.indexOf('kuaishou') != -1) {
-        $('.appName').html('piko')
-      }
     }
-  }
 
-
+    getInfoFromClient && getInfoFromClient()
-  var main = {
+    if (browser.app) {
-    init: function () {
-      this.getDeviceMsg();
-      this.eventRegister();
-      var that = this;
-      setTimeout(function () {
-        that.getData();
-      }, 200)
-
-    },
-    getDeviceMsg: function () {
-      if (browser.app) {
         if (browser.android) {
-          info.uid = parseInt(window.androidJsObj.getUid());
+            let channel = JSON.parse(pubInfo.deviceInfo).channel
-          info.deviceId = window.androidJsObj.getDeviceId();
+            if (channel.indexOf('toutiao') != -1 || channel.indexOf('kuaishou') != -1) {
-          info.ticket = window.androidJsObj.getTicket();
+                $('.appName').html('piko')
-        } else {
+            }
-          info.uid = tools.cookieUtils.get("uid");
-          if (!info.uid) {
-            window.webkit.messageHandlers.getUid.postMessage(null);
-          }
-          window.webkit.messageHandlers.getDeviceId.postMessage(null);
-          window.webkit.messageHandlers.getTicket.postMessage(null);
         }
-      } else {
+    }
-        info.uid = 922473;
-        info.deviceId = "204aa0c983384f1e84a3625b4f04bac1";
-      }
 
-      // setTimeout(function () {
+
-      //   $('.deviceId').val(info.deviceId);
+    var main = {
-      // },200)
+        init: function () {
-    },
+            this.getDeviceMsg();
-    getData: function () {
+            this.eventRegister();
-      console.log(urlObj, 'urlObj')
+            var that = this;
-      if (urlObj) {
+            setTimeout(function () {
-        info.auth = urlObj.auth
+                that.getData();
-      } else {
+            }, 200)
-        info.auth = ''
-      }
-      console.log(info.auth, 'info.auth')
-      $.ajax({
-        type: "get",
-        url: api + "/certification/hasCertify",
-        headers: {
-          "pub_ticket": info.ticket
-        },
-        data: {
-          uid: info.uid,
-          auth: info.auth,
-          ticket: info.ticket,
 
         },
-        success: function (res) {
+        getDeviceMsg: function () {
-          if (res.code == 200) {
+            // if (browser.app) {
-            var checkBol = res.data;
+            //     if (browser.android) {
-            var $mask = $('.status-mask');
+            //         pubInfo.uid = parseInt(window.androidJsObj.getUid());
-            if (checkBol.authResult) {
+            //         pubInfo.deviceId = window.androidJsObj.getDeviceId();
-              console.log('已短信验证！')
+            //         pubInfo.ticket = window.androidJsObj.getTicket();
-            } else if (checkBol.hasCertify && !checkBol.canCertify) {
+            //     } else {
-              console.log('已实名且没有机会了')
+            //         pubInfo.uid = tools.cookieUtils.get("uid");
+            //         if (!pubInfo.uid) {
+            //             window.webkit.messageHandlers.getUid.postMessage(null);
+            //         }
+            //         window.webkit.messageHandlers.getDeviceId.postMessage(null);
+            //         window.webkit.messageHandlers.getTicket.postMessage(null);
+            //     }
+            // } else {
+            //     pubInfo.uid = 922473;
+            //     pubInfo.deviceId = "204aa0c983384f1e84a3625b4f04bac1";
+            // }
 
-              $mask.addClass("have-identity");
+            // setTimeout(function () {
-              $mask.find(".text").html("您已通过实名认证");
+            //   $('.deviceId').val(pubInfo.deviceId);
-              $mask.find(".tips").html("系统已成功审核您的实名认证");
+            // },200)
-              $mask.show();
+        },
-            } else if (checkBol.hasCertify && checkBol.canCertify) {
+        getData: function () {
-              console.log('已实名还有一次机会')
+            console.log(urlObj, 'urlObj')
-              // var $mask = $('.status-mask');
+            if (urlObj) {
-              $mask.addClass("have-identity");
+                pubInfo.auth = urlObj.auth
-              $mask.find(".text").html("您已通过实名认证");
-              $mask.find(".tips").html("系统已成功审核您的实名认证");
-              $mask.find(".goto-change").removeClass('hide');
-              $mask.show();
-            }
-          }
-        }
-      })
-    },
-    eventRegister: function () {
-      $('.button-submit').on('click', function () {
-
-        var name = $('.name').val();
-        var personId = $('.person-id').val();
-        var phone = $('.phone').val();
-        var identityCode = $('.identity-code').val();
-        var agree = $('#agree').prop("checked");
-        if (!agree) {
-          toastShow("请同意直播协议");
-          return;
-        }
-        if (!name.trim()) {
-          toastShow("名字不能为空");
-          return;
-        }
-
-        if (!personId.trim()) {
-          toastShow("身份证号不能为空");
-          return;
-        }
-
-        if (!phone.trim()) {
-          toastShow("手机号不能为空");
-          return;
-        }
-
-        if (!identityCode.trim()) {
-          toastShow("验证码不能为空");
-          return;
-        }
-
-        if (!(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/).test(personId.trim())) {
-          toastShow("身份证号不符合规格");
-          return;
-        }
-
-        if (!(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(phone.trim())) {
-          toastShow("手机号不符合规格");
-          return;
-        }
-        if (lockBol) {
-          return;
-        }
-        lockBol = true;
-
-        var requestParam = {
-          uid: info.uid,
-          username: encryptDes(name, "1ea53d260ecf11e7b56e00163e046a26"),
-          identityNumber: encryptDes(personId, "1ea53d260ecf11e7b56e00163e046a26"),
-          phone: encryptDes(phone, "1ea53d260ecf11e7b56e00163e046a26"),
-          code: identityCode,
-          ticket: info.ticket
-        };
-        if (browser.android) {
-          requestParam.deviceInfo = JSON.stringify({
-            deviceId: info.deviceId
-          });
-        }
-        $.ajax({
-          type: "get",
-          url: api + "/certification/token",
-          data: requestParam,
-          headers: {
-            "pub_ticket": info.ticket
-          },
-          success: function (res) {
-            if (res.code == 200) {
-              var token = res.data.token;
-              info.token = token;
-              // if(browser.app){
-              if (browser.ios) {
-                window.webkit.messageHandlers.openFaceLiveness.postMessage(token);
-              } else {
-                window.androidJsObj.openFaceLiveness(token);
-              }
-              // }
             } else {
-              if (res.code == 10109) {
+                pubInfo.auth = ''
-                $mask.addClass("failed");
-                $mask.find(".text").html("实名认证失败");
-                $mask.find(".tips").html("该身份证实名认证已达5次");
-              } else if (res.code == 10110) {
-                $mask.addClass("have-identity");
-                $mask.find(".text").html("您已通过实名认证");
-                $mask.find(".tips").html("系统已成功审核您的实名认证");
-              } else if (res.code == 4003) {
-                $mask.addClass("failed");
-                $mask.find(".text").html("实名认证失败");
-                $mask.find(".tips").html("验证码错误");
-              } else {
-                $mask.addClass("failed");
-                $mask.find(".text").html("实名认证失败");
-                $mask.find(".tips").html("请填写真实有效的身份证信息");
-              }
-              $mask.show();
-              lockBol = false;
-              setTimeout(function () {
-                $('.status-mask').hide();
-              }, 4000);
             }
-          }
+            console.log(pubInfo.auth, 'pubInfo.auth')
-        });
+            networkRequest({
-        // $.post(api + "/certification/doCheck",requestParam,function (res) {
+                type: 'get',
-        //
+                url: urlPrefix + '/certification/hasCertify',
-        // })
+                data: {
-      })
+                    uid: pubInfo.uid,
+                    auth: pubInfo.auth,
+                    ticket: pubInfo.ticket,
+                },
+                success: function (res) {
+                    if (res.code == 200) {
+                        var checkBol = res.data;
+                        var $mask = $('.status-mask');
+                        var bool = !(checkBol.authResult == null || checkBol.authResult == undefined);
+                        function successFun () {
+                            hideLoading(layerIndex)
+                            goToPage = true;
+                            $mask.addClass("have-identity");
+                            $mask.find(".text").html("您已通过实名认证");
+                            $mask.find(".tips").html("系统已成功审核您的实名认证");
+                            $mask.find(".goto-change").removeClass('hide');
+                            $mask.show();
+                        }
+                        if (bool) {
+                            if (checkBol.authResult == false && checkBol.canCertify == true && checkBol.hasCertify == false) {
+                                //重复调用
+                                showLoading();
+                                main.getData();
+                            }else if (checkBol.authResult == false && checkBol.canCertify == false && checkBol.hasCertify == true) {
+                                //成功
+                                successFun()
+                            } else if (checkBol.authResult == true && checkBol.canCertify == false && checkBol.hasCertify == true) {
+                                //成功
+                                successFun()
+                            } else if (checkBol.authResult == true && checkBol.canCertify == true && checkBol.hasCertify == false) {
+                                //失败
+                                goToPage = false;
+                                $mask.addClass("failed");
+                                $mask.find(".text").html("您未通过实名认证");
+                                $mask.find(".tips").html("系统审核您的实名认证失败");
+                                $mask.find(".goto-change").removeClass('hide');
+                                $mask.show();
+                                hideLoading(layerIndex)
+                            }
+                        } else {
+                            if (checkBol.canCertify == false && checkBol.hasCertify == true) {
+                                //成功
+                                successFun()
+                            } else {//(authResult == null || authResult == undefined) && canCertify == true && hasCertify == false;
+                                //正在操作
+                                console.log('继续操作');
+                            }
+                            hideLoading(layerIndex)
+                        }
+                    }
+                },
+                error (err) {
+                    console.log(err);
+                }
+            })
+        },
+        eventRegister: function () {
+            $('.button-submit').on('click', function () {
+                var name = $('.name').val();
+                var personId = $('.person-id').val();
+                var phone = `${$('.phone').val()}`;
+                var identityCode = $('.identity-code').val();
+                var agree = $('#agree').prop("checked");
+                if (!agree) {
+                    toastShow("请同意直播协议");
+                    return;
+                }
+                if (!name.trim()) {
+                    toastShow("名字不能为空");
+                    return;
+                }
 
-      $('.button-identity-code').on('click', function () {
+                if (!personId.trim()) {
-        var phone = $('.phone').val();
+                    toastShow("身份证号不能为空");
-        if (!phone.trim()) {
+                    return;
-          toastShow("手机号不能为空");
+                }
-          return;
+
+                if (!phone.trim()) {
+                    toastShow("手机号不能为空");
+                    return;
+                }
+
+                if (!identityCode.trim()) {
+                    toastShow("验证码不能为空");
+                    return;
+                }
+
+                if (!(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/).test(personId.trim())) {
+                    toastShow("身份证号不符合规格");
+                    return;
+                }
+
+                if (!(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(phone.trim())) {
+                    toastShow("手机号不符合规格");
+                    return;
+                }
+                if (lockBol) {
+                    return;
+                }
+                lockBol = true;
+                var metaInfo = window.getMetaInfo();
+                var requestParam = {
+                    certType: 0,
+                    code: identityCode,
+                    identityNumber: encryptDes(personId, "1ea53d260ecf11e7b56e00163e046a26"),
+                    metaInfo: JSON.stringify(metaInfo),
+                    phone: encryptDes(86 + phone, "1ea53d260ecf11e7b56e00163e046a26"),
+                    returnUrl: urlPrefix + `/peko/modules/identity/new.html?uid=${sessionStorage.getItem("uid")}&ticket=${sessionStorage.getItem("ticket")}`,
+                    uid: pubInfo.uid,
+                    username: encryptDes(name, "1ea53d260ecf11e7b56e00163e046a26"),
+                };
+                networkRequest({
+                    type: 'post',
+                    url: urlPrefix + '/certification/initFace',
+                    data: requestParam,
+                    success: function (res) {
+                        if (res.code == 200) {
+                            window.location.href = res.data.certifyUrl;
+                        } else {
+                            $mask.addClass("failed");
+                            $mask.find(".text").html("实名认证失败");
+                            $mask.find(".tips").html(res.message);
+                            $mask.show();
+                            lockBol = false;
+                            setTimeout(function () {
+                                $('.status-mask').hide();
+                            }, 4000);
+                            lockBol = false;
+                        }
+                    },
+                    error (err) {
+                        console.log(err);
+                    }
+                })
+            })
+
+            $('.button-identity-code').on('click', function () {
+                var phone = $('.phone').val();
+                if (!phone.trim()) {
+                    toastShow("手机号不能为空");
+                    return;
+                }
+                if (!(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(phone.trim())) {
+                    toastShow("手机号不符合规格");
+                    return;
+                }
+                if ($(this).hasClass("disable")) {
+                    return;
+                }
+                $(this).addClass('disable');
+                var time = 60;
+                var $that = $(this);
+                $(this).html(time + 's后重新获取');
+                timer = setInterval(function () {
+                    time--;
+                    $that.html(time + "s后重新获取");
+                    if (time < 0) {
+                        clearInterval(timer);
+                        $that.removeClass('disable');
+                        $that.html("获取验证码");
+                    }
+                }, 1000)
+
+                var requestParam = {
+                    phone: encryptDes(86 + phone, "1ea53d260ecf11e7b56e00163e046a26"),
+                    uid: pubInfo.uid,
+                    ticket: pubInfo.ticket
+                };
+
+                if (browser.android) {
+                    requestParam.deviceInfo = JSON.stringify({
+                        deviceId: pubInfo.deviceId
+                    });
+                }
+
+                networkRequest({
+                    type: 'post',
+                    url: urlPrefix + '/certification/send/code',
+                    data: requestParam,
+                    success: function (res) {
+                        if (res.code == 200) {
+                            toastShow('发送成功');
+                        } else {
+                            toastShow(res.message);
+                        }
+                    },
+                    error (err) {
+                        console.log(err);
+                    }
+                })
+            })
+
+            // 点击我要修改
+            $('.goto-change').on('click', function () {
+                $mask.hide();
+                $('.layer-box-2').show();
+            })
+
+            // 点击关闭弹层
+            $('.layer-2-close').on('click', function () {
+                $('.layer-box-2').hide();
+                $mask.show();
+            })
+
+            // 点击跳转手机验证
+            $('.goto-change-layer').on('click', function () {
+                window.location.href = 'mobile.html';
+            })
         }
-        if (!(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(phone.trim())) {
+    };
-          toastShow("手机号不符合规格");
+    main.init();
-          return;
-        }
-        if ($(this).hasClass("disable")) {
-          return;
-        }
-        $(this).addClass('disable');
-        var time = 60;
-        var $that = $(this);
-        $(this).html(time + 's后重新获取');
-        timer = setInterval(function () {
-          time--;
-          $that.html(time + "s后重新获取");
-          if (time < 0) {
-            clearInterval(timer);
-            $that.removeClass('disable');
-            $that.html("获取验证码");
-          }
-        }, 1000)
-
-        var requestParam = {
-          phone: encryptDes(phone, "1ea53d260ecf11e7b56e00163e046a26"),
-          uid: info.uid,
-          ticket: info.ticket
-        };
-
-        if (browser.android) {
-          requestParam.deviceInfo = JSON.stringify({
-            deviceId: info.deviceId
-          });
-        }
-
-        $.ajax({
-          type: "post",
-          url: api + "/certification/send/code",
-          headers: {
-            "pub_ticket": info.ticket
-          },
-          data: requestParam,
-          success: function (res) {
-            console.log(res, '请求成功');
-            if (res.code == 200) {
-              toastShow('发送成功');
-            } else {
-              toastShow(res.message);
-              console.log(res, '报错啦');
-            }
-          },
-          error: function (res) {
-            toastShow(res.message);
-            console.log(res, '报错啦');
-          }
-        });
-      })
-
-      // 点击我要修改
-      $('.goto-change').on('click', function () {
-        $mask.hide();
-        $('.layer-box-2').show();
-      })
-
-      // 点击关闭弹层
-      $('.layer-2-close').on('click', function () {
-        $('.layer-box-2').hide();
-        $mask.show();
-      })
-
-      // 点击跳转手机验证
-      $('.goto-change-layer').on('click', function () {
-        window.location.href = 'mobile.html';
-      })
-    }
-  };
-  main.init();
 
 });
 
-function toastShow(text) {
+function toastShow (text) {
-  $toast.html(text);
+    $toast.html(text);
-  $toast.show();
+    $toast.show();
-  setTimeout(function () {
+    setTimeout(function () {
-    $toast.hide();
+        $toast.hide();
-  }, 2000);
+    }, 2000);
 }
 
-function getMessage(key, value) {
+function getMessage (key, value) {
-  info[key] = value;
+    pubInfo[key] = value;
 }
 
 
-function renderByStatus(status) {
+function renderByStatus (status) {
-  $mask.attr('class', 'status-mask');
+    $mask.attr('class', 'status-mask');
-  console.log("开始回调，" + "状态为" + status);
+    console.log("开始回调，" + "状态为" + status);
-  $.ajax({
+
-    type: 'post',
+    networkRequest({
-    url: locateJudge() + '/certification/notify',
+        type: 'post',
-    headers: {
+        url: urlPrefix + '/certification/notify',
-      "pub_ticket": info.ticket
+        data: {
-    },
+            uid: pubInfo.uid,
-    data: {
+            ticket: pubInfo.ticket,
-      uid: info.uid,
+            token: pubInfo.token,
-      ticket: info.ticket,
+            statusCode: status
-      token: info.token,
+        },
-      statusCode: status
+        success: function (res) {
-    },
+            console.log(res);
-    success: function (res) {
+            lockBol = false;
-      console.log(res);
+            if (res.code == 200) {
-      lockBol = false;
+                console.log("success");
-      if (res.code == 200) {
+                if (status == 2) {
-        console.log("success");
+                    $mask.addClass("success");
-        if (status == 2) {
+                    $mask.find(".text").html("认证成功");
-          $mask.addClass("success");
+                    $mask.find('.tips').html('');
-          $mask.find(".text").html("认证成功");
+                    $mask.show();
-          $mask.find('.tips').html('');
+                } else {
-          $mask.show();
+                    if (status == -2) {
-        } else {
+                        $mask.addClass("failed");
-          if (status == -2) {
+                        $mask.find(".text").html("认证失败");
-            $mask.addClass("failed");
+                        $mask.find(".tips").html("网络不通或者网络异常");
-            $mask.find(".text").html("认证失败");
+                    } else if (status == 1) {
-            $mask.find(".tips").html("网络不通或者网络异常");
+                        $mask.addClass("failed");
-          } else if (status == 1) {
+                        $mask.find(".text").html("认证失败");
-            $mask.addClass("failed");
+                        $mask.find(".tips").html("审核失败");
-            $mask.find(".text").html("认证失败");
+                    } else {
-            $mask.find(".tips").html("审核失败");
+                        console.log('存在异常，status=' + status);
-          } else {
+                        // window.location.reload();
-            console.log('存在异常，status=' + status);
+                        return;
-            // window.location.reload();
+                    }
-            return;
+                    $mask.show();
-          }
+                    setTimeout(function () {
-          $mask.show();
+                        $mask.hide();
-          setTimeout(function () {
+                    }, 4000);
-            $mask.hide();
+                }
-          }, 4000);
+            }
+        },
+        error (err) {
+            console.log(err);
         }
-      }
+    })
-    }
+
-  });
+    console.log('status', status);
-  console.log('status', status);
 
 }
 
 //DES加密
 const encryptDes = (message, key) => {
-  var keyHex = CryptoJS.enc.Utf8.parse(key);
+    var keyHex = CryptoJS.enc.Utf8.parse(key);
-  var encrypted = CryptoJS.DES.encrypt(message, keyHex, {
+    var encrypted = CryptoJS.DES.encrypt(message, keyHex, {
-    mode: CryptoJS.mode.ECB,
+        mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7
+        padding: CryptoJS.pad.Pkcs7
-  });
+    });
-  return encrypted.toString();
+    return encrypted.toString();
 }
+
+$('.status-mask').click(function () {
+    if (goToPage) {
+        window.location.href = urlPrefix + '/peko/modules/h5Income/withdrawal.html'
+    } else {
+        $('.status-mask').hide();
+    }
+})

view/peko/modules/identity/new.html

@@ -7,7 +7,7 @@
         content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <title>实名认证</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/index.css?v=1">
+    <link rel="stylesheet" href="./css/index.css?v=1.0">
     <script src="../../common/js/flexible.js"></script>
 </head>
 
@@ -50,9 +50,9 @@
             <div class="title">认证须知</div>
             <p>1.该认证仅支持中国内地（不含港澳台地区）的用户。</p>
             <p>2.请确保填写身份证信息真实并与本人一致。</p>
-            <p>3.根据国家相关的法律法规，您需要提供您的真实身份信息（真实姓名、身份证号）、身份证正反面照片、面部信息以完成实名验证。您所提供的身份信息仅用于身份验证，未经您本人的许可不会被用于其他用途。这些信息属于个人敏感信息，我们将会尽可能的保护您个人敏感信息的安全。如果您不提供这些信息，您将不能使用提现等相关功能，但不影响您继续使用"<span class="appName">piko</span>"的其他服务。</p>
+            <p>3.根据国家相关的法律法规，您需要提供您的真实身份信息（真实姓名、身份证号）、身份证正反面照片、面部信息以完成实名验证。您所提供的身份信息仅用于身份验证，未经您本人的许可不会被用于其他用途。这些信息属于个人敏感信息，我们将会尽可能的保护您个人敏感信息的安全。如果您不提供这些信息，您将不能使用提现等相关功能，但不影响您继续使用本产品的其他服务。</p>
             <p>4.为保护用户权益，开启实名认证后我们将不提供解除恢复的功能，请谅解。</p>
-            <p>5.一个身份证最多用于5个用户账号的实名认证。</p>
+            <p>5.一个身份证最多用于2个用户账号的实名认证。</p>
             <p>6.若人脸认证遇到问题，<a href="../rule/identity-rule.html">请点击这里</a></p>
         </div>
         <div class="button-submit">开始认证</div>
@@ -81,7 +81,7 @@
             <a href="javascript:;" class="goto-change-layer"></a>
             <!-- <div class="layer-2-body"></div> -->
         </div>
-    </div>
+    </div> 
     <!-- layer end -->
 
     <script src="../../common/js/jquery-3.2.1.min.js"></script>
@@ -89,17 +89,9 @@
     <script src="../../common/js/common2.js"></script>
     <script src="../../common/js/vconsole.min.js"></script>
     <script src="../../common/js/crypto-js.js"></script>
-    <script src="./js/new.js?v=2.2"></script>
+    <script src="../../common/js/layer.js"></script>
-    <script>
+    <script src="./js/jsvm_all.js"></script>
-        var locateObj = getQueryString();
+    <script src="./js/new.js?=2.2"></script>
-        var appname = $('.appname');
-        if (locateObj.platform == "planet") {
-            appname.html("hello处CP");
-            $('.link-1').attr('href', '../rule/live-protocol.html?platform=planet')
-        } else {
-            appname.html("piko");
-        }
-    </script>
 </body>
 
 </html>

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.261da3ba434d098af68b457f8b1e8d05.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.02dce90a247a2f43a89a.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.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>

view/peko/modules/myincome/static/js/manifest.ed376927a01a418468e3.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:"fa39df31d16ba188ca75",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:"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}}([]);
-//# sourceMappingURL=manifest.02dce90a247a2f43a89a.js.map
+//# sourceMappingURL=manifest.ed376927a01a418468e3.js.map

view/peko/modules/rule/identity-rule.html

@@ -20,7 +20,7 @@
 <body>
   <div class="identity-max">
     <p class="bold-title">1、绑定身份证号个数限制</p>
-    <p>目前一个身份证可以绑定5个<span class="appName">piko</span>用户账号。</p>
+    <p>目前一个身份证可以绑定2个本产品用户账号。</p>
 
     <p class="bold-title">2、可认证人群</p>
     <p>实人认证服务目前仅支持对拥有中华人民共和国第二代居民身份证的居民进行认证。</p>
@@ -36,20 +36,14 @@
     <p>请咨询国政通客服（客服电话：4008165110）；</p>
     <p>（2）更改过姓名/最近做过户口迁移</p>
     <p>由于更改姓名及户口迁移有一定时效性，需要等待核验，建议等待生效后再次操作绑定；</p>
-    <p>（3）绑定的是军官证/护照</p>
+    <p>（3）其余情况</p>
-    <p>选择【请输入正确证件信息】并点击下方连线人工联系客服处理。</p>
-    <p>（4）其余情况</p>
     <p>由于绑定证件信息是由国政通系统获取，建议您之后再进行操作绑定。</p>
-
+    <p class="bold-title">5、绑定成功后是否支持更改/解绑</p>
-    <p class="bold-title">5、绑定失败提示“在本设备上使用3天后可以绑定证件信息”</p>
-    <p>建议您在该设备上活跃使用（例如进房间和主播互动/与新老朋友聊天互动/联系或邀请通讯录好友一起来玩<span class="appName">piko</span>）3天后再进行操作即可。</p>
-
-    <p class="bold-title">6、绑定成功后是否支持更改/解绑</p>
     <p>为保证帐户安全，身份证信息绑定成功后在修改密码、申诉时需进行验证身份证信息，故暂不支持解绑。</p>
-
+ 
-    <p class="bold-title">7、若以上还未解决你的问题，请咨询</p> <p>客服<span class="appName">LINE</span>号：pekoyuyin<br>或扫码添加微信</p>
+    <p class="bold-title">6、若以上还未解决你的问题，请咨询</p> 
-    <img src="./images/code.png" alt="" style="width: 200px">
+    <p>客服微信号：sd245376</p>
-
+    <!-- <img src="./images/code.png" alt="" style="width: 200px"> -->
   </div>
   <script src="../../common/js/jquery-3.2.1.min.js"></script>
   <script src="../../common/js/common2.js"></script>

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

@@ -59,6 +59,7 @@
               <p v-else-if="tab === 11 && item1.objType === 88">星级厨房奖励</p>
               <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.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>