Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/portalStaticPage

@@ -165,21 +165,6 @@
     background-color: #F26363;
     opacity: 0.8;
 }
-.layui-layer-btn {
-    position: relative;
-    top: 50px;
-    left: -153px;
-}
-.layui-layer-btn0 {
-    width: 120px!important;
-    height: 42px!important;
-    text-align: center;
-    line-height: 42px!important;
-    font-size: 16px;
-}
-.layui-layer-content {
-    height: auto!important;
-}
 .dialog_con li {
     line-height: 36px;
     color: #303030;

@@ -290,7 +290,7 @@ div.footer .system_service ul li a:hover {
     left: 0;
     top: -5px;
     font-size: 14px;
-    /* color: #fff; */
+    color: #fff;
 }
 /* --------------进度条美化---------------- */
 ::-webkit-scrollbar {
@@ -421,5 +421,34 @@ div.footer .system_service ul li a:hover {
     min-height: calc(100vh - 520px);
 }
 
-
+.layui-layer-content {
+    height: auto!important;
+}
 /* 0091FF */
+.layui-layer-content .userList{
+    width: 50%;
+    display: inline-block;
+    margin:  10px 0;
+    font-size: 14px;
+    box-sizing: border-box;
+    padding: 0 20px;
+}
+.layui-layer-content .userList:last-child {
+    margin-bottom: 60px;
+}
+.layui-layer-content .userList input {
+    width: 16px;
+    height: 16px;
+    margin-right: 5px;
+    position: relative;
+    top: 3px;
+    cursor: pointer;
+}
+/*  */
+.layui-layer-title {
+    background-color: #1E9FFF!important;
+    color: #fff!important;
+}
+.layui-layer-btn {
+    text-align: center;
+}
\ No newline at end of file

@@ -39,4 +39,24 @@
 .sms_authentication div input {
     display: inline-block;
     width: 85%;
+}
+.phone {
+    display: inline-block;
+    white-space: nowrap;
+}
+.phone input {
+    width: 65%!important;
+}
+.captcha, .num {
+    border: 1px solid #dedede;
+    border-radius: 23px;
+    cursor: pointer;
+    font-size: 12px;
+    color: #6e7172;
+    text-align: center;
+    line-height: 23px;
+    display: inline-block;
+}
+.num {
+    display: none;
 }
\ No newline at end of file

 
+layui.use('element', function () {
+    let element = layui.element;
+});
 $(function () {
-    layui.use('element', function () {
-        let element = layui.element;
-    });
     addTabs('#wssq');
     setFristStepPageFLow(GetQueryString('ywid'), GetQueryString('businessno'));
     // 业务

@@ -3,7 +3,9 @@ $(function () {
     });
 
     addTabs('#wssq')
-    setAcceptFlow(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
+    setAcceptFlow(GetQueryString('bsm_slsq'), GetQueryString('businessno'));
+    list = getApplyRecord(GetQueryString('bsm_slsq'), GetQueryString('businessno'));
+    console.log(list)
     Webcam.set({
         width: 320,
         height: 240,
@@ -22,8 +24,8 @@ function take_snapshot() {
     });
 }
 //下一步事件
-function skipClick(){
-    if(_SFYz()) {
+function skipClick() {
+    if (_SFYz() && list.sqfs == '2') {
         $.ajax({
             type: "post",  //提交方式  
             url: portal.api_url + "/portal/FillInformation/ToZRF",//路径  
@@ -34,13 +36,34 @@ function skipClick(){
             }),
             //数据，这里使用的是Json格式进行传输  
             success: function (result) {//返回数据根据结果进行相应的处理   
-                if (result.code == 200 ) {
-                    skipNextPage(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
-                }        
+                if (result.code == 200) {
+                    skipNextPage(GetQueryString('bsm_slsq'), GetQueryString('businessno'));
+                }
             }
         });
+    } else {
+        skipNextPage(GetQueryString('bsm_slsq'), GetQueryString('businessno'));
     }
 }
+// 验证码
+
+$(".captcha").click(function () {
+    $(".captcha").hide()
+    $(".num").show()
+    var second = 30
+    $(".num").text((second) + "秒")
+    var interval = setInterval(function () {
+        second--
+        $(".num").text((second) + "秒")
+        if (second === -1) {
+            $(".captcha").text("重发验证码")
+            clearInterval(interval)
+            $(".num").hide()
+            $(".captcha").show()
+        }
+    }, 1000)
+})
+
 // 身份验证
 function _SFYz() {
     var isVerification;
@@ -52,14 +75,14 @@ function _SFYz() {
         async: false,
         data: JSON.stringify({
             "dhhm": $('#phone').val(),
-            "yzm":  $('#code').val(),
+            "yzm": $('#code').val(),
             "bsmSlsq": GetQueryString('bsm_slsq')
         }),
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理           
-            if (result.code == 200 ) {
+            if (result.code == 200) {
                 isVerification = true
-            }else {
+            } else {
                 isVerification = false
             }
         }

@@ -176,6 +176,43 @@ function setAcceptFlow(bsmSlsq, businessNo) {
 
 //跳转下一个环节页面
 function skipNextPage(bsm_slsq, businessno) {
+    let stepNo = getStep();
+    if (business.sqfs == '2' && business.zrffqhj && business.zrffqhj == stepNo) {
+        isApplicationBoth('78978979','renchao',bsm_slsq, businessno)
+    }else {
+        fetchStepNo(bsm_slsq, businessno)
+    }
+    // var nextStepIndex;
+    // $.each(business.stepList, function (index, item) {
+    //     if (item.stepState == 1) {
+    //         nextStepIndex = index + 1;
+    //         return;
+    //     }
+    // });
+    // var datajson = {
+    //     "bsmSlsq": bsm_slsq,
+    //     "businessNo": businessno,
+    //     "stepNo": business.stepList[nextStepIndex].stepno
+    // };
+    // //更新当前流程所处环节
+    // $.ajax({
+    //     type: "post",  //提交方式  
+    //     contentType: 'application/json',
+    //     url: portal.api_url + "/portal/FillInformation/updateStepNo",//路径  
+    //     dataType: "json",
+    //     async: false,
+    //     data: JSON.stringify(datajson),
+    //     //数据，这里使用的是Json格式进行传输  
+    //     success: function (result) {//返回数据根据结果进行相应的处理
+    //         if (result.code == 200) {
+    //             window.location.href = portal.rootPath + business.stepList[nextStepIndex].pageurl + "?bsm_slsq=" + bsm_slsq + "&businessno=" + businessno+ "&stepno=" +business.stepList[nextStepIndex].stepno;
+    //         }
+    //     }
+    // });
+}
+
+// 下一步更新流程环节
+function fetchStepNo(bsm_slsq,businessno) {
     var nextStepIndex;
     $.each(business.stepList, function (index, item) {
         if (item.stepState == 1) {
@@ -199,11 +236,96 @@ function skipNextPage(bsm_slsq, businessno) {
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理
             if (result.code == 200) {
-                window.location.href = portal.rootPath + business.stepList[nextStepIndex].pageurl + "?bsm_slsq=" + bsm_slsq + "&businessno=" + businessno;
+                window.location.href = portal.rootPath + business.stepList[nextStepIndex].pageurl + "?bsm_slsq=" + bsm_slsq + "&businessno=" + businessno+ "&stepno=" +business.stepList[nextStepIndex].stepno;
             }
         }
     });
 }
 
 
+// 获取当前的环节
+function getStep() {
+    var stepNo;
+    $.each(business.stepList, function (index, item) {
+        if (item.stepState == 1) {
+            stepNo = item.stepno;
+        }
+    });
+    return stepNo;
+}
 
+//跳转下一个环节之前判断是否双方申请-获取转入放信息
+function isApplicationBoth(hth, userid, bsm_slsq, businessno) {
+    $.ajax({
+        type: "get",
+        url: portal.api_url + "/portal/ApplyBusinessService/getZRF",
+        dataType: "json",
+        data: {
+            "hth": hth,
+            "userid": userid,
+        },
+        success: function (result) {
+            if (result.code == 200) {
+                layuiOpen(result.data ,bsm_slsq, businessno)
+            }
+        }
+    });
+}
+
+//绘制单个div
+function setDiv(item){
+    var div = '<li class="userList"><input type="radio" name="list" zrfName="'+item.zrfName+'" value="'+item.zrfIDCard+'"><span>姓名：</span>'+item.zrfName+'</li>'+
+        '<li class="userList"><span>身份证号：</span>'+item.zrfIDCard+'</li>'
+    return div
+}
+// 转给转入方进行流转
+function layuiOpen(data ,bsm_slsq, businessno){
+    var html = ''
+    for (var i = 0; i < data.length; i++) {
+        html += setDiv(data[i])
+    }
+    layui.use("layer", function () {
+        layer.open({
+            type:1,
+            title: '转入方信息',
+            area: ['500px', '270px'],
+            scrollbar: false,
+            btn: ['确定'],
+            yes: function () {
+                if($('input:radio[name="list"]:checked').attr('value')==undefined) {
+                    layer.msg('请先选择转入方');
+                    return;
+                }else {
+                    ToZRF(bsm_slsq, '1',$('input:radio[name="list"]:checked').attr('value'),$('input:radio[name="list"]:checked').attr('zrfName'), businessno)
+                }
+            },
+            content: html
+        });
+    });
+}
+
+// 转给转入方进行流转
+function ToZRF(bsmSlsq, zjzl, zrfIDCard, zrfName, businessno) {
+    $.ajax({
+        type: "post",  //提交方式  
+        url: portal.api_url + "/portal/ApplyBusinessService/ToZRF",//路径  
+        dataType: "json",
+        headers:{'Content-Type':'application/json;charset=utf8'},
+        data: JSON.stringify({
+            "bsmSlsq": bsmSlsq,
+            "zjzl": zjzl,
+            "zrfIDCard": zrfIDCard,
+            "zrfName": zrfName
+        }),
+        //数据，这里使用的是Json格式进行传输  
+        success: function (result) {//返回数据根据结果进行相应的处理
+            if (result.code == 200) {
+                layer.msg(result.message);
+                setTimeout(function(){
+                    layer.closeAll();
+                    fetchStepNo(bsmSlsq, businessno);
+                },1000)
+            }
+        }
+    });
+}
\ No newline at end of file

@@ -38,9 +38,11 @@
                 </div>
                 <div class="sms_authentication">
                     <h5>短信认证</h5>
-                    <div>
+                    <div class="phone">
                         <span>手机号</span>
                         <input type="tel" id="phone" name="phone" placeholder="请输入手机号" class="layui-input">
+                        <span class="captcha">获取验证码</span>
+                        <span class="num"></span>
                     </div>
                     <div>
                         <span>验证码</span>