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

app/Services/Auth/RegisterService.php

@@ -98,7 +98,23 @@ class RegisterService
     public function registerCompany(array $data)
     {
         $data                    = array_only($data, ['companyname', 'contact', 'company_mobile', 'username',
-                                                      'email', 'company_password', 'utype', 'reg_type', 'reg_source', 'landline_tel']);
+                                                      'email', 'company_password', 'utype', 'reg_type', 'reg_source', 'landline_tel','company_type']);
+        switch (intval($data['company_type'])){
+            case 1:
+                $data['is_renshe'] = 1;
+                break;
+            case 2:
+                $data['is_ic'] = 1;
+                break;
+            case 3:
+                $data['is_health'] = 1;
+                break;
+            case 4:
+                $data['is_edu'] = 1;
+                break;
+            default:
+                $data['is_renshe'] = 1;
+        }
         $data['reg_source_cn']   = $this->getRegSource($data['reg_source']);
         $data['reg_time']        = time();
         $data['short_name']      = \Illuminate\Support\Str::substr($data['companyname'], 0, 25);

public/themes/default/assets/mobile/css/common.css

@@ -166,7 +166,7 @@ u{text-decoration:none;}
 .plist-txt .describe{position:relative;float:left;height:100%;border-bottom:1px #F2F2F2 solid;width:3.9rem;text-align:right;color:#999999;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;}
 .plist-txt a.describe{text-decoration:none;}
 .plist-txt .describe input{width:4.35rem;height:100%;border:0px;text-align:right;background:transparent;padding-right:0.65rem;outline:0;-webkit-text-size-adjust:none;tap-highlight-color:rgba(0,0,0,.05);-webkit-tap-highlight-color:rgba(0,0,0,.05);-ms-tap-highlight-color:rgba(0,0,0,.05);}
-.plist-txt .describe select{width:3.6rem;height:100%;position:absolute;top:0;right:0;z-index:1;opacity:.01;}
+.plist-txt .describe select{width:3.6rem;height:100%;position:absolute;top:0;right:0;z-index:1;border: none;}
 .plist-txt .describe .browseFile{position:absolute;top:0;left:0;width:100%;height:100%;opacity:0;}
 .plist-txt .describe .p-radio{vertical-align:middle;width:.35rem;height:.35rem;}
 .plist-txt .describe .selectdiv{width:100%;height:100%;position:relative}

public/themes/default/views/app/auth/register_company.blade.php

@@ -34,12 +34,26 @@
                     </div>
                     <div class="td2 J_showtip_box"><div for="companyname" generated="true" class="tip" style="display: none;"><div class="ftxt">名称与企业营业执照保持一致</div><div class="fimg"></div></div></div>
                 </div>
+                <div class="J_validate_group">
+                    <div class="td1" >
+                        <select name="company_type" id="member_status_mobile" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:30px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
+                            <option value="0" selected="selected">────&nbsp;请选择企业/单位类型&nbsp;────</option>
+                            <option value="1" >────&nbsp;现代产业体系企业&nbsp;────</option>
+                            <option value="2" >────&nbsp;集成电路体系企业&nbsp;────</option>
+                            <option value="3" >────&nbsp;卫生健康单位&nbsp;────</option>
+                            <option value="4" >────&nbsp;高等教育学校&nbsp;────</option>
+                        </select>
+                    </div>
+                    <div class="td2 J_showtip_box"></div>
+                    <div class="clear"></div>
+                </div>
                 <div class="J_validate_group">
                     <div class="td1">
                         <input class="input_295_34" name="contact" id="contact" type="text" placeholder="请输入企业联系人" autocomplete="off">
                     </div>
                     <div class="td2 J_showtip_box"></div>
                 </div>
+
                 <div class="J_validate_group">
                     <div class="td1">
                         <div class="tel_td1">

public/themes/default/views/mobile/app/auth/register_company.blade.php

@@ -25,12 +25,27 @@
                 <div class="describe font12"><input type="text" name="companyname" id="companyname" placeholder="请输入公司全称"></div>
                 <div class="clear"></div>
             </div>
+            <div class="list_height plist-txt notarrow">
+                <div class="pic"></div>
+                <div class="tit font14">类型</div>
+                <div class="describe font12">
+                    <select name="company_type" id="company_type" class="l-input font14">
+                        <option value="0" selected="selected">请选择企业/单位类型</option>
+                        <option value="1">现代产业体系企业</option>
+                        <option value="2">集成电路体系企业</option>
+                        <option value="3">卫生健康单位</option>
+                        <option value="4">高等教育学校</option>
+                    </select>
+                </div>
+                <div class="clear"></div>
+            </div>
             <div class="list_height plist-txt notarrow">
                 <div class="pic"></div>
                 <div class="tit font14">联系人</div>
                 <div class="describe font12"><input type="text" name="contact" id="contact" placeholder="请输入公司联系人"></div>
                 <div class="clear"></div>
             </div>
+
             <div class="list_height plist-txt notarrow">
                 <div class="pic"></div>
                 <div class="tit font14">手机号</div>