零工改动

app/admin/view/user/userform.html

@@ -255,9 +255,9 @@
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label">教育经历</label>
+							<label class="layui-form-label">个人描述</label>
 							<div class="layui-input-block">
-								<textarea name="eduexperience" placeholder="请输入教育经历" class="layui-textarea">{$user.eduexperience}</textarea>
+								<textarea name="eduexperience" placeholder="请输入个人描述" class="layui-textarea">{$user.eduexperience}</textarea>
 							</div>
 						</div>
 

app/admin/view/user/userlist.html

@@ -207,7 +207,7 @@
                     { field: 'jobintention_text', title: '求职意向', minWidth: 100, align: 'center' },
 
                     { field: 'address', title: '居住地', minWidth: 100, align: 'center' },
-                    { field: 'eduexperience', title: '教育经历', minWidth: 100, align: 'center' },
+                    { field: 'eduexperience', title: '个人描述', minWidth: 100, align: 'center' },
 
 
 					{ field: 'user_part_count', title: '推广人数', minWidth: 100, align: 'center' },

app/agent/view/user/userform.html

@@ -214,7 +214,7 @@
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label">教育经历</label>
+							<label class="layui-form-label">个人描述</label>
 							<div class="layui-input-block">
 								<textarea name="eduexperience" placeholder="请输入..." class="layui-textarea">{$user.eduexperience}</textarea>
 							</div>

app/common.php

@@ -507,7 +507,7 @@ function http_request($url, $method = "GET", $postfields = null, $headers = [])
  * @param string $file excel文件
  * @param string $crop
  * @param string $sheet
- * @return string   返回解析数据
+ * @return array   返回解析数据
  * @throws PHPExcel_Exception
  * @throws PHPExcel_Reader_Exception
  */

app/common/model/User.php

@@ -44,7 +44,9 @@ class User extends Model
 	// 设置字段自动转换类型
 	protected $type = [
 		'bankcard'		=> 'json',
-		'createtime'	=> 'timestamp:Y-m-d H:i:s'
+		'createtime'	=> 'timestamp:Y-m-d H:i:s',
+		'emp_time'		=> 'json',
+		'com_cate'		=> 'json',
 	];
 	protected $jsonAssoc = true;
 	

app/dataTable.sql

@@ -238,7 +238,7 @@ CREATE TABLE IF NOT EXISTS `echo_user` (
 	`createtime` int(10) NOT NULL DEFAULT '0' COMMENT '创建时间',
 	`jobintention` text NOT NULL COMMENT '求职意向',
 	`workexperience` text NOT NULL COMMENT '工作经验',
-	`eduexperience` text NOT NULL COMMENT '教育经历',
+	`eduexperience` text NOT NULL COMMENT '个人描述',
 	`followstatus` tinyint(4) NOT NULL DEFAULT '1' COMMENT '跟进状态：1未跟进，2未面试，3面试通过，4面试未通过，5用户放弃，6已入职，7已离职',
 	`wxampcode` varchar(255) NOT NULL COMMENT '推广小程序码',
 	`bankcard` varchar(1000) NOT NULL DEFAULT '' COMMENT '银行卡信息',

app/mainapp/controller/Index.php

@@ -2,6 +2,8 @@
 
 namespace app\mainapp\controller;
 
+use app\common\model\ComjobsCate;
+use app\common\model\RensheCode;
 use app\common\model\Worder;
 use app\common\model\WorkerThird;
 use app\mainapp\BaseController;
@@ -142,5 +144,20 @@ class Index extends BaseController
 
     }
 
+    public function getRensheCode()
+    {
+        $type = input('type','');
+        if (empty($type)) {
+            page_result(0, "", []);
+        }
+
+        $list = RensheCode::getList($type);
+        page_result(0, "", $list);
+    }
 
+    public function getComCate()
+    {
+        $catelist   = ComjobsCate::order(['priority' => 'desc', 'id' => 'desc'])->select();
+        page_result(0, "", $catelist);
+    }
 }

app/mainapp/controller/My.php

@@ -3,7 +3,6 @@ namespace app\mainapp\controller;
 
 use app\common\model\UserWill;
 use app\mainapp\BaseController;
-use think\facade\Session;
 
 use app\common\model\Param as ParamModel;
 use app\common\model\User as UserModel;
@@ -13,6 +12,7 @@ use app\common\model\UserIntegral as UserIntegralModel;
 use app\common\model\UserParam as UserParamModel;
 use app\common\model\UserPart as UserPartModel;
 use app\common\model\UserRank as UserRankModel;
+use app\common\model\ComjobsLog as ComjobsLogModel;
 
 use app\common\model\Worker as WorkerModel;
 use app\common\model\Agent as AgentModel;
@@ -479,4 +479,14 @@ class My extends BaseController
             'head2' => $head2,
         ));
     }
+
+    public function gettipnum()
+    {
+        $userid = input('userid/d');
+
+        $comjobs_num = ComjobsLogModel::where('userid',$userid)->whereIn('status',[2,3,4])->count();
+        page_result(0, "", array(
+            'comjobs_num' => $comjobs_num,
+        ));
+    }
 }

app/mainapp/controller/Wlogin.php

@@ -55,9 +55,11 @@ class Wlogin extends BaseController
             if (empty($picone)) {
                 page_result(1, "相关证件不能为空。");
             }
+        } elseif ($wtype == 1) {
+            //个人注册，默认姓名为公司名
+            $title = $realname;
         }
 
-
         $data   = [
             'userid'     => $userid,
             'wtype'      => $wtype,

app/worker/view/user/userform.html

@@ -208,9 +208,9 @@
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label">教育经历</label>
+							<label class="layui-form-label">个人描述</label>
 							<div class="layui-input-block">
-								<textarea name="eduexperience" placeholder="请输入教育经历" class="layui-textarea">{$user.eduexperience}</textarea>
+								<textarea name="eduexperience" placeholder="请输入个人描述" class="layui-textarea">{$user.eduexperience}</textarea>
 							</div>
 						</div>