Merge branch 'develop' of zhengxifeng/zc100 into master

application/api/controller/Diyajax.php

@@ -556,6 +556,7 @@ class Diyajax extends Base
             'byzy_is' => $param['byzy-is'],
             'byzy_name' => $param['byzy-name'],
             'sbzyson' => $param['sbzyson'],
+            'diqu' => '<div></div>',
         ];
         $res_id = Db::name('zc_form')->insertGetId($insertData);
         if($res_id > 0){
@@ -657,6 +658,7 @@ class Diyajax extends Base
                     'is_tg' => (int)$param['is_tg'],
                     'jjfa' => $param['jjfa'],
                     'xy_info' => $param['xy_info'],
+                    'diqu' => $param['diqu'],
                 ];
                 //更新表单数据
                 $list = Db::name('zc_form')
@@ -675,7 +677,7 @@ class Diyajax extends Base
     {
         $list = Db::name('zc_form')
             //->where('pccs', 1) //同一号码 只调用一次
-            ->field('id,ch,sjhm,is_tg,jjfa,extend')
+            ->field('id,ch,sjhm,is_tg,jjfa,extend,diqu')
             ->where('is_del', 0)
             ->where('pccs', '>',0)
             ->order('updatetime desc')
@@ -687,10 +689,21 @@ class Diyajax extends Base
         foreach ($list as $key => $item) {
             $item['is_tg_n'] = $item['is_tg'];
             $extend_info = json_decode($item['extend'],true);
-            $item['sbxx'] = $extend_info['sbzy'].$extend_info['sbdj'];
-            $item['sjhm'] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $item['sjhm']);
-            $item['is_tg'] = $is_tg_str[$item['is_tg']];
+            $item['sbxx'] = $extend_info['sbdj'];
+            //$item['sjhm'] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $item['sjhm']);
+            $item['sjhm'] = $extend_info['sbzy'];
+            //$item['is_tg'] = $is_tg_str[$item['is_tg']];
+
+            if($item['diqu'] != '<div></div>'){
+                $diqu = explode('地区',$item['diqu']);
+            }
+
+
+            //$item['diqu'] = $diqu[0];
+            $item['is_tg'] = $diqu[0];
+            //var_dump($item['is_tg']);
             $list[$key] = $item;
+
         }
         $zrs = $list[0]['id'] + 1000;
         respose(['code'=>1, 'msg'=>'请求成功', 'data'=>$list,'zrs'=>$zrs]);

template/pc/components/index/kop.htm

@@ -659,6 +659,7 @@ $tyu_num = 1;
 <!--以下输出结果-->
 <?php
     //var_dump($is_list_empty);
+    $result_map_add = '<div></div>';
 ?>
 {eyou:if condition='(empty($is_list_empty))'}
     <?php
@@ -678,11 +679,13 @@ $tyu_num = 1;
         $result_map = "<font class='result-div'>抱歉!未找到完全符合条件的地区!</font>";
         $class = 'alert-danger';
         $is_tg = 0;
+        $result_map_add = '<div></div>';
     }else{
         //$result_map;
         $info = "<font class='result-div'>找到以下条件完全符合申请的地区:</font>";
         $class = 'alert-success';
         $is_tg = 1;
+        $result_map_add = $result_map;
     }
     ?>
     <div class="alert {$class}" role="alert" style="margin-top:10px;display: block;margin-bottom:8px;">

template/pc/components/index/step.htm

@@ -262,7 +262,7 @@
                             <div class="ssl-list-b">
                                 <div class="ti">
                                     <span class="sp1">姓名</span>
-                                    <span class="sp2">手机号码</span>
+                                    <span class="sp2">申报专业</span>
                                     <span class="sp3">申报等级</span>
                                     <span class="sp4">匹配结果</span>
                                 </div>
@@ -360,7 +360,7 @@
 
                     <!--成功示例--->
                     <div class="ssl-box">
-                        <div class="ssl-box-t">
+                        <div class="ssl-box-t" style="display: none;">
 
                             <p>匹配成功结果展示：</p>
                             <p>
@@ -408,7 +408,7 @@
                                     <tr>
                                         <td>年龄</td>
                                         <td>不限制</td>
-                                        <td>30岁</td>
+                                        <td>34岁</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>-->
@@ -416,9 +416,44 @@
                                     <tr>
                                         <td>毕业专业</td>
                                         <td>不限制</td>
-                                        <td>无</td>
+                                        <td>与申报类目一致</td>
                                         <td class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></td>
                                     </tr>
+                                    <tr>
+                                        <td>毕业专业</td>
+                                        <td>不限制</td>
+                                        <td>与申报类目一致</td>
+                                        <td class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td>学校类型</td>
+                                        <td>全日制</td>
+                                        <td>全日制</td>
+                                        <td class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td>毕业时间</td>
+                                        <td>要求>=10年</td>
+                                        <td>已毕业12年</td>
+                                        <td class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td>前置证书</td>
+                                        <td>不限制</td>
+                                        <td>一建证书
+                                            (拥有8年)
+                                            中级职称
+                                            (拥有4年)
+                                        </td>
+                                        <td class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></td>
+                                    </tr>
+
+                                    <tr>
+                                        <td>综合评估</td>
+                                        <td colspan="3" style="vertical-align:middle;">
+                                            <font style="color: blue;">完全符合要求!</font>
+                                        </td>
+                                    </tr>
                                     </tbody>
                                    <!-- <tfoot>
                                     <tr>
@@ -682,6 +717,7 @@
                                         'is_tg' => $is_tg,
                                         'jjfa' => $extend_info['sbzy'].$extend_info['sbdj'].'[协助申报]',
                                         'xy_info' => json_encode($str_no_err,JSON_UNESCAPED_UNICODE),
+                                        'diqu' => $result_map_add
                                     ];
                             }else{
                                 $yy = [];
@@ -701,6 +737,7 @@
                                     'is_tg' => $is_tg,
                                     'jjfa' => $yy[0], /*//不符合 总有原因**/
                                     'xy_info' => json_encode($str_no_err,JSON_UNESCAPED_UNICODE),
+                                    'diqu' => $result_map_add
                                 ];
                             }
                             /*var_dump($param_k);*/

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

@@ -439,10 +439,10 @@ only screen and (                min-resolution: 2dppx) {
     }
     .ssl-box-b{
         width: 90%;
-        height: 220px;
+        height: 455px;
         border-radius: 5px;
         background: #fff;
-        margin-top: 8px;
+        margin-top: 0px;
     }
     .ssl-box-b .p-con{
         font-size: 15px;
@@ -644,13 +644,13 @@ only screen and (                min-resolution: 2dppx) {
         font-weight: bold;
     }
     .sp1{
-        width: 13%;
+        width: 20%;
     }
     .sp2{
         width: 24%;
     }
     .sp3{
-        width: 43%;
+        width: 36%;
     }
     .sp4{
         width: 20%;
@@ -1238,10 +1238,10 @@ only screen and (                min-resolution: 2dppx) {
     }
     .ssl-box-b{
         width: 90%;
-        height: 220px;
+        height: 455px;
         border-radius: 5px;
         background: #fff;
-        margin-top: 8px;
+        margin-top: 0px;
     }
     .ssl-box-b .p-con{
         font-size: 15px;
@@ -1299,7 +1299,7 @@ only screen and (                min-resolution: 2dppx) {
         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;
@@ -1387,13 +1387,13 @@ only screen and (                min-resolution: 2dppx) {
         font-weight: bold;
     }
     .sp1{
-        width: 13%;
+        width: 20%;
     }
     .sp2{
         width: 24%;
     }
     .sp3{
-        width: 43%;
+        width: 36%;
     }
     .sp4{
         width: 20%;