Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

public/themes/default/views/app/index.blade.php

@@ -203,7 +203,7 @@
                 </div>
                 <div class="clear"></div>
                 <div class="top_link_box">
-                    <a href="{{route('declare')}}" class="link_item link1" target="_blank">
+                    <a href="https://rencai.jucai.gov.cn/login.html" class="link_item link1" target="_blank">
                         <div class="link_bg"></div>
                         <div class="link_txt">人才综合服务<br/>申报平台</div>
                     </a>

public/themes/default/views/app/recruit/sign_up.blade.php

@@ -767,12 +767,7 @@
                             </td>
                             <td valign="center" colspan="4" >
                                 <el-form-item prop="special_condition">
-                                    <el-select v-model="user.special.condition" placeholder="请选择您符合的加分条件" @change="postChange" :disabled="special_switch">
-                                        <el-option label="无" value="无"></el-option>
-                                        <el-option label="退役军人" value="退役军人"></el-option>
-                                        <el-option label="获得三等功的退役军人" value="获得三等功的退役军人"></el-option>
-                                        <el-option label="获得二等功及以上的退役军人" value="获得二等功及以上的退役军人"></el-option>
-                                    </el-select>
+                                    <el-input v-model="user.special.condition" placeholder="请输入您符合的加分条件"></el-input>
 
                                 </el-form-item>
                             </td>