Merge branch 'develop' of zhengxifeng/zc100 into master

template/pc/components/index/step.htm

@@ -227,20 +227,20 @@
 
                 <!--col-sm-6 col-sm-offset-3 form-box-->
                 <div class="form-box fb-t">
-                    <div class="form-gb">
-                        <div class="form-gb-con">
+                    <div class="form-gb" style="display: none;">
+                        <div class="form-gb-con" style="display: none;">
                             <img src="/template/pc/js/botstrap-step/laba.png"/>
                             <img src="/template/pc/js/botstrap-step/laba.png" />
 
 
                             {eyou:if condition='($is_mobile === false)'}
-                            <span style="width: 100%;">
+                            <span style="width: 100%;display: none;">
                                 最新公告：
                                 <font class="tib-li-end">河北建筑职称副高级破格已发布</font>
                                 <font id="getCode">（点击获取二维码）</font>
                             </span>
                             {eyou:else /}
-                            <span style="width: 100%;">
+                            <span style="width: 100%;display: none;">
                                 最新公告：
                                 <font class="tib-li-end">河北建筑职称副高级破格已发布</font><br/>
                                 <font id="getCode">（点击获取二维码）</font>
@@ -745,7 +745,7 @@
                                 <button type="button" class="btn btn-next">下一步</button>
 
 
-                                <button type="button" class="btn but-success but-success2">成功匹配示例</button>
+                                <button type="button" class="btn but-success">成功匹配示例</button>
 
                                 <div class="context-menu-arrow"></div>
 
@@ -966,7 +966,7 @@
                                         <input type="radio" class="form-control-radio" name="inlineRadioOptions2" id="inlineRadio22" value="option2"> 无
                                     </label>
                                 </div>-->
-                                <button type="button" class="btn btn-previous">上一步</button>
+                                <button type="button" class="btn btn-previous" id="jumpBtn2">上一步</button>
                                 <button type="button" class="btn btn-next" id="jumpBtn">下一步</button>
                             </div>
                         </fieldset>

template/pc/js/botstrap-step/scripts.js

@@ -186,15 +186,18 @@ jQuery(document).ready(function() {
                     });
 
                     if(html == ''){
-                        html = '暂无相关要求（2s后自动进行下一步）';
+                        html = '暂无相关要求（0.5s后自动进行下一步）';
                         //直接点击跳转下一步
                         //ajax异步是一个线程
                         //定时器也是一个独立线程
                         //ajax直接执行点击有问题 放到定时器里面即可
+                        $('#zss').attr('data','no');
                         setTimeout(function() {
                             $('#jumpBtn').trigger('click');
                             //$('#jumpBtn').parent().parent().hide();
-                        }, 2000);
+                        }, 500);  //大于400
+                    }else{
+                        $('#zss').attr('data','yes');
                     }
                     $('#zss').empty();
                     $('#zss').append(html);
@@ -264,7 +267,18 @@ jQuery(document).ready(function() {
         if($(this).index() == 6){
             //隐藏查询表单
             $('#sele-box').show();
-            $('.ssl-box').show();
+            //$('.ssl-box').show();
+        }
+
+        if($(this).index() == 4){
+            //判断是否空证书
+            var a = $('#zss').attr('data');
+            if(a == 'no'){
+                setTimeout(function() {
+                    $('#jumpBtn2').trigger('click');
+                    //$('#jumpBtn').parent().parent().hide();
+                }, 500); //大于400
+            }
         }
 
         $(this).parents('fieldset').fadeOut(400, function() {

template/pc/js/botstrap-step/style.css

@@ -34,6 +34,13 @@ h3 {
 img { max-width: 100%; }
 */
 
+
+@font-face {
+    font-family: "SourceHanSansCN";
+    src: url("/template/pc/js/botstrap-step/SourceHanSansCN-Medium.ttf");
+}
+
+
 ::-moz-selection { background: #3366ff; color: #fff; text-shadow: none; }
 ::selection { background: #3366ff; color: #fff; text-shadow: none; }
 
@@ -250,7 +257,7 @@ only screen and (                min-resolution: 2dppx) {
         font-size: 18px;
         color: #fff;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         /* font-weight: bold; */
         line-height: 24px;
         padding: 10px 0% 0 0;
@@ -279,7 +286,7 @@ only screen and (                min-resolution: 2dppx) {
         line-height: 65px;
         font-size: 28px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
 
     .form-top-left{
@@ -289,7 +296,7 @@ only screen and (                min-resolution: 2dppx) {
         color: #000;
         font-size: 16px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .form-top-right{
         padding: 0px 25px 0 25px;
@@ -306,20 +313,20 @@ only screen and (                min-resolution: 2dppx) {
         border:2px solid #ddd;
         background:#fff;
         color: #666;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     input[type="text"], input[type="password"], textarea, textarea.form-control{
         height: 43px;
         border:2px solid #ddd;
         background:#fff;
         color: #666;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     button.btn{
         height: 37px;
         background:#3366ff;
         line-height: 37px;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .registration-form button.btn{
         margin-top:10px;
@@ -365,20 +372,20 @@ only screen and (                min-resolution: 2dppx) {
     #ffnp{
         width: 100%;
         float: left;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     #cx-rel-code{
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     #sele-box input[type="text"], input[type="password"], textarea, textarea.form-control{
         height: 37px;
         border:2px solid #ddd;
         background:#fff;
         color: #666;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .form-info-t{
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         color: #666;
         font-size: 14px;
     }
@@ -428,7 +435,7 @@ only screen and (                min-resolution: 2dppx) {
     .ssl-box-t p{
         font-size: 15px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .ssl-box-b{
         width: 90%;
@@ -440,13 +447,13 @@ only screen and (                min-resolution: 2dppx) {
     .ssl-box-b .p-con{
         font-size: 15px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         padding: 20px 25px 10px 25px;
     }
     .ssl-box-b .p-con2{
         font-size: 15px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         padding: 0px 25px;
     }
     #sele-box{
@@ -532,7 +539,7 @@ only screen and (                min-resolution: 2dppx) {
         color: #fff;
         font-size: 16px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .form-gb-con img{
         width: 12px;
@@ -597,7 +604,7 @@ only screen and (                min-resolution: 2dppx) {
         text-align: center;
         font-size: 17px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         color: #fff;
     }
     .ssl-list-t font{
@@ -627,7 +634,7 @@ only screen and (                min-resolution: 2dppx) {
         display: block;
         text-align: center;
         color: #fff;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         float: left;
         margin-left: 0;
         font-size: 14px;
@@ -660,7 +667,7 @@ only screen and (                min-resolution: 2dppx) {
         display: block;
         text-align: center;
         color: #fff;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         float: left;
         margin-left: 0;
         font-size: 14px;
@@ -707,16 +714,16 @@ only screen and (                min-resolution: 2dppx) {
 
     .modal-dialog{
         margin-top: 82px;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
     .modal-title{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
 
     #zy_box{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
 
     #zys{
@@ -735,7 +742,7 @@ only screen and (                min-resolution: 2dppx) {
         margin-top:5px;
         cursor: pointer;
         position: relative;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
 
     .hjk:after {
@@ -755,25 +762,25 @@ only screen and (                min-resolution: 2dppx) {
     }
 
     .control-label{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
     #zss{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         padding-left: 2px !important;
     }
 
     .form-top-left p span{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         font-weight: bold;
     }
 
     .panel-body{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
     .list-group a{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
     .form-t-e{
@@ -788,7 +795,7 @@ only screen and (                min-resolution: 2dppx) {
     }
     .ta-info-detail{
         width:100%;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         font-size: 15px;
         font-weight: bold;
@@ -796,7 +803,7 @@ only screen and (                min-resolution: 2dppx) {
 
     .ta-list-li-box{
         width:100%;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         margin-bottom:5px;
     }
@@ -862,7 +869,7 @@ only screen and (                min-resolution: 2dppx) {
     }
 
     .zklp{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: red;
         cursor: pointer;
         position: relative;
@@ -918,7 +925,7 @@ only screen and (                min-resolution: 2dppx) {
         display: block;
         float: left;
         width:85%;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         margin: 5px 0;
         line-height: 25px;
@@ -935,7 +942,7 @@ only screen and (                min-resolution: 2dppx) {
     .nav-tabs li a{
         height: 30px;
         line-height: 8px !important;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         font-size: 13px !important;
     }
@@ -945,7 +952,7 @@ only screen and (                min-resolution: 2dppx) {
     .result-div{
         margin-bottom: 5px;
         display: block;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
 
     .form-top-left{
@@ -983,14 +990,14 @@ only screen and (                min-resolution: 2dppx) {
         color: #000;
         font-size: 16px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .ftl-r{
         width:100%;float: left;
         color: #000;
         font-size: 16px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         margin-top: 5px;
     }
     .form-t-e{
@@ -1059,7 +1066,7 @@ only screen and (                min-resolution: 2dppx) {
         font-size: 26px;
         color: #fff;
         font-weight: 400;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         /*        font-weight: bold;*/
         line-height: 40px;
         padding:0 10%;
@@ -1087,7 +1094,7 @@ only screen and (                min-resolution: 2dppx) {
         line-height: 65px;
         font-size: 36px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
 
     .form-top-left{
@@ -1097,7 +1104,7 @@ only screen and (                min-resolution: 2dppx) {
         color: #000;
         font-size: 16px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .form-top-right{
         padding: 0px 25px 0 25px;
@@ -1114,20 +1121,20 @@ only screen and (                min-resolution: 2dppx) {
         border:2px solid #ddd;
         background:#fff;
         color: #666;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     input[type="text"], input[type="password"], textarea, textarea.form-control{
         height: 43px;
         border:2px solid #ddd;
         background:#fff;
         color: #666;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     button.btn{
         height: 37px;
         background:#3366ff;
         line-height: 37px;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .registration-form button.btn{
         margin-top:10px;
@@ -1172,17 +1179,17 @@ only screen and (                min-resolution: 2dppx) {
         float: left;
     }
     #cx-rel-code{
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     #sele-box input[type="text"], input[type="password"], textarea, textarea.form-control{
         height: 37px;
         border:2px solid #ddd;
         background:#fff;
         color: #666;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .form-info-t{
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         color: #666;
         font-size: 14px;
     }
@@ -1214,7 +1221,7 @@ only screen and (                min-resolution: 2dppx) {
         top:0;
         left: 50%;
         margin-left: 286px;
-        display: block;
+        display: none;
     }
     .ssl-box-t{
         width: 90%;
@@ -1227,7 +1234,7 @@ only screen and (                min-resolution: 2dppx) {
     .ssl-box-t p{
         font-size: 15px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .ssl-box-b{
         width: 90%;
@@ -1239,13 +1246,13 @@ only screen and (                min-resolution: 2dppx) {
     .ssl-box-b .p-con{
         font-size: 15px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         padding: 20px 25px 10px 25px;
     }
     .ssl-box-b .p-con2{
         font-size: 15px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         padding: 0px 25px;
     }
     #sele-box{
@@ -1323,7 +1330,7 @@ only screen and (                min-resolution: 2dppx) {
         color: #fff;
         font-size: 17px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .form-gb-con img{
         width: 18px;
@@ -1350,7 +1357,7 @@ only screen and (                min-resolution: 2dppx) {
         text-align: center;
         font-size: 17px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         color: #fff;
     }
     .ssl-list-t font{
@@ -1370,7 +1377,7 @@ only screen and (                min-resolution: 2dppx) {
         display: block;
         text-align: center;
         color: #fff;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         float: left;
         margin-left: 0;
         font-size: 14px;
@@ -1403,7 +1410,7 @@ only screen and (                min-resolution: 2dppx) {
         display: block;
         text-align: center;
         color: #fff;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
         float: left;
         margin-left: 0;
         font-size: 14px;
@@ -1450,16 +1457,16 @@ only screen and (                min-resolution: 2dppx) {
 
     .modal-dialog{
         margin-top: 200px;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
     .modal-title{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
 
     #zy_box{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
 
     #zys{
@@ -1478,7 +1485,7 @@ only screen and (                min-resolution: 2dppx) {
         margin-top:5px;
         cursor: pointer;
         position: relative;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
 
     .hjk:after {
@@ -1498,25 +1505,25 @@ only screen and (                min-resolution: 2dppx) {
     }
 
     .control-label{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
     #zss{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         padding-left: 2px !important;
     }
 
     .form-top-left p span{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         font-weight: bold;
     }
 
     .panel-body{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
     .list-group a{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
     }
     .form-t-e{
@@ -1531,7 +1538,7 @@ only screen and (                min-resolution: 2dppx) {
     }
     .ta-info-detail{
         width:100%;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         font-size: 15px;
         font-weight: bold;
@@ -1539,7 +1546,7 @@ only screen and (                min-resolution: 2dppx) {
 
     .ta-list-li-box{
         width:100%;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         margin-bottom:5px;
     }
@@ -1605,7 +1612,7 @@ only screen and (                min-resolution: 2dppx) {
     }
 
     .zklp{
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: red;
         cursor: pointer;
         position: relative;
@@ -1653,7 +1660,7 @@ only screen and (                min-resolution: 2dppx) {
         display: block;
         float: left;
         width:71%;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         margin: 5px 0;
     }
@@ -1669,7 +1676,7 @@ only screen and (                min-resolution: 2dppx) {
     .nav-tabs li a{
         height: 30px;
         line-height: 8px !important;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
         color: #000;
         font-size: 13px !important;
     }
@@ -1679,7 +1686,7 @@ only screen and (                min-resolution: 2dppx) {
     .result-div{
         margin-bottom: 5px;
         display: block;
-        font-family: "黑体", sans-serif !important;
+        font-family: "SourceHanSansCN", sans-serif !important;
     }
 
     .form-top-left{
@@ -1690,14 +1697,14 @@ only screen and (                min-resolution: 2dppx) {
         color: #000;
         font-size: 16px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     .ftl-r{
         width:50%;float: left;
         color: #000;
         font-size: 16px;
         font-weight: bold;
-        font-family: "黑体", sans-serif;
+        font-family: "SourceHanSansCN", sans-serif;
     }
     #zss .form-control-static{
         display: block;