Merge branch 'develop' of zhengxifeng/zc100 into master

application/admin/controller/ZcwdPosition.php

@@ -61,6 +61,8 @@ class ZcwdPosition extends Base
             ->order('pid asc, id asc')
             ->select();
 
+        $temp_id = 0;
+        $t_color = '#000';
         foreach ($list as $k => $v) {
 
             /*
@@ -97,6 +99,14 @@ class ZcwdPosition extends Base
                 $v['type_name'] = 'HTML代码';
             }*/
 
+            //处理颜色
+            if((int)$temp_id !== (int)$v['type']){
+                $red = mt_rand(0, 255);
+                $green = mt_rand(0, 255);
+                $blue = mt_rand(0, 255);
+                $t_color = sprintf("#%02x%02x%02x", $red, $green, $blue);
+            }
+            $temp_id = (int)$v['type'];
 
             //处理图片
             $v['ad'] = [];
@@ -123,7 +133,7 @@ class ZcwdPosition extends Base
                 ->find();
 
             $v['type_name'] = $one['name'];
-
+            $v['color'] = $t_color;
             $list[$k] = $v;
         }
 

application/admin/controller/ZcwePosition.php

@@ -17,7 +17,7 @@ use think\Page;
 use think\Db;
 use think\Cache;
 
-class ZcwePosition extends Base
+class  ZcwePosition extends Base
 {
     private $ad_position_system_id = array(); // 系统默认位置ID，不可删除
 
@@ -99,6 +99,15 @@ class ZcwePosition extends Base
                 $v['type_name'] = 'HTML代码';
             }*/
 
+            //处理颜色
+            if((int)$temp_id !== (int)$v['type']){
+                $red = mt_rand(0, 255);
+                $green = mt_rand(0, 255);
+                $blue = mt_rand(0, 255);
+                $t_color = sprintf("#%02x%02x%02x", $red, $green, $blue);
+            }
+            $temp_id = (int)$v['type'];
+
 
             //处理图片
             $v['ad'] = [];
@@ -125,7 +134,7 @@ class ZcwePosition extends Base
                 ->find();
 
             $v['type_name'] = $one['name'];
-
+            $v['color'] = $t_color;
             $list[$k] = $v;
         }
 

application/admin/controller/ZcwfPosition.php

@@ -99,6 +99,14 @@ class ZcwfPosition extends Base
                 $v['type_name'] = 'HTML代码';
             }*/
 
+            //处理颜色
+            if((int)$temp_id !== (int)$v['type']){
+                $red = mt_rand(0, 255);
+                $green = mt_rand(0, 255);
+                $blue = mt_rand(0, 255);
+                $t_color = sprintf("#%02x%02x%02x", $red, $green, $blue);
+            }
+            $temp_id = (int)$v['type'];
 
             //处理图片
             $v['ad'] = [];
@@ -125,7 +133,7 @@ class ZcwfPosition extends Base
                 ->find();
 
             $v['type_name'] = $one['name'];
-
+            $v['color'] = $t_color;
             $list[$k] = $v;
         }
 

application/admin/controller/ZczsPosition.php

@@ -279,6 +279,7 @@ class ZczsPosition extends Base
                 'type'        => $post['type'], //职称地区  全国或者地区
                 'intro'       => $post['intro'], //备注
                 'admin_id'    => session('admin_id'),
+                'bdxl' => $post['bdxl'], //绑定学历
                 'lang'        => $this->admin_lang,
                 'add_time'    => getTime(),
                 'update_time' => getTime(),
@@ -482,6 +483,7 @@ class ZczsPosition extends Base
                     'title'       => trim($post['title']),
                     'type'        => $post['type'], //全国或者地区
                     'intro'       => $post['intro'],
+                    'bdxl' => $post['bdxl'], //绑定学历
                     'update_time' => getTime(),
                 );
                 $resultID = Db::name('zczs_position')->update($data);

application/admin/template/zcwd_position/index.htm

@@ -125,9 +125,9 @@
                                 </td>
 
                                 <td align="left" style="width:100%;">
-                                    <div class="tl text-l10">
+                                    <div class="tl text-l10" style="color:{$vo.color}">
                                         {eq name="$Think.const.CONTROLLER_NAME.'@edit'|is_check_access" value="1"}
-                                            <a href="javascript:void(0);" data-href="{:url('ZcwdPosition/edit',array('id'=>$vo['id']))}" data-closereload="1" onclick="openFullframe(this, '编辑广告', '100%', '100%');">{$vo.title}</a>
+                                            <a href="javascript:void(0);" data-href="{:url('ZcwdPosition/edit',array('id'=>$vo['id']))}" data-closereload="1" onclick="openFullframe(this, '编辑广告', '100%', '100%');" style="color:{$vo.color}">{$vo.title}</a>
                                         {else /}
                                             {$vo.title}
                                         {/eq}

application/admin/template/zcwe_position/index.htm

@@ -120,9 +120,9 @@
                                 </td>
 
                                 <td align="left" style="width:100%;">
-                                    <div class="tl text-l10">
+                                    <div class="tl text-l10" style="color:{$vo.color}">
                                         {eq name="$Think.const.CONTROLLER_NAME.'@edit'|is_check_access" value="1"}
-                                            <a href="javascript:void(0);" data-href="{:url('ZcwdPosition/edit',array('id'=>$vo['id']))}" data-closereload="1" onclick="openFullframe(this, '编辑广告', '100%', '100%');">{$vo.title}</a>
+                                            <a href="javascript:void(0);" data-href="{:url('ZcwdPosition/edit',array('id'=>$vo['id']))}" data-closereload="1" onclick="openFullframe(this, '编辑广告', '100%', '100%');" style="color:{$vo.color}">{$vo.title}</a>
                                         {else /}
                                             {$vo.title}
                                         {/eq}

application/admin/template/zcwf_position/index.htm

@@ -122,9 +122,9 @@
                                 </td>
 
                                 <td align="left" style="width:100%;">
-                                    <div class="tl text-l10">
+                                    <div class="tl text-l10" style="color:{$vo.color}">
                                         {eq name="$Think.const.CONTROLLER_NAME.'@edit'|is_check_access" value="1"}
-                                            <a href="javascript:void(0);" data-href="{:url('ZcwdPosition/edit',array('id'=>$vo['id']))}" data-closereload="1" onclick="openFullframe(this, '编辑广告', '100%', '100%');">{$vo.title}</a>
+                                            <a href="javascript:void(0);" data-href="{:url('ZcwdPosition/edit',array('id'=>$vo['id']))}" data-closereload="1" onclick="openFullframe(this, '编辑广告', '100%', '100%');" style="color:{$vo.color}">{$vo.title}</a>
                                         {else /}
                                             {$vo.title}
                                         {/eq}

application/admin/template/zczs_position/add.htm

@@ -84,6 +84,29 @@
                 </dd>
             </dl>
 
+            <dl class="row" id="citychoose" style="display: block;">
+                <dt class="tit"> <label for="title"><em>*</em>绑定学历</label> </dt>
+                <dd class="opt">
+
+                    <select name="bdxl" class="select" id="selectTest2" style="margin:0px 5px;height:30px;">
+                        <?php
+                        /*<option value="{$field1.id}" {eq name="$pid" value="$field1.id"}selected{/eq}>{$field1.name}</option>*/
+                        ?>
+                        <option value="0">选择学历</option>
+                        <option value="1">中专</option>
+                        <option value="2">高技</option>
+                        <option value="3">大专</option>
+                        <option value="4">本科</option>
+                        <option value="5">硕士</option>
+                        <option value="6">博士</option>
+                    </select>
+
+                    <span class="err"></span>
+                    <p class="notic2 red" id="title_tips"></p>
+                </dd>
+            </dl>
+
+
             <dl class="row" id="citychoose" style="display: none;">
                 <dt class="tit"> <label for="title"><em>*</em>地区选择</label> </dt>
                 <dd class="opt">

application/admin/template/zczs_position/edit.htm

@@ -89,6 +89,29 @@
 
 
 
+            <dl class="row" id="citychoose" style="display: block;">
+                <dt class="tit"> <label for="title"><em>*</em>绑定学历</label> </dt>
+                <dd class="opt">
+
+                    <select name="bdxl" class="select" id="selectTest999" style="margin:0px 5px;height:30px;">
+                        <?php
+                        /*<option value="{$field1.id}" {eq name="$pid" value="$field1.id"}selected{/eq}>{$field1.name}</option>*/
+                        ?>
+                        <option value="0" {eq name="$field.bdxl" value="0"}selected{/eq}>选择学历</option>
+                        <option value="1" {eq name="$field.bdxl" value="1"}selected{/eq}>中专</option>
+                        <option value="2" {eq name="$field.bdxl" value="2"}selected{/eq}>高技</option>
+                        <option value="3" {eq name="$field.bdxl" value="3"}selected{/eq}>大专</option>
+                        <option value="4" {eq name="$field.bdxl" value="4"}selected{/eq}>本科</option>
+                        <option value="5" {eq name="$field.bdxl" value="5"}selected{/eq}>硕士</option>
+                        <option value="6" {eq name="$field.bdxl" value="6"}selected{/eq}>博士</option>
+                    </select>
+
+                    <span class="err"></span>
+                    <p class="notic2 red" id="title_tips"></p>
+                </dd>
+            </dl>
+
+
             <dl class="row" id="citychoose" style="display: none;" >
                 <dt class="tit"> <label for="title"><em>*</em>地区选择</label> </dt>
                 <dd class="opt">

application/api/controller/Diyajax.php

@@ -214,18 +214,30 @@ class Diyajax extends Base
     {
         $param = request()->param();
         $param['id'] = (int)$param['id'];
+        $param['xl'] = (int)$param['xl'];
+
         if(!empty($param['id'])){
             $map_ids = Db::name('zc_zs')
                 ->where('zc_id', $param['id'])
                 ->where('is_del', 0)
                 ->column('map_id');
+
             //调用等级
             $list = Db::name('zczs_position')
                 ->where('id','in',$map_ids)
                 ->where('is_del', 0)
                 ->where('status', 1)
                 ->select();
-            respose(['code'=>1, 'msg'=>'请求成功', 'data'=>$list]);
+
+            $new_list = [];
+            foreach ($list as $k=>$v){
+                if((int)$v['bdxl'] >= (int)$param['xl']){
+                    //保留
+                    $new_list[] = $v;
+                }
+            }
+
+            respose(['code'=>1, 'msg'=>'请求成功', 'data'=>$new_list]);
         }else{
             respose(['code'=>0, 'msg'=>'请求失败', 'data'=>[]]);
         }

template/pc/components/index/kop.htm

@@ -151,7 +151,7 @@ $tyu_num = 1;
                 <td><?php echo $xl[$detail['xl']];?></td>
                 <td>
                     <?php
-                    if($field2['xlyq'] == $detail['xl']){
+                    if($field2['xlyq'] <= $detail['xl']){
                         //echo "<font style='color: blue;'>符合</font>";
                         echo '<font class="td-r"><img src="/template/pc/js/botstrap-step/img_6.png" /></font>';
                         $num++;

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

@@ -158,6 +158,8 @@ jQuery(document).ready(function() {
                 return false;
             }
 
+            var xl = $('#choose5').val();
+
             //调用证书
             $('#loadingModal').modal('show');
             $.ajax({
@@ -165,7 +167,8 @@ jQuery(document).ready(function() {
                 method: 'POST',
                 dataType: 'json', // 指定响应数据为JSON
                 data: {
-                    id: a
+                    id: a,
+                    xl: xl,
                 },
                 success: function (data) {
                     // 请求成功后隐藏加载状态