新增跳转ui和ticket

view/yinmeng/activity/2024-whiteLove/index.html

@@ -189,11 +189,13 @@
                 <li>b.赠送礼物价值每满13140钻，即可购买【心动一刹13140钻】，赠送礼物价值每满33440钻，即可购买【绝对宠溺33440钻】；</li>
                 <li>c.购买的礼物将直接放入背包当中；</li>
                 <li>3.热恋时刻</li>
-                <li>a.活动期间，比拼热恋值；</li>
+                <li>a.活动期间，比拼热恋值,送礼方与收礼方产生CP关系,收到礼物可增加热恋值,1钻=1热恋值;</li>
-                <li>b.详细榜单规则与奖励可见榜单说明；</li>
+                <li>b.礼物包含礼物面板礼物和背包礼物;</li>
+                <li>c.若热恋值相同则按照最早赠送时间优先排序;</li>
+                <li>d.活动榜单仅有总榜,总榜前3可获得相应奖励,CP中男方获得蓝色装扮,女方获得粉色装扮,总榜奖励将在活动结束后统一自动发放;</li>
                 <li> 三、特别说明</li>
-                <li>1.靓号持有者需要在活动结束后2周内确认靓号，否则将自动过期无法使用；</li>
+                <li>a.靓号持有者需要在活动结束后2周内确认靓号，否则将自动过期无法使用；</li>
-                <li>2.本活动以及奖励与苹果公司无关。</li>
+                <li>b.本活动以及奖励与苹果公司无关。</li>
             </ul>
         </div>
     </div>
@@ -252,7 +254,7 @@
         <div class="page3Rule_in">
             <img src="./images/page3Title.png" alt="" class="title">
             <div class="box">
-                <img src="./images/page3Rule_inBg.png" alt="">
+                <img src="./images/page3Rule_inBg.png?v=1.0" alt="">
             </div>
         </div>
     </div>

view/yinmeng/home/index.html

@@ -156,7 +156,7 @@
   <script src="http://static.lkme.cc/linkedme.min.js"></script>
   <script src="./js/utf.js"></script>
   <script src="./js/swiper.min.js"></script>
-  <script src="./js/index.js?v=2.2"></script>
+  <script src="./js/index.js?v=2.3"></script>
 </body>
 
 </html>

view/yinmeng/home/js/index.js

@@ -50,9 +50,9 @@ $(function () {
   let version = checkVersion()
   //判断url参数是否是与渠道包名一致
   let androidUrl = null;
-  channelDict.hasOwnProperty(channelData) ? androidUrl = channelDict[channelData] : androidUrl = 'https://image.nnbc123.cn/yinmeng_official.apk';
+  channelDict.hasOwnProperty(channelData) ? androidUrl = channelDict[channelData] : androidUrl = 'https://yinmeng-1318633625.cos.ap-guangzhou.myqcloud.com/yinmeng_official.apk';
   // let iosUrl = 'http://doudouyue.com/8axv'   //ios企业包
-  let iosUrl = 'http://doudouyue.com/e8hdlr'   //ios企业包
+  let iosUrl = 'http://show.nnbc123.cn/sbz6'   //ios企业包
 //   let iosUrl = 'http://fir.gzmangguo.cn/sbz6'   //ios商店包
 
   $(document).ready(function () {

view/yinmeng/modules/identity/js/new.js

@@ -2,16 +2,46 @@
  * 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 () {
+    getInfoFromClient()
     var browser = checkVersion();
     var api = getUrlPrefix();
     var timer = null;
     var env = EnvCheck();
     var urlObj = getQueryString();
+    console.log(urlObj.uid);
+    if (urlObj.uid) {
+        sessionStorage.setItem("uid", urlObj.uid);
+        sessionStorage.setItem("ticket", urlObj.ticket);
+    }
     if (env == 'test') {
         var vConsole = new VConsole();
     }
@@ -21,7 +51,7 @@ $(function () {
         if (browser.android) {
             let channel = JSON.parse(pubInfo.deviceInfo).channel
             if (channel.indexOf('toutiao') != -1 || channel.indexOf('kuaishou') != -1) {
-        $('.appName').html('音游')
+                $('.appName').html('piko')
             }
         }
     }
@@ -38,79 +68,101 @@ $(function () {
 
         },
         getDeviceMsg: function () {
-      if (browser.app) {
+            // if (browser.app) {
-        if (browser.android) {
+            //     if (browser.android) {
-          info.uid = parseInt(window.androidJsObj.getUid());
+            //         pubInfo.uid = parseInt(window.androidJsObj.getUid());
-          info.deviceId = window.androidJsObj.getDeviceId();
+            //         pubInfo.deviceId = window.androidJsObj.getDeviceId();
-          info.ticket = window.androidJsObj.getTicket();
+            //         pubInfo.ticket = window.androidJsObj.getTicket();
-        } else {
+            //     } else {
-          info.uid = tools.cookieUtils.get("uid");
+            //         pubInfo.uid = tools.cookieUtils.get("uid");
-          if (!info.uid) {
+            //         if (!pubInfo.uid) {
-            window.webkit.messageHandlers.getUid.postMessage(null);
+            //             window.webkit.messageHandlers.getUid.postMessage(null);
-          }
+            //         }
-          window.webkit.messageHandlers.getDeviceId.postMessage(null);
+            //         window.webkit.messageHandlers.getDeviceId.postMessage(null);
-          window.webkit.messageHandlers.getTicket.postMessage(null);
+            //         window.webkit.messageHandlers.getTicket.postMessage(null);
-        }
+            //     }
-      } else {
+            // } else {
-        info.uid = 922473;
+            //     pubInfo.uid = 922473;
-        info.deviceId = "204aa0c983384f1e84a3625b4f04bac1";
+            //     pubInfo.deviceId = "204aa0c983384f1e84a3625b4f04bac1";
-      }
+            // }
 
             // setTimeout(function () {
-      //   $('.deviceId').val(info.deviceId);
+            //   $('.deviceId').val(pubInfo.deviceId);
             // },200)
         },
         getData: function () {
             console.log(urlObj, 'urlObj')
             if (urlObj) {
-        info.auth = urlObj.auth
+                pubInfo.auth = urlObj.auth
             } else {
-        info.auth = ''
+                pubInfo.auth = ''
             }
-      console.log(info.auth, 'info.auth')
+            console.log(pubInfo.auth, 'pubInfo.auth')
-      $.ajax({
+            networkRequest({
-        type: "get",
+                type: 'get',
-        url: api + "/certification/hasCertify",
+                url: urlPrefix + '/certification/hasCertify',
-        headers: {
-          "pub_ticket": info.ticket
-        },
                 data: {
-          uid: info.uid,
+                    uid: pubInfo.uid,
-          auth: info.auth,
+                    auth: pubInfo.auth,
-          ticket: info.ticket,
+                    ticket: pubInfo.ticket,
-
                 },
                 success: function (res) {
                     if (res.code == 200) {
                         var checkBol = res.data;
                         var $mask = $('.status-mask');
-            if (checkBol.authResult) {
+                        var bool = !(checkBol.authResult == null || checkBol.authResult == undefined);
-              console.log('已短信验证！')
+                        function successFun () {
-            } else if (checkBol.hasCertify && !checkBol.canCertify) {
+                            hideLoading(layerIndex)
-              console.log('已实名且没有机会了')
+                            goToPage = true;
-              $mask.addClass("have-identity");
-              $mask.find(".text").html("您已通过实名认证");
-              $mask.find(".tips").html("系统已成功审核您的实名认证");
-              $mask.show();
-            } else if (checkBol.hasCertify && checkBol.canCertify) {
-              console.log('已实名还有一次机会')
-              // var $mask = $('.status-mask');
                             $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 phone = `${$('.phone').val()}`;
                 var identityCode = $('.identity-code').val();
                 var agree = $('#agree').prop("checked");
                 if (!agree) {
@@ -150,67 +202,40 @@ $(function () {
                     return;
                 }
                 lockBol = true;
-
+                var metaInfo = window.getMetaInfo();
                 var requestParam = {
-          uid: info.uid,
+                    certType: 0,
-          username: encryptDes(name, "1ea53d260ecf11e7b56e00163e046a26"),
-          identityNumber: encryptDes(personId, "1ea53d260ecf11e7b56e00163e046a26"),
-          phone: encryptDes(phone, "1ea53d260ecf11e7b56e00163e046a26"),
                     code: identityCode,
-          ticket: info.ticket
+                    identityNumber: encryptDes(personId, "1ea53d260ecf11e7b56e00163e046a26"),
+                    metaInfo: JSON.stringify(metaInfo),
+                    phone: encryptDes( phone, "1ea53d260ecf11e7b56e00163e046a26"),
+                    returnUrl: urlPrefix + `/yinmeng/modules/identity/new.html?uid=${pubInfo.uid}&ticket=${pubInfo.ticket}`,
+                    uid: pubInfo.uid,
+                    username: encryptDes(name, "1ea53d260ecf11e7b56e00163e046a26"),
                 };
-        if (browser.android) {
+                networkRequest({
-          requestParam.deviceInfo = JSON.stringify({
+                    type: 'post',
-            deviceId: info.deviceId
+                    url: urlPrefix + '/certification/initFace',
-          });
-        }
-        $.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;
+                            window.location.href = res.data.certifyUrl;
-              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) {
-                $mask.addClass("failed");
-                $mask.find(".text").html("实名认证失败");
-                $mask.find(".tips").html("实名次数已达限制");
-              } 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.find(".tips").html(res.message);
-              }
                             $mask.show();
                             lockBol = false;
                             setTimeout(function () {
                                 $('.status-mask').hide();
                             }, 4000);
+                            lockBol = false;
                         }
+                    },
+                    error (err) {
+                        console.log(err);
                     }
-        });
+                })
-        // $.post(api + "/certification/doCheck",requestParam,function (res) {
-        //
-        // })
             })
 
             $('.button-identity-code').on('click', function () {
@@ -242,37 +267,31 @@ $(function () {
 
                 var requestParam = {
                     phone: encryptDes( phone, "1ea53d260ecf11e7b56e00163e046a26"),
-          uid: info.uid,
+                    uid: pubInfo.uid,
-          ticket: info.ticket
+                    ticket: pubInfo.ticket
                 };
 
                 if (browser.android) {
                     requestParam.deviceInfo = JSON.stringify({
-            deviceId: info.deviceId
+                        deviceId: pubInfo.deviceId
                     });
                 }
 
-        $.ajax({
+                networkRequest({
-          type: "post",
+                    type: 'post',
-          url: api + "/certification/send/code",
+                    url: urlPrefix + '/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) {
+                    error (err) {
-            toastShow(res.message);
+                        console.log(err);
-            console.log(res, '报错啦');
                     }
-        });
+                })
             })
 
             // 点击我要修改
@@ -306,23 +325,21 @@ function toastShow(text) {
 }
 
 function getMessage (key, value) {
-  info[key] = value;
+    pubInfo[key] = value;
 }
 
 
 function renderByStatus (status) {
     $mask.attr('class', 'status-mask');
     console.log("开始回调，" + "状态为" + status);
-  $.ajax({
+
+    networkRequest({
         type: 'post',
-    url: getUrlPrefix() + '/certification/notify',
+        url: urlPrefix + '/certification/notify',
-    headers: {
-      "pub_ticket": info.ticket
-    },
         data: {
-      uid: info.uid,
+            uid: pubInfo.uid,
-      ticket: info.ticket,
+            ticket: pubInfo.ticket,
-      token: info.token,
+            token: pubInfo.token,
             statusCode: status
         },
         success: function (res) {
@@ -355,8 +372,12 @@ function renderByStatus(status) {
                     }, 4000);
                 }
             }
+        },
+        error (err) {
+            console.log(err);
         }
-  });
+    })
+
     console.log('status', status);
 
 }
@@ -370,3 +391,11 @@ const encryptDes = (message, key) => {
     });
     return encrypted.toString();
 }
+
+$('.status-mask').click(function () {
+    if (goToPage) {
+        // window.location.href = urlPrefix + '/yinmeng/modules/identity/new.html'
+    } else {
+        $('.status-mask').hide();
+    }
+})

view/yinmeng/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">音萌</span>"的其他服务。</p>
+            <p>3.根据国家相关的法律法规，您需要提供您的真实身份信息（真实姓名、身份证号）、身份证正反面照片、面部信息以完成实名验证。您所提供的身份信息仅用于身份验证，未经您本人的许可不会被用于其他用途。这些信息属于个人敏感信息，我们将会尽可能的保护您个人敏感信息的安全。如果您不提供这些信息，您将不能使用提现等相关功能，但不影响您继续使用本产品的其他服务。</p>
             <p>4.为保护用户权益，开启实名认证后我们将不提供解除恢复的功能，请谅解。</p>
-            <p>5.一个身份证最多用于10个用户账号的实名认证。</p>
+            <p>5.一个身份证最多用于2个用户账号的实名认证。</p>
             <p>6.若人脸认证遇到问题，<a href="../rule/identity-rule.html">请点击这里</a></p>
         </div>
         <div class="button-submit">开始认证</div>
@@ -64,12 +64,12 @@
             </label>
         </div>
     </div>
-    <div class="toast">网络异常，请退出重进</div>
+    <div class="toast"></div>
     <div class="status-mask">
         <div class="wrapper">
             <div class="pic"></div>
-            <div class="text">fewf</div>
+            <div class="text"></div>
-            <div class="tips">fwefw</div>
+            <div class="tips"></div>
             <!-- <button class="goto-change hide">我要修改</button> -->
         </div>
     </div>
@@ -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=1.0"></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.3"></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("音萌");
-        }
-    </script>
 </body>
 
 </html>