注册流程

app/common/Constant.php

@@ -4,12 +4,15 @@ namespace app\common;
 
 class Constant
 {
-    const SEX       = ['保密', '男', '女'];
-    const MARRY     = ['未婚', '离异', '丧偶'];
-    const TYPE      = ['交朋友', '找知己', '谈恋爱', '结婚'];
-    const EDUCATION = ['本科以下', '本科', '硕士', '博士'];
+    const SEX          = ['保密', '男', '女'];
+    const MARRY        = ['未婚', '离异', '丧偶'];
+    const TYPE         = ['交朋友', '找知己', '谈恋爱', '结婚'];
+    const EDUCATION    = ['本科以下', '本科', '硕士', '博士'];
+    const TINYINT      = ['保密', '是', '否'];
+    const COND_TINYINT = ['不限', '是', '否'];
 //    const JOB = ['销售','IT工程师','教授','在校学生','产品经理','总经理','副总/总监','部门经理','中层管理','企业家','个体老板','高级干部','公务员','律师','医生','护士','专家学者','工程师','设计师','艺术家','演员','模特','离/退休','技术员','服务员','普通员工','自由职业','无业'];
     const INCOME = ['保密', '5万以下', '5-10万', '10-20万', '20-30万', '30-50万', '50-100万', '100万以上'];
+    const COND_INCOME = ['不限', '5万以下', '5-10万', '10-20万', '20-30万', '30-50万', '50-100万', '100万以上'];
     const NATION = ['汉族', '藏族', '朝鲜族', '蒙古族', '回族', '满族', '维吾尔族', '壮族', '彝族', '苗族', '其他民族'];
     const FAITH  = ['无宗教信仰', '大乘佛教显宗', '大乘佛教密宗', '小乘佛教', '道教', '儒教', '基督教天主教派', '基督教东正教派', '基督教新教派', '犹太教', '伊斯兰教什叶派', '伊斯兰教逊尼派', '印度教', '神道教', '萨满教', '其他宗教信仰'];
     const SMOKE  = ['不吸，很反感', '不吸烟，但不反感', '社交时偶尔吸烟', '烟不离手'];
@@ -18,11 +21,12 @@ class Constant
 //    const TOPHOME = ['独生子女','老大','老二','老三','老四','老五','其他'];
 //    const WANTCHILD = ['愿意','不愿意','视情况而定'];
 //    const LIVEPARENT = ['愿意','不愿意','视情况而定'];
-    const FAMILY       = ['爷爷', '奶奶', '外公', '外婆', '父亲', '母亲', '哥哥', '弟弟', '姐姐', '妹妹'];
-    const TALENT_LEVEL = ['第一层次', '第二层次', '第三层次', '第四层次', '第五层次', '第六层次', '第七层次', '其他人才', '不是人才'];
-    const NATIVE       = ['晋江籍', '非晋江籍', '无要求'];
-    const HIGH         = ['保密', 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200];
-    const WEIGHT       = ['保密', 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100];
+    const ID_TYPE = ['公务员', '事业单位', '职工', '合同工', '编外人员', '企业高管'];
+    const FAMILY  = ['爷爷', '奶奶', '外公', '外婆', '父亲', '母亲', '哥哥', '弟弟', '姐姐', '妹妹'];
+//    const TALENT_LEVEL = ['第一层次', '第二层次', '第三层次', '第四层次', '第五层次', '第六层次', '第七层次', '其他人才', '不是人才'];
+    const NATIVE = ['晋江籍', '非晋江籍', '无要求'];
+    const HIGH   = ['保密', 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200];
+    const WEIGHT = ['保密', 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100];
 
     /**
      * 年龄范围
@@ -41,9 +45,4 @@ class Constant
      */
     const MIN_WEIGHT = ['不限', 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100];
     const MAX_WEIGHT = ['不限', 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100];
-
-    /**
-     * 推荐部门
-     */
-    const DEPARTMENT = ['福建省晋华集成电路有限公司','晋江市教育局', '其他'];
 }

app/love/controller/LoginController.php

@@ -31,13 +31,8 @@ class LoginController extends HomeBaseController
                 }
                 //完善资料
                 if ($user['is_complete'] == 2) {
-                    $apply = ActiveApplyModel::where('user_id', $userId)->find();
-                    if (!empty($apply)) {
-                        $this->redirect(cmf_url('love/register/active') . '?id=' . $apply['active_id']);
-                    }
-
-                    if (empty($user['sex'])) {
-                        $this->redirect(cmf_url('love/register/sex'));
+                    if (empty($user['idcard'])) {
+                        $this->redirect(cmf_url('love/register/idcard'));
                     } else {
                         $this->redirect(cmf_url('love/register/intro'));
                     }
@@ -68,8 +63,8 @@ class LoginController extends HomeBaseController
             $user = UserModel::create([
                 'user_type'   => 2,
                 'open_id'     => $open_id,
-                'username'    => $param['nickname'],
-                'avatar'      => $param['headimgurl'],
+//                'username'    => $param['nickname'],
+//                'avatar'      => $param['headimgurl'],
                 'create_time' => time(),
             ]);
             UserMatingModel::create(['user_id' => $user['id']]);

app/love/controller/LoveBaseController.php

@@ -51,50 +51,12 @@ class LoveBaseController extends HomeBaseController
         }
         //完善资料
         if ($this->user['is_complete'] == 2) {
-            $apply = ActiveApplyModel::where('user_id', $userId)->find();
-            if (!empty($apply)) {
-                $this->redirect(cmf_url('love/register/active') . '?id=' . $apply['active_id']);
-            }
-
-            if (empty($this->user['sex'])) {
-                $this->redirect(cmf_url('love/register/sex'));
+            if (empty($this->user['idcard'])) {
+                $this->redirect(cmf_url('love/register/idcard'));
             } else {
                 $this->redirect(cmf_url('love/register/intro'));
             }
         }
-        /*if (empty($this->user['sex'])) {
-            $this->redirect(cmf_url('love/register/sex'));
-        }
-        if (empty($this->user['main_image'])) {
-            $this->redirect(cmf_url('love/register/intro'));
-        }
-        if (empty($this->user['birthday'])) {
-            $this->redirect(cmf_url('love/register/profile'));
-        }
-        if (empty($this->user['marry'])) {
-            $this->redirect(cmf_url('love/register/profile'));
-        }
-        if (empty($this->user['education'])) {
-            $this->redirect(cmf_url('love/register/profile'));
-        }
-        if (empty($this->user['high'])) {
-            $this->redirect(cmf_url('love/register/profile'));
-        }
-        if (empty($this->user['weight'])) {
-            $this->redirect(cmf_url('love/register/profile'));
-        }
-        if (empty($this->user['job'])) {
-            $this->redirect(cmf_url('love/register/profile'));
-        }
-        if (empty($this->user['income'])) {
-            $this->redirect(cmf_url('love/register/profile'));
-        }*/
-
-        //择偶要求
-        /*$this->mating = UserMatingModel::get(['user_id'=>$userId]);
-        if (empty($this->mating['marry'])) {
-            $this->redirect(cmf_url('love/register/cond'));
-        }*/
 
         //分享页面
         $wx_api_sign = Wechat::instance()->getJsSign(Request::url(true));

app/love/controller/MyController.php

@@ -114,15 +114,16 @@ class MyController extends LoveBaseController
         $this->assign('user', json_encode($user));
 
         $data = [
-            'high'         => Constant::HIGH,
-            'weight'       => Constant::WEIGHT,
-            'talent_level' => Constant::TALENT_LEVEL,
-            'education'    => Constant::EDUCATION,
-            'income'       => Constant::INCOME,
-            'nation'       => Constant::NATION,
-            'smoke'        => Constant::SMOKE,
-            'drink'        => Constant::DRINK,
-            'family'       => Constant::FAMILY,
+            'high'      => Constant::HIGH,
+            'weight'    => Constant::WEIGHT,
+            'education' => Constant::EDUCATION,
+            'income'    => Constant::INCOME,
+            'nation'    => Constant::NATION,
+            'smoke'     => Constant::SMOKE,
+            'drink'     => Constant::DRINK,
+            'family'    => Constant::FAMILY,
+            'id_type'   => Constant::ID_TYPE,
+            'tinyint'   => Constant::TINYINT,
         ];
         foreach ($data as &$v) {
             $v = json_encode($v);
@@ -137,8 +138,9 @@ class MyController extends LoveBaseController
      */
     public function profilePost()
     {
-        $param             = $this->request->post();
-        $param['birthday'] = strtotime($param['birthday']);
+        $param                  = $this->request->post();
+        $param['user_nickname'] = $param['realname'];
+        $param['birthday']      = strtotime($param['birthday']);
         UserModel::update($param, ['id' => cmf_get_current_user_id()]);
         $this->success('操作成功');
     }
@@ -160,10 +162,13 @@ class MyController extends LoveBaseController
             'max_high'   => Constant::MAX_HIGH,
             'min_weight' => Constant::MIN_WEIGHT,
             'max_weight' => Constant::MAX_WEIGHT,
-            'marry'      => Constant::MARRY,
-            'education'  => $education,
             'native'     => Constant::NATIVE,
-            'income'     => Constant::INCOME,
+            'education'  => $education,
+            'income'     => Constant::COND_INCOME,
+            'id_type'    => Constant::ID_TYPE,
+            'smoke'      => Constant::SMOKE,
+            'drink'      => Constant::DRINK,
+            'tinyint'    => Constant::COND_TINYINT,
         ];
         foreach ($data as &$v) {
             $v = json_encode($v);
@@ -199,8 +204,9 @@ class MyController extends LoveBaseController
      */
     public function introPost()
     {
-        $param = $this->request->post();
-        UserModel::update($param, ['id' => cmf_get_current_user_id()], 'main_image,main_image_thumb,signature');
+        $param           = $this->request->post();
+        $param['avatar'] = $param['main_image_thumb'];
+        UserModel::update($param, ['id' => cmf_get_current_user_id()], ['avatar', 'main_image', 'main_image_thumb', 'signature']);
 
         $this->success('操作成功');
     }

app/love/controller/RegisterController.php

@@ -11,8 +11,10 @@
 namespace app\love\controller;
 
 use app\common\Constant;
+use app\common\Fun;
 use app\common\Wechat;
 use app\love\model\ActiveModel;
+use app\love\model\UserAuthModel;
 use app\love\model\UserMatingModel;
 use app\love\model\UserModel;
 use cmf\controller\HomeBaseController;
@@ -46,6 +48,43 @@ class RegisterController extends HomeBaseController
         return $this->fetch();
     }
 
+    public function audit()
+    {
+        return $this->fetch();
+    }
+
+    public function idcard()
+    {
+        $user = UserModel::get(cmf_get_current_user_id());
+        if ($this->request->isPost()) {
+            $idcard = $this->request->post('idcard');
+            if (empty($idcard)) {
+                $this->error('请输入身份证号');
+            }
+
+            $auth = UserAuthModel::where('idcard', $idcard)->find();
+            if (empty($auth)) {
+                $this->error('抱歉，您不在注册列表中，如需注册请联系妇联');
+            }
+
+            $user->realname     = $auth['name'];
+            $user->idcard       = $auth['idcard'];
+            $user->mobile       = $auth['mobile'];
+            $user->company      = $auth['company'];
+            $user->sex          = Fun::getSexByIdCard($auth['idcard']);
+            $user->birthday     = strtotime(Fun::getBirthDayByIdCard($auth['idcard']));
+            $user->check_status = 2;
+            $user->save();
+
+            $this->success('操作成功');
+        } else {
+            if (!empty($user['idcard'])) {
+                $this->redirect(url('intro'));
+            }
+            return $this->fetch();
+        }
+    }
+
     /**
      * 活动说明
      */
@@ -107,8 +146,9 @@ class RegisterController extends HomeBaseController
     public function intro()
     {
         if ($this->request->isPost()) {
-            $value = $this->request->post();
-            UserModel::update($value, ['id' => cmf_get_current_user_id()], ['main_image', 'main_image_thumb', 'signature']);
+            $value           = $this->request->post();
+            $value['avatar'] = $value['main_image_thumb'];
+            UserModel::update($value, ['id' => cmf_get_current_user_id()], ['avatar', 'main_image', 'main_image_thumb', 'signature']);
             $this->success('');
         } else {
             $user = UserModel::get(cmf_get_current_user_id());
@@ -139,8 +179,9 @@ class RegisterController extends HomeBaseController
     public function profile()
     {
         if ($this->request->isPost()) {
-            $value             = $this->request->post();
-            $value['birthday'] = strtotime($value['birthday']);
+            $value                  = $this->request->post();
+            $value['user_nickname'] = $value['realname'];
+            $value['birthday']      = strtotime($value['birthday']);
             UserModel::update($value, ['id' => cmf_get_current_user_id()]);
             $this->success('');
         } else {
@@ -150,15 +191,16 @@ class RegisterController extends HomeBaseController
             $this->assign('user', json_encode($user));
 
             $data = [
-                'high'         => Constant::HIGH,
-                'weight'       => Constant::WEIGHT,
-                'talent_level' => Constant::TALENT_LEVEL,
-                'education'    => Constant::EDUCATION,
-                'income'       => Constant::INCOME,
-                'nation'       => Constant::NATION,
-                'smoke'        => Constant::SMOKE,
-                'drink'        => Constant::DRINK,
-                'family'       => Constant::FAMILY,
+                'high'      => Constant::HIGH,
+                'weight'    => Constant::WEIGHT,
+                'education' => Constant::EDUCATION,
+                'income'    => Constant::INCOME,
+                'nation'    => Constant::NATION,
+                'smoke'     => Constant::SMOKE,
+                'drink'     => Constant::DRINK,
+                'family'    => Constant::FAMILY,
+                'id_type'   => Constant::ID_TYPE,
+                'tinyint'   => Constant::TINYINT,
             ];
             foreach ($data as &$v) {
                 $v = json_encode($v);
@@ -194,6 +236,11 @@ class RegisterController extends HomeBaseController
                 'max_weight' => Constant::MAX_WEIGHT,
                 'native'     => Constant::NATIVE,
                 'education'  => $education,
+                'income'     => Constant::COND_INCOME,
+                'id_type'    => Constant::ID_TYPE,
+                'smoke'      => Constant::SMOKE,
+                'drink'      => Constant::DRINK,
+                'tinyint'    => Constant::COND_TINYINT,
             ];
             foreach ($data as &$v) {
                 $v = json_encode($v);
@@ -283,8 +330,8 @@ class RegisterController extends HomeBaseController
             $main_image_thumb = cmf_get_user_avatar_url('image' . '/' . date('Ymd') . '/' . $thumb_file);
 
             $this->result([
-                'main_image'       => cmf_get_user_avatar_url($main_image),
-                'main_image_thumb' => cmf_get_user_avatar_url($main_image_thumb),
+                'main_image'       => $main_image,
+                'main_image_thumb' => $main_image_thumb,
             ], 1);
         } else {
             $this->error('请上传文件');

app/love/controller/UserwallController.php

@@ -292,6 +292,73 @@ class UserwallController extends LoveBaseController
         $this->success('操作成功');
     }
 
+    /**
+     * 申请聊天（旧）
+     */
+    /*public function chat()
+    {
+        $this->checkStatus();
+
+        $id      = $this->request->param('id');
+        $user_id = cmf_get_current_user_id();
+        $time    = time();
+
+        //聊天申请
+        $invite_get   = UserInviteModel::where([
+            ['from_id', '=', $id],
+            ['to_id', '=', $user_id],
+        ])->find();
+        $invite_apply = UserInviteModel::where([
+            ['from_id', '=', $user_id],
+            ['to_id', '=', $id],
+        ])->find();
+
+        //都没有邀请
+        if (empty($invite_get) && empty($invite_apply)) {
+            UserInviteModel::create([
+                'from_id'     => $user_id,
+                'to_id'       => $id,
+                'create_time' => $time,
+            ]);
+            UserModel::where('id', $id)->setInc('invite_num');
+            $this->error('请等待对方通过聊天邀请');
+        }
+
+        //已收到过邀请
+        if (!empty($invite_get)) {
+            if ($invite_get['status'] == 1) {
+                UserFriendModel::create([
+                    'user_id'       => $id,
+                    'friend_id'     => $user_id,
+                    'last_msg_time' => time(),
+                ]);
+                UserFriendModel::create([
+                    'user_id'       => $user_id,
+                    'friend_id'     => $id,
+                    'last_msg_time' => time(),
+                ]);
+                $invite_get->status = 2;
+                $invite_get->save();
+                $this->success('', url('message/detail') . '?id=' . $id);
+            } elseif ($invite_get['status'] == 2) {
+                $this->success('', url('message/detail') . '?id=' . $id);
+            } else {
+                $this->error('您已拒绝过对方的聊天邀请');
+            }
+        }
+
+        //已发起过邀请
+        if (!empty($invite_apply)) {
+            if ($invite_apply['status'] == 1) {
+                $this->error('请等待对方同意申请');
+            } elseif ($invite_apply['status'] == 2) {
+                $this->success('', url('message/detail') . '?id=' . $id);
+            } else {
+                $this->error('对方拒绝跟您聊天');
+            }
+        }
+    }*/
+
     /**
      * 申请聊天
      */

app/user/controller/AdminIndexController.php

@@ -90,10 +90,6 @@ class AdminIndexController extends AdminBaseController
                     $query->where('username', 'like', "%$keyword%");
                 }
 
-                if (!empty($data['department'])) {
-                    $query->where('department', $data['department']);
-                }
-
                 if (!empty($data['sex'])) {
                     $query->where('sex', $data['sex']);
                 }
@@ -111,8 +107,6 @@ class AdminIndexController extends AdminBaseController
                 'query' => Request::param(),//不丢失已存在的url参数
             ]);
 
-        $this->assign('department', $this->request->param('department') ?: '');
-        $this->assign('department_list',Constant::DEPARTMENT);
         $this->assign('sex', $this->request->param('sex') ?: 0);
         $this->assign('is_complete', $this->request->param('is_complete') ?: 0);
         $this->assign('check_status', $this->request->param('check_status') ?: 0);

public/themes/admin_simpleboot3/admin/slide_item/add.html

@@ -52,7 +52,7 @@
             <div class="col-md-3">
                 <table class="table table-bordered">
                     <tr>
-                        <th><b>缩略图</b></th>
+                        <th><b>缩略图</b>（建议750*320）</th>
                     </tr>
                     <tr>
                         <td>

public/themes/admin_simpleboot3/admin/slide_item/edit.html

@@ -54,7 +54,7 @@
             <div class="col-md-3">
                 <table class="table table-bordered">
                     <tr>
-                        <th><b>缩略图</b></th>
+                        <th><b>缩略图</b>（建议750*320）</th>
                     </tr>
                     <tr>
                         <td>

public/themes/admin_simpleboot3/user/admin_index/index.html

@@ -12,13 +12,6 @@
         关键字：
         <input class="form-control" type="text" name="keyword" style="width: 200px;" value="{:input('request.keyword')}"
                placeholder="请输入用户名">
-        推荐部门：
-        <select class="form-control" name="department">
-            <option value="">全部</option>
-            <volist name="department_list" id="dp">
-                <option value="{$dp}" <eq name="department" value="$dp">selected</eq>>{$dp}</option>
-            </volist>
-        </select>
         性别：
         <select class="form-control" name="sex">
             <option value="0" <eq name="sex" value="0">selected</eq>>全部</option>
@@ -70,7 +63,6 @@
                     <td>{$vo['mobile']}</td>
                     <td><img width="25" height="25" src="{:url('user/public/avatar',array('id'=>$vo['id']))}"/></td>
                     <td>{:date('Y-m-d H:i:s',$vo['create_time'])}</td>
-                    <td>{$vo.department}</td>
                     <td>
                         <switch name="vo.check_status">
                             <case value="1">

public/themes/admin_simpleboot3/user/admin_index/show.html

@@ -10,7 +10,7 @@
         <div class="tab-content" style="margin-top:30px;">
             <form action="{:url('addPost')}" class="js-ajax-form" method="post">
                 <div class="panel panel-default">
-                    <div class="panel-heading">基本信息</div>
+                    <div class="panel-heading">基本资料</div>
                     <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group">
@@ -58,10 +58,6 @@
                                 <div class="col-md-4">
                                     <div class="input-text">{$info.income}</div>
                                 </div>
-                                <label class="control-label col-md-2">人才层次</label>
-                                <div class="col-md-4">
-                                    <div class="input-text">{$info.talent_level}</div>
-                                </div>
                                 <label class="control-label col-md-2">工作单位</label>
                                 <div class="col-md-4">
                                     <div class="input-text">{$info.company}</div>
@@ -88,12 +84,6 @@
                                         <img src="{$info.main_image}" style="max-width:100%;">
                                     </notempty>
                                 </div>
-                                <label class="col-md-12">绿码</label>
-                                <div class="col-md-10 col-md-offset-2">
-                                    <notempty name="info.health_code">
-                                        <img src="{$info.health_code}" style="max-width:100%;">
-                                    </notempty>
-                                </div>
                             </div>
                         </div>
                     </div>

public/themes/simpleboot3/love/active/index.html

@@ -9,6 +9,7 @@
         .box .content .img {width: 40%;height: 96px;margin-right: 8px;border-radius: 2px;}
         .box .content .desc {width: 60%;}
         .box .content .text-content {font-size: 14px;color: #888;height: 72px;overflow: hidden;line-height: 1.6;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 3;-webkit-box-orient: vertical;overflow: hidden;}
+        .no-image {width:100%;}
     </style>
 </block>
 <block name="body">
@@ -18,7 +19,7 @@
         </template>
     </van-nav-bar>
 
-    <div style="padding-top:46px;">
+    <div style="padding-top:46px;" v-if="list.length > 0">
         <div class="box" @click="toDetail(item.id)" v-for="item in list">
             <div class="title">{{ item.title }}</div>
             <div class="content">
@@ -33,6 +34,10 @@
         </div>
         <div class="van-list__finished-text">没有更多了</div>
     </div>
+    <div style="padding-top:46px;" v-if="list.length == 0">
+        <img class="no-image" src="__TMPL__/public/assets/images/no_activity.png">
+        <div class="van-list__finished-text">暂无活动，敬请期待</div>
+    </div>
 
     <van-tabbar v-model="active" active-color="#FF589B" :before-change="tabbarChange">
         <van-tabbar-item url="{:url('portal/index/index')}">

public/themes/simpleboot3/love/my/cond.html

@@ -114,12 +114,132 @@
         ></van-picker>
     </van-popup>
 
-    <!--职业-->
+    <!--年收入-->
     <van-field
-            v-model="form.job"
-            label="职业"
-            placeholder="请输入职业要求"
+            readonly
+            clickable
+            :value="form.income"
+            label="年收入"
+            placeholder="点击选择年收入"
+            @click="showIncome = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showIncome">
+        <van-picker
+                title="年收入"
+                show-toolbar
+                :columns="income"
+                @confirm="onIncomeConfirm"
+                @cancel="showIncome = false"
+        ></van-picker>
+    </van-popup>
+
+    <!--身份类型-->
+    <van-field
+            clickable
+            :value="form.id_type"
+            label="身份类型"
+            placeholder="点击选择身份类型"
+            @click="showIdType = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showIdType">
+        <van-picker
+                title="身份类型"
+                show-toolbar
+                :columns="idType"
+                @confirm="onIdTypeConfirm"
+                @cancel="showIdType = false"
+        ></van-picker>
+    </van-popup>
+
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_house]"
+            label="是否有房"
+            placeholder="点击选择是否有房"
+            @click="showHaveHouse = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveHouse">
+        <van-picker
+                title="是否有房"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveHouseConfirm"
+                @cancel="showHaveHouse = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_car]"
+            label="是否有车"
+            placeholder="点击选择是否有车"
+            @click="showHaveCar = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveCar">
+        <van-picker
+                title="是否有车"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveCarConfirm"
+                @cancel="showHaveCar = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.with_parent_live]"
+            label="婚后是否愿意与父母同住"
+            placeholder="点击选择"
+            @click="showWithParentLive = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showWithParentLive">
+        <van-picker
+                title="婚后是否愿意与父母同住"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onWithParentLiveConfirm"
+                @cancel="showWithParentLive = false"
+        ></van-picker>
+    </van-popup>
+
+    <!--是否吸烟-->
+    <van-field
+            readonly
+            clickable
+            :value="form.smoke"
+            label="是否吸烟"
+            placeholder="点击选择是否吸烟"
+            @click="showSmoke = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showSmoke">
+        <van-picker
+                title="是否吸烟"
+                show-toolbar
+                :columns="smoke"
+                @confirm="onSmokeConfirm"
+                @cancel="showSmoke = false"
+        ></van-picker>
+    </van-popup>
+
+    <!--是否喝酒-->
+    <van-field
+            readonly
+            clickable
+            :value="form.drink"
+            label="是否喝酒"
+            placeholder="点击选择是否喝酒"
+            @click="showDrink = true"
     ></van-field>
+    <van-popup position="bottom" v-model="showDrink">
+        <van-picker
+                title="是否喝酒"
+                show-toolbar
+                :columns="drink"
+                @confirm="onDrinkConfirm"
+                @cancel="showDrink = false"
+        ></van-picker>
+    </van-popup>
 </block>
 <block name="script">
     <script>
@@ -131,10 +251,23 @@
                     showAge: false,
                     showHigh: false,
                     showWeight: false,
+                    showMarry: false,
                     showEducation: false,
                     education: {$education},
                     showNative: false,
                     native: {$native},
+                    showIdType: false,
+                    idType: {$id_type},
+                    showIncome: false,
+                    income: {$income},
+                    tinyint: {$tinyint},
+                    showSmoke: false,
+                    smoke: {$smoke},
+                    showDrink: false,
+                    drink: {$drink},
+                    showHaveHouse: false,
+                    showHaveCar: false,
+                    showWithParentLive: false,
                 };
             },
             methods: {
@@ -218,6 +351,34 @@
                 findKey(obj, value, compare = (a, b) => a === b) {
                     return Object.keys(obj).find(k => compare(obj[k], value))
                 },
+                onIdTypeConfirm(value) {
+                    this.form.id_type = value;
+                    this.showIdType = false;
+                },
+                onIncomeConfirm(value) {
+                    this.form.income = value;
+                    this.showIncome = false;
+                },
+                onHaveHouseConfirm(value,index) {
+                    this.form.have_house = index;
+                    this.showHaveHouse = false;
+                },
+                onHaveCarConfirm(value,index) {
+                    this.form.have_car = index;
+                    this.showHaveCar = false;
+                },
+                onWithParentLiveConfirm(value,index) {
+                    this.form.with_parent_live = index;
+                    this.showWithParentLive = false;
+                },
+                onSmokeConfirm(value) {
+                    this.form.smoke = value;
+                    this.showSmoke = false;
+                },
+                onDrinkConfirm(value) {
+                    this.form.drink = value;
+                    this.showDrink = false;
+                },
             },
             computed: {
                 //年龄

public/themes/simpleboot3/love/my/index.html

@@ -11,9 +11,9 @@
 
     <!--头部-->
     <div class="bg-pink pr text-center ptb10">
-        <van-uploader :max-count="1" :after-read="uploadAvatar">
+        <!--<van-uploader :max-count="1" :after-read="uploadAvatar">-->
             <van-image width="100" height="100" round :src="avatar"></van-image>
-        </van-uploader>
+        <!--</van-uploader>-->
         <p>
             <span class="fz16 fb">{{user.realname ? user.realname : user.username}}</span>
         </p>
@@ -82,7 +82,7 @@
                 <img src="__TMPL__/public/assets/images/my/icon_intro.svg" class="van-cell__left-icon" style="height:24px;"/>
             </template>
         </van-cell>
-        <van-cell title="相册管理" is-link url="{:url('photo')}" size="large">
+        <van-cell title="我的相册" is-link url="{:url('photo')}" size="large">
             <template #icon>
                 <img src="__TMPL__/public/assets/images/my/icon_images.svg" class="van-cell__left-icon" style="height:24px;"/>
             </template>

public/themes/simpleboot3/love/my/profile.html

@@ -24,12 +24,6 @@
     <div style="width:100%;height:46px;"></div>
 
     <!--增空-->
-    <van-field
-            required
-            v-model="form.username"
-            label="用户名"
-            placeholder="请输入用户名"
-    ></van-field>
     <van-field
             required
             v-model="form.realname"
@@ -150,26 +144,6 @@
         ></van-picker>
     </van-popup>
 
-    <!--人才层次-->
-    <van-field
-            required
-            readonly
-            clickable
-            :value="form.talent_level"
-            label="人才层次"
-            placeholder="点击人才层次"
-            @click="showTalentLevel = true"
-    ></van-field>
-    <van-popup position="bottom" v-model="showTalentLevel">
-        <van-picker
-                title="人才层次"
-                show-toolbar
-                :columns="talent_level"
-                @confirm="onTalentLevelConfirm"
-                @cancel="showTalentLevel = false"
-        ></van-picker>
-    </van-popup>
-
     <!--工作单位和职务-->
     <van-field
             required
@@ -184,6 +158,25 @@
             placeholder="请输入职务"
     ></van-field>
 
+    <!--身份类型-->
+    <van-field
+            required
+            clickable
+            :value="form.id_type"
+            label="身份类型"
+            placeholder="点击选择身份类型"
+            @click="showIdType = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showIdType">
+        <van-picker
+                title="身份类型"
+                show-toolbar
+                :columns="idType"
+                @confirm="onIdTypeConfirm"
+                @cancel="showIdType = false"
+        ></van-picker>
+    </van-popup>
+
     <!--家庭成员-->
     <van-field required name="form.family" label="家庭成员">
         <template #input>
@@ -200,6 +193,14 @@
         </template>
     </van-field>
 
+    <!--籍贯-->
+    <van-field
+            required
+            v-model="form.native"
+            label="籍贯"
+            placeholder="请输入籍贯"
+    ></van-field>
+
     <!--民族-->
     <van-field
             readonly
@@ -228,7 +229,60 @@
             placeholder="请输入兴趣爱好"
     ></van-field>
 
-    <h3 class="fz16 mb10 pt20 plr12">个人&家庭</h3>
+    <h3 class="fz16 mb10 pt20 plr12">工作生活</h3>
+
+    <!--房车，与父母同住-->
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_house]"
+            label="是否有房"
+            placeholder="点击选择是否有房"
+            @click="showHaveHouse = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveHouse">
+        <van-picker
+                title="是否有房"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveHouseConfirm"
+                @cancel="showHaveHouse = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_car]"
+            label="是否有车"
+            placeholder="点击选择是否有车"
+            @click="showHaveCar = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveCar">
+        <van-picker
+                title="是否有车"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveCarConfirm"
+                @cancel="showHaveCar = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.with_parent_live]"
+            label="婚后是否愿意与父母同住"
+            placeholder="点击选择"
+            @click="showWithParentLive = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showWithParentLive">
+        <van-picker
+                title="婚后是否愿意与父母同住"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onWithParentLiveConfirm"
+                @cancel="showWithParentLive = false"
+        ></van-picker>
+    </van-popup>
 
     <!--是否吸烟-->
     <van-field
@@ -270,9 +324,9 @@
 
     <div class="split-block"></div>
     <h3 class="fz16 mb10 pt20 plr12">其他</h3>
-    <van-cell center title="是否在大厅公开">
+    <van-cell center title="是否显示足迹">
         <template #right-icon>
-            <van-switch v-model="form.is_public" size="24" :active-value="1" :inactive-value="2" active-color="#FF589B"></van-switch>
+            <van-switch v-model="form.show_footmark" size="24" :active-value="1" :inactive-value="2" active-color="#FF589B"></van-switch>
         </template>
     </van-cell>
 </block>
@@ -293,15 +347,19 @@
                     education: {$education},
                     showIncome: false,
                     income: {$income},
+                    showIdType: false,
+                    idType: {$id_type},
                     showNation: false,
                     nation: {$nation},
-                    showTalentLevel: false,
-                    talent_level: {$talent_level},
                     showSmoke: false,
                     smoke: {$smoke},
                     showDrink: false,
                     drink: {$drink},
                     family: {$family},
+                    showHaveHouse: false,
+                    showHaveCar: false,
+                    showWithParentLive: false,
+                    tinyint: {$tinyint},
                 };
             },
             methods: {
@@ -337,12 +395,12 @@
                         this.$toast('请选择学历');
                         return false;
                     }
-                    if (this.form.income == '') {
-                        this.$toast('请选择年收入');
+                    if (this.form.id_type == '') {
+                        this.$toast('请选择身份类型');
                         return false;
                     }
-                    if (this.form.talent_level == '') {
-                        this.$toast('请选择人才层次');
+                    if (this.form.income == '') {
+                        this.$toast('请选择年收入');
                         return false;
                     }
                     if (this.form.company == '') {
@@ -353,10 +411,14 @@
                         this.$toast('请输入职务');
                         return false;
                     }
-                    /*if (this.form.family.length == 0) {
+                    if (this.form.family.length == 0) {
                         this.$toast('请选择家庭成员');
                         return false;
-                    }*/
+                    }
+                    if (this.form.native == '') {
+                        this.$toast('请输入籍贯');
+                        return false;
+                    }
                     $.post("{:url('profilePost')}", this.form, function (json) {
                         history.back();
                     }, 'json');
@@ -393,9 +455,21 @@
                     this.form.nation = value;
                     this.showNation = false;
                 },
-                onTalentLevelConfirm(value) {
-                    this.form.talent_level = value;
-                    this.showTalentLevel = false;
+                onIdTypeConfirm(value) {
+                    this.form.id_type = value;
+                    this.showIdType = false;
+                },
+                onHaveHouseConfirm(value,index) {
+                    this.form.have_house = index;
+                    this.showHaveHouse = false;
+                },
+                onHaveCarConfirm(value,index) {
+                    this.form.have_car = index;
+                    this.showHaveCar = false;
+                },
+                onWithParentLiveConfirm(value,index) {
+                    this.form.with_parent_live = index;
+                    this.showWithParentLive = false;
                 },
                 onSmokeConfirm(value) {
                     this.form.smoke = value;

public/themes/simpleboot3/love/my/select.html

@@ -50,7 +50,7 @@
                                 <div class="text fz12 mt10 color_9 ws">{{item.user.signature}}</div>
                                 <div>
                                     <van-button type="primary" size="mini" @click.stop="select(item.user.id)" v-if="active === 0">
-                                        选择TA
+                                        确认关系
                                     </van-button>
                                     <van-button type="danger" size="mini" @click.stop="cancel(item.user.id)" v-if="active === 1">
                                         取消选择
@@ -148,9 +148,8 @@
                     this.onLoad(index);
                 },
                 select(id) {
-                    console.log(id);
                     this.$dialog.confirm({
-                        title: '选择TA',
+                        title: '确认关系',
                         message: '确认选择后将无法再选择其他人',
                     }).then(() => {
                         $.post("{:url('selectConfirm')}",{id:id},function (json) {
@@ -165,7 +164,7 @@
                     console.log(id);
                     this.$dialog.confirm({
                         title: '取消选择',
-                        message: '确认取消选择TA？',
+                        message: '确认取消表明心意？',
                     }).then(() => {
                         $.post("{:url('selectCancel')}",{id:id},function (json) {
                             location.reload();

public/themes/simpleboot3/love/register/audit.html

@@ -0,0 +1,33 @@
+<extend name="public@base"/>
+<block name="css">
+    <style>
+    </style>
+</block>
+<block name="body">
+    <van-nav-bar>
+        <template #title>
+            <span>系统通知</span>
+        </template>
+    </van-nav-bar>
+    <h1 style="text-align:center;margin-top:20px;" class="text-pink">您的帐号正在审核中</h1>
+</block>
+<block name="script">
+    <script>
+        new Vue({
+            el: '#app',
+            data() {
+                return {
+
+                };
+            },
+            methods: {
+                onBack() {
+                    history.back();
+                },
+            },
+            computed: {
+
+            }
+        });
+    </script>
+</block>

public/themes/simpleboot3/love/register/cond.html

@@ -26,7 +26,7 @@
     <div style="width:100%;height:46px;"></div>
 
     <van-steps :active="3">
-        <van-step>选择性别</van-step>
+        <van-step>验证身份</van-step>
         <van-step>上传头像</van-step>
         <van-step>基础资料</van-step>
         <van-step>择偶要求</van-step>
@@ -127,12 +127,132 @@
         ></van-picker>
     </van-popup>
 
-    <!--职业-->
+    <!--年收入-->
     <van-field
-            v-model="form.job"
-            label="职业"
-            placeholder="请输入职业要求"
+            readonly
+            clickable
+            :value="form.income"
+            label="年收入"
+            placeholder="点击选择年收入"
+            @click="showIncome = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showIncome">
+        <van-picker
+                title="年收入"
+                show-toolbar
+                :columns="income"
+                @confirm="onIncomeConfirm"
+                @cancel="showIncome = false"
+        ></van-picker>
+    </van-popup>
+
+    <!--身份类型-->
+    <van-field
+            clickable
+            :value="form.id_type"
+            label="身份类型"
+            placeholder="点击选择身份类型"
+            @click="showIdType = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showIdType">
+        <van-picker
+                title="身份类型"
+                show-toolbar
+                :columns="idType"
+                @confirm="onIdTypeConfirm"
+                @cancel="showIdType = false"
+        ></van-picker>
+    </van-popup>
+
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_house]"
+            label="是否有房"
+            placeholder="点击选择是否有房"
+            @click="showHaveHouse = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveHouse">
+        <van-picker
+                title="是否有房"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveHouseConfirm"
+                @cancel="showHaveHouse = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_car]"
+            label="是否有车"
+            placeholder="点击选择是否有车"
+            @click="showHaveCar = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveCar">
+        <van-picker
+                title="是否有车"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveCarConfirm"
+                @cancel="showHaveCar = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.with_parent_live]"
+            label="婚后是否愿意与父母同住"
+            placeholder="点击选择"
+            @click="showWithParentLive = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showWithParentLive">
+        <van-picker
+                title="婚后是否愿意与父母同住"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onWithParentLiveConfirm"
+                @cancel="showWithParentLive = false"
+        ></van-picker>
+    </van-popup>
+
+    <!--是否吸烟-->
+    <van-field
+            readonly
+            clickable
+            :value="form.smoke"
+            label="是否吸烟"
+            placeholder="点击选择是否吸烟"
+            @click="showSmoke = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showSmoke">
+        <van-picker
+                title="是否吸烟"
+                show-toolbar
+                :columns="smoke"
+                @confirm="onSmokeConfirm"
+                @cancel="showSmoke = false"
+        ></van-picker>
+    </van-popup>
+
+    <!--是否喝酒-->
+    <van-field
+            readonly
+            clickable
+            :value="form.drink"
+            label="是否喝酒"
+            placeholder="点击选择是否喝酒"
+            @click="showDrink = true"
     ></van-field>
+    <van-popup position="bottom" v-model="showDrink">
+        <van-picker
+                title="是否喝酒"
+                show-toolbar
+                :columns="drink"
+                @confirm="onDrinkConfirm"
+                @cancel="showDrink = false"
+        ></van-picker>
+    </van-popup>
 
     <div style="padding:16px;">
         <van-button block class="bg-pink" @click="onSubmit">完成</van-button>
@@ -153,6 +273,18 @@
                     education: {$education},
                     showNative: false,
                     native: {$native},
+                    showIdType: false,
+                    idType: {$id_type},
+                    showIncome: false,
+                    income: {$income},
+                    tinyint: {$tinyint},
+                    showSmoke: false,
+                    smoke: {$smoke},
+                    showDrink: false,
+                    drink: {$drink},
+                    showHaveHouse: false,
+                    showHaveCar: false,
+                    showWithParentLive: false,
                 };
             },
             methods: {
@@ -236,6 +368,34 @@
                 findKey(obj, value, compare = (a, b) => a === b) {
                     return Object.keys(obj).find(k => compare(obj[k], value))
                 },
+                onIdTypeConfirm(value) {
+                    this.form.id_type = value;
+                    this.showIdType = false;
+                },
+                onIncomeConfirm(value) {
+                    this.form.income = value;
+                    this.showIncome = false;
+                },
+                onHaveHouseConfirm(value,index) {
+                    this.form.have_house = index;
+                    this.showHaveHouse = false;
+                },
+                onHaveCarConfirm(value,index) {
+                    this.form.have_car = index;
+                    this.showHaveCar = false;
+                },
+                onWithParentLiveConfirm(value,index) {
+                    this.form.with_parent_live = index;
+                    this.showWithParentLive = false;
+                },
+                onSmokeConfirm(value) {
+                    this.form.smoke = value;
+                    this.showSmoke = false;
+                },
+                onDrinkConfirm(value) {
+                    this.form.drink = value;
+                    this.showDrink = false;
+                },
             },
             computed: {
                 //年龄

public/themes/simpleboot3/love/register/idcard.html

@@ -0,0 +1,59 @@
+<extend name="public@base"/>
+<block name="css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/userwall.css">
+</block>
+<block name="body">
+    <!--头部-->
+    <van-nav-bar
+            class="bg-pink"
+            fixed="true"
+    >
+        <template #title>
+            <span style="color:white;">完善资料(1/4)</span>
+        </template>
+    </van-nav-bar>
+    <div style="width:100%;height:46px;"></div>
+
+    <van-steps :active="0">
+        <van-step>验证身份</van-step>
+        <van-step>上传头像</van-step>
+        <van-step>基础资料</van-step>
+        <van-step>择偶要求</van-step>
+    </van-steps>
+
+    <van-field
+            required
+            v-model="form.idcard"
+            label="身份证号"
+            placeholder="请输入身份证号"
+    ></van-field>
+    <div style="padding:16px;">
+        <van-button block class="bg-pink" @click="onSubmit">下一步</van-button>
+    </div>
+</block>
+<block name="script">
+    <script>
+        new Vue({
+            el: '#app',
+            data() {
+                return {
+                    form: {
+                        idcard: '',
+                    }
+                };
+            },
+            methods: {
+                onSubmit() {
+                    const self = this;
+                    $.post("{:url('idcard')}", this.form, function (json) {
+                        if (json.code) {
+                            location.href = "{:url('intro')}";
+                        } else {
+                            self.$toast(json.msg);
+                        }
+                    }, 'json');
+                },
+            },
+        });
+    </script>
+</block>

public/themes/simpleboot3/love/register/intro.html

@@ -14,8 +14,6 @@
     <!--头部-->
     <van-nav-bar
             class="bg-pink"
-            right-text="下一步"
-            @click-right="onSubmit"
             fixed="true"
     >
         <template #title>
@@ -25,7 +23,7 @@
     <div style="width:100%;height:46px;"></div>
 
     <van-steps :active="1">
-        <van-step>选择性别</van-step>
+        <van-step>验证身份</van-step>
         <van-step>上传头像</van-step>
         <van-step>基础资料</van-step>
         <van-step>择偶要求</van-step>
@@ -95,7 +93,6 @@
             },
             computed: {
                 head_image() {
-                    console.log(this.form.main_image);
                     return this.form.main_image ? this.form.main_image : '__TMPL__/public/assets/images/userwall/no_image.png';
                 }
             },

public/themes/simpleboot3/love/register/profile.html

@@ -18,10 +18,8 @@
     <van-nav-bar
             class="bg-pink"
             left-text="返回"
-            right-text="下一步"
             left-arrow
             @click-left="onBack"
-            @click-right="onSubmit"
             fixed="true"
     >
         <template #title>
@@ -31,19 +29,13 @@
     <div style="width:100%;height:46px;"></div>
 
     <van-steps :active="2">
-        <van-step>选择性别</van-step>
+        <van-step>验证身份</van-step>
         <van-step>上传头像</van-step>
         <van-step>基础资料</van-step>
         <van-step>择偶要求</van-step>
     </van-steps>
 
     <!--增空-->
-    <van-field
-            required
-            v-model="form.username"
-            label="用户名"
-            placeholder="请输入用户名"
-    ></van-field>
     <van-field
             required
             v-model="form.realname"
@@ -164,26 +156,6 @@
         ></van-picker>
     </van-popup>
 
-    <!--人才层次-->
-    <van-field
-            required
-            readonly
-            clickable
-            :value="form.talent_level"
-            label="人才层次"
-            placeholder="点击人才层次"
-            @click="showTalentLevel = true"
-    ></van-field>
-    <van-popup position="bottom" v-model="showTalentLevel">
-        <van-picker
-                title="人才层次"
-                show-toolbar
-                :columns="talent_level"
-                @confirm="onTalentLevelConfirm"
-                @cancel="showTalentLevel = false"
-        ></van-picker>
-    </van-popup>
-
     <!--工作单位和职务-->
     <van-field
             required
@@ -198,6 +170,25 @@
             placeholder="请输入职务"
     ></van-field>
 
+    <!--身份类型-->
+    <van-field
+            required
+            clickable
+            :value="form.id_type"
+            label="身份类型"
+            placeholder="点击选择身份类型"
+            @click="showIdType = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showIdType">
+        <van-picker
+                title="身份类型"
+                show-toolbar
+                :columns="idType"
+                @confirm="onIdTypeConfirm"
+                @cancel="showIdType = false"
+        ></van-picker>
+    </van-popup>
+
     <!--家庭成员-->
     <van-field required name="form.family" label="家庭成员">
         <template #input>
@@ -214,6 +205,14 @@
         </template>
     </van-field>
 
+    <!--籍贯-->
+    <van-field
+            required
+            v-model="form.native"
+            label="籍贯"
+            placeholder="请输入籍贯"
+    ></van-field>
+
     <!--民族-->
     <van-field
             readonly
@@ -242,7 +241,60 @@
             placeholder="请输入兴趣爱好"
     ></van-field>
 
-    <h3 class="fz16 mb10 pt20 plr12">个人&家庭</h3>
+    <h3 class="fz16 mb10 pt20 plr12">工作生活</h3>
+
+    <!--房车，与父母同住-->
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_house]"
+            label="是否有房"
+            placeholder="点击选择是否有房"
+            @click="showHaveHouse = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveHouse">
+        <van-picker
+                title="是否有房"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveHouseConfirm"
+                @cancel="showHaveHouse = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.have_car]"
+            label="是否有车"
+            placeholder="点击选择是否有车"
+            @click="showHaveCar = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showHaveCar">
+        <van-picker
+                title="是否有车"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onHaveCarConfirm"
+                @cancel="showHaveCar = false"
+        ></van-picker>
+    </van-popup>
+    <van-field
+            readonly
+            clickable
+            :value="tinyint[form.with_parent_live]"
+            label="婚后是否愿意与父母同住"
+            placeholder="点击选择"
+            @click="showWithParentLive = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showWithParentLive">
+        <van-picker
+                title="婚后是否愿意与父母同住"
+                show-toolbar
+                :columns="tinyint"
+                @confirm="onWithParentLiveConfirm"
+                @cancel="showWithParentLive = false"
+        ></van-picker>
+    </van-popup>
 
     <!--是否吸烟-->
     <van-field
@@ -284,9 +336,9 @@
 
     <div class="split-block"></div>
     <h3 class="fz16 mb10 pt20 plr12">其他</h3>
-    <van-cell center title="是否在大厅公开">
+    <van-cell center title="是否显示足迹">
         <template #right-icon>
-            <van-switch v-model="form.is_public" size="24" :active-value="1" :inactive-value="2" active-color="#FF589B"></van-switch>
+            <van-switch v-model="form.show_footmark" size="24" :active-value="1" :inactive-value="2" active-color="#FF589B"></van-switch>
         </template>
     </van-cell>
 
@@ -311,15 +363,20 @@
                     education: {$education},
                     showIncome: false,
                     income: {$income},
+                    showIdType: false,
+                    idType: {$id_type},
                     showNation: false,
                     nation: {$nation},
                     showTalentLevel: false,
-                    talent_level: {$talent_level},
                     showSmoke: false,
                     smoke: {$smoke},
                     showDrink: false,
                     drink: {$drink},
                     family: {$family},
+                    showHaveHouse: false,
+                    showHaveCar: false,
+                    showWithParentLive: false,
+                    tinyint: {$tinyint},
                 };
             },
             methods: {
@@ -355,12 +412,12 @@
                         this.$toast('请选择学历');
                         return false;
                     }
-                    if (this.form.income == '') {
-                        this.$toast('请选择年收入');
+                    if (this.form.id_type == '') {
+                        this.$toast('请选择身份类型');
                         return false;
                     }
-                    if (this.form.talent_level == '') {
-                        this.$toast('请选择人才层次');
+                    if (this.form.income == '') {
+                        this.$toast('请选择年收入');
                         return false;
                     }
                     if (this.form.company == '') {
@@ -375,6 +432,10 @@
                         this.$toast('请选择家庭成员');
                         return false;
                     }
+                    if (this.form.native == '') {
+                        this.$toast('请输入籍贯');
+                        return false;
+                    }
                     $.post("{:url('profile')}", this.form, function (json) {
                         location.href = "{:url('cond')}";
                     }, 'json');
@@ -412,9 +473,21 @@
                     this.form.nation = value;
                     this.showNation = false;
                 },
-                onTalentLevelConfirm(value) {
-                    this.form.talent_level = value;
-                    this.showTalentLevel = false;
+                onIdTypeConfirm(value) {
+                    this.form.id_type = value;
+                    this.showIdType = false;
+                },
+                onHaveHouseConfirm(value,index) {
+                    this.form.have_house = index;
+                    this.showHaveHouse = false;
+                },
+                onHaveCarConfirm(value,index) {
+                    this.form.have_car = index;
+                    this.showHaveCar = false;
+                },
+                onWithParentLiveConfirm(value,index) {
+                    this.form.with_parent_live = index;
+                    this.showWithParentLive = false;
                 },
                 onSmokeConfirm(value) {
                     this.form.smoke = value;

public/themes/simpleboot3/love/scene/scene_list.html

@@ -63,7 +63,6 @@
                             <div class="content_box">
                                 <el-tag effect="plain">{{item.high ? item.high + 'CM' : '身高保密'}}</el-tag>
                                 <el-tag effect="plain">{{item.weight ? item.weight + 'KG' : '体重保密'}}</el-tag>
-                                <el-tag effect="plain" v-if="item.talent_level">{{item.talent_level}}</el-tag>
                                 <el-tag effect="plain" v-if="item.education">{{item.education}}</el-tag>
                             </div>
                             <div class="split-block"></div>

public/themes/simpleboot3/love/userwall/detail.html

@@ -59,7 +59,6 @@
                         <dd class="fz14 pt10">
                             <span class="ptb5 bg_span plr8 br mb5 dib">{{user.high ? user.high + 'CM' : '身高保密'}}</span>
                             <span class="ptb5 bg_span plr8 br mb5 dib">{{user.weight ? user.weight + 'KG' : '体重保密'}}</span>
-                            <span class="ptb5 bg_span plr8 br mb5 dib">{{user.talent_level}}</span>
                             <span class="ptb5 bg_span plr8 br mb5 dib">{{user.education}}</span>
                         </dd>
                     </dl>
@@ -146,14 +145,13 @@
             <van-cell title="体重" :value="user.weight ? user.weight + 'KG' : '保密'"></van-cell>
             <van-cell title="学历" :value="user.education"></van-cell>
             <van-cell title="年收入" :value="user.income"></van-cell>
-            <van-cell title="人才层次" :value="user.talent_level"></van-cell>
             <van-cell title="民族" :value="user.nation"></van-cell>
             <van-cell title="工作单位" :value="user.company"></van-cell>
             <van-cell title="职务" :value="user.job"></van-cell>
             <van-cell title="兴趣爱好" :value="user.hobby"></van-cell>
         </van-cell-group>
         <div class="split-block"></div>
-        <h3 class="fn fz16 color_red mb10 pt20 plr12">个人&家庭</h3>
+        <h3 class="fn fz16 color_red mb10 pt20 plr12">工作生活</h3>
         <van-cell-group>
             <van-cell title="宗教信仰" :value="user.faith"></van-cell>
             <van-cell title="是否吸烟" :value="user.smoke"></van-cell>