Merge branch 'develop' of zhengxifeng/zc100 into master

template/mobile-bak3/users/pay_recharge_detail.htm

@@ -83,7 +83,7 @@
                                     <a  href="javascript:void(0);" class="show-detail" data-showhide="hide" onclick="showOrderDetail(this);">订单详情<i class="iconfont"></i></a>
                                 </div>
                             </div>
-                            <i class="iconfont icon-right">√</i>
+                            <i class="iconfont icon-right"><img src="/template/pc/js/botstrap-step/img_6.png" /></i>
                             <div class="order-detail J_showOrderDetail" id="J_showOrderDetail">
                                 <ul>
                                     <li class="clearfix">

template/pc-bak2/users/pay_recharge_detail.htm

@@ -83,7 +83,7 @@
                                     <a  href="javascript:void(0);" class="show-detail" data-showhide="hide" onclick="showOrderDetail(this);">订单详情<i class="iconfont"></i></a>
                                 </div>
                             </div>
-                            <i class="iconfont icon-right">√</i>
+                            <i class="iconfont icon-right"><img src="/template/pc/js/botstrap-step/img_6.png" /></i>
                             <div class="order-detail J_showOrderDetail" id="J_showOrderDetail">
                                 <ul>
                                     <li class="clearfix">

template/pc/components/index/kop.htm

@@ -153,10 +153,10 @@ $tyu_num = 1;
                     <?php
                     if($field2['xlyq'] == $detail['xl']){
                         //echo "<font style='color: blue;'>符合</font>";
-                        echo '<font class="td-r">√</font>';
+                        echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                         $num++;
                     }else{
-                        echo '<font class="td-b">x</font>';
+                        echo '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                         //echo "<font style='color: red;'>不符合</font>";
                         $str_no_err[$field['id']][$field2['id']]['xlyq'] = '学历不符';
                     }
@@ -181,15 +181,15 @@ $tyu_num = 1;
                 <td>
                     <?php
                     if((int)$field2['is_ega'] === 0){
-                        echo '<font class="td-r">√</font>';
+                        echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                         $num++;
                     }else{
                         if((int)$detail['nl'] <= (int)$field2['ega_1'] && (int)$detail['nl'] >= (int)$field2['ega_0']){
                             //echo "<font style='color: blue;'>符合</font>";
-                            echo '<font class="td-r">√</font>';
+                            echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                             $num++;
                         }else{
-                            echo '<font class="td-b">x</font>';
+                            echo '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                             //echo "<font style='color: red;'>不符合</font>";
                             $str_no_err[$field['id']][$field2['id']]['nl'] = '年龄不符';
                         }
@@ -257,23 +257,23 @@ $tyu_num = 1;
                     <?php
                     if((int)$field2.byzy === 0 || empty($zhengshu2)){
                         //echo "<font style='color: blue;'>符合</font>";
-                        echo '<font class="td-r">√</font>';
+                        echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                         $num++;
                     }else{
                         if(empty($zhengshu)){
-                            echo '<font class="td-b">x</font>';
+                            echo '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                             //echo "<font style='color: red;'>不符合</font>";
                             $str_no_err[$field['id']][$field2['id']]['byzy'] = '专业不符';
                         }else{
                             //$run = "<font style='color: red;'>不符合</font>";
-                            $run = '<font class="td-b">x</font>';
+                            $run = '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                             $str_no_err[$field['id']][$field2['id']]['byzy'] = '专业不符';
                             $ik = 1;
                             foreach ($zhengshu as $k => $v){
                                 if(in_array($v,$zhengshu2)){
                                     //$run = '<font style="color: blue;">符合</font><br/>'.$ik.'项';
                                     //$run = '<font style="color: blue;">符合</font><br/>';
-                                    $run = '<font class="td-r">√</font>';
+                                    $run = '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                                     $str_no_err[$field['id']][$field2['id']]['byzy'] = '';
                                     $ik++;
                                 }
@@ -312,18 +312,18 @@ $tyu_num = 1;
                     {eyou:if condition='((int)$field2.xxlx === 0)'}
                     <!--<font style='color: blue;'>符合</font>-->
                     <?php
-                    echo '<font class="td-r">√</font>';
+                    echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                     $num++;
                     ?>
                     {eyou:else /}
                     <?php
                     if((int)$field2['xxlx'] === (int)$detail['xxlx']){
                         //echo "<font style='color: blue;'>符合</font>";
-                        echo '<font class="td-r">√</font>';
+                        echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                         $num++;
                     }else{
                         //echo "<font style='color: red;'>不符合</font>";
-                        echo '<font class="td-b">x</font>';
+                        echo '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                         $str_no_err[$field['id']][$field2['id']]['xxlx'] = '学校类型不符';
                     }
                     ?>
@@ -366,16 +366,16 @@ $tyu_num = 1;
                     <?php
                     if((int)$field2['bysj'] === 0){
                         //echo "<font style='color: blue;'>符合</font>";
-                        echo '<font class="td-r">√</font>';
+                        echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                         $num++;
                     }else{
                         if((int)$field2['bysj_time'] <= $interval->y){
                             //echo "<font style='color: blue;'>符合</font>";
-                            echo '<font class="td-r">√</font>';
+                            echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                             $num++;
                         }else{
                             //echo "<font style='color: red;'>不符合</font>";
-                            echo '<font class="td-b">x</font>';
+                            echo '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                             $str_no_err[$field['id']][$field2['id']]['bysj'] = '毕业时间不符';
                         }
                     }
@@ -472,13 +472,13 @@ $tyu_num = 1;
                     //表示没查出限制要求
                     if(empty($zhengshu3)){
                         //echo "<font style='color: blue;'>符合</font>";
-                        echo '<font class="td-r">√</font>';
+                        echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                         $num++;
                     }else{
                         if(empty($zhengshu)){
                             //用户没有证书
                             //echo "<font style='color: red;'>不符合</font>";
-                            echo '<font class="td-b">x</font>';
+                            echo '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                             $str_no_err[$field['id']][$field2['id']]['xxlx'] = '未拥有证书';
                         }else{
                             //判断是否包含
@@ -531,14 +531,14 @@ $tyu_num = 1;
                                 if(($ik-1) === $ik4){
                                     ////echo "<font style='color: blue;'>符合1</font>";
                                     //$res = "<font style='color: blue;'>符合</font>";
-                                    $res = '<font class="td-r">√</font>';
+                                    $res = '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                                     $num++;
                                     //跳出循环 已经符合其中 一个 且了
                                     break;
                                 }else{
                                     ////echo "<font style='color: red;'>不符合2</font>";
                                     //$res = "<font style='color: red;'>不符合</font>";
-                                    $res = '<font class="td-b">x</font>';
+                                    $res = '<font class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></font>';
                                     $str_no_err[$field['id']][$field2['id']]['xxlx'] = '证书要求不符';
                                 }
                             }

template/pc/components/index/step.htm

@@ -403,19 +403,21 @@
                                         <td>学历</td>
                                         <td>本科</td>
                                         <td>本科</td>
-                                        <td class="td-r">√</td>
+                                        <td class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></td>
                                     </tr>
                                     <tr>
                                         <td>年龄</td>
                                         <td>不限制</td>
                                         <td>30岁</td>
-                                        <td class="td-r">√</td> <!--<td class="td-b">x</td>-->
+                                        <td class="td-r">
+                                            <img src="/template/pc/js/botstrap-step/img_6.png" />
+                                        </td> <!--<td class="td-b"><img src="/template/pc/js/botstrap-step/img_7.png" /></td>-->
                                     </tr>
                                     <tr>
                                         <td>毕业专业</td>
                                         <td>不限制</td>
                                         <td>无</td>
-                                        <td class="td-r">√</td>
+                                        <td class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></td>
                                     </tr>
                                     </tbody>
                                    <!-- <tfoot>

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

@@ -490,10 +490,10 @@ only screen and (                min-resolution: 2dppx) {
         color: #000;
     }
     .ssl-box-b .p-con2 tr td:nth-child(2){
-        padding-left: 23px;
+        /*padding-left: 23px;*/
     }
     .ssl-box-b .p-con2 tr td:nth-child(3){
-        padding-left: 23px;
+        /*padding-left: 23px;*/
     }
     .ssl-box-b .p-con2 tr td:nth-child(4){
         text-align: center;
@@ -507,6 +507,12 @@ only screen and (                min-resolution: 2dppx) {
         font-size: 15px;
         font-weight: bold;
     }
+    .td-r img{
+        width: 12px;
+    }
+    .td-b img{
+        width: 12px;
+    }
     .form-gb{
         width: 100%;
         height: 45px;
@@ -532,7 +538,7 @@ only screen and (                min-resolution: 2dppx) {
         width: 12px;
         height: 12px;
         vertical-align: middle;
-        margin-top: -2px;
+        margin-top: -4px;
     }
 
     .modal-dialog .ssl-box-t{
@@ -964,7 +970,7 @@ only screen and (                min-resolution: 2dppx) {
     }
     #zss select{
         height: 24px;
-        width: 60px;
+        width: 65px;
     }
     #zss input{
         height: 24px;

template/pc/users/pay_recharge_detail.htm

@@ -83,7 +83,7 @@
                                     <a  href="javascript:void(0);" class="show-detail" data-showhide="hide" onclick="showOrderDetail(this);">订单详情<i class="iconfont"></i></a>
                                 </div>
                             </div>
-                            <i class="iconfont icon-right">√</i>
+                            <i class="iconfont icon-right"><img src="/template/pc/js/botstrap-step/img_6.png" /></i>
                             <div class="order-detail J_showOrderDetail" id="J_showOrderDetail">
                                 <ul>
                                     <li class="clearfix">