用户字段更改

app/common/Constant.php

@@ -21,7 +21,7 @@ class Constant
 //    const TOPHOME = ['独生子女','老大','老二','老三','老四','老五','其他'];
 //    const WANTCHILD = ['愿意','不愿意','视情况而定'];
 //    const LIVEPARENT = ['愿意','不愿意','视情况而定'];
-    const ID_TYPE = ['公务员', '事业单位', '职工', '合同工', '编外人员', '企业高管'];
+    const ID_TYPE = ['公务员', '事业干部', '编外人员', '企业高管或职工'];
     const FAMILY  = ['爷爷', '奶奶', '外公', '外婆', '父亲', '母亲', '哥哥', '弟弟', '姐姐', '妹妹'];
 //    const TALENT_LEVEL = ['第一层次', '第二层次', '第三层次', '第四层次', '第五层次', '第六层次', '第七层次', '其他人才', '不是人才'];
     const NATIVE = ['晋江籍', '非晋江籍', '无要求'];

app/love/controller/MyController.php

@@ -114,6 +114,7 @@ class MyController extends LoveBaseController
         $this->assign('user', json_encode($user));
 
         $data = [
+            'marry'     => Constant::MARRY,
             'high'      => Constant::HIGH,
             'weight'    => Constant::WEIGHT,
             'education' => Constant::EDUCATION,

app/love/controller/RegisterController.php

@@ -74,6 +74,7 @@ class RegisterController extends HomeBaseController
             $user->sex          = Fun::getSexByIdCard($auth['idcard']);
             $user->birthday     = strtotime(Fun::getBirthDayByIdCard($auth['idcard']));
             $user->check_status = 2;
+            $user->create_time  = time();
             $user->save();
 
             $this->success('操作成功');
@@ -191,6 +192,7 @@ class RegisterController extends HomeBaseController
             $this->assign('user', json_encode($user));
 
             $data = [
+                'marry'     => Constant::MARRY,
                 'high'      => Constant::HIGH,
                 'weight'    => Constant::WEIGHT,
                 'education' => Constant::EDUCATION,

app/love/controller/UserwallController.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 namespace app\love\controller;
 
+use app\common\Constant;
 use app\love\model\GiftModel;
 use app\love\model\UserFavoriteModel;
 use app\love\model\UserFriendModel;
@@ -120,6 +121,10 @@ class UserwallController extends LoveBaseController
         $user->star++;
         $user->save();
         $user['age'] = empty($user['birthday']) ? 0 : date('Y') - date('Y', $user['birthday']);
+        $user['have_house'] = Constant::COND_TINYINT[$user['have_house']];
+        $user['have_car'] = Constant::COND_TINYINT[$user['have_car']];
+        $user['with_parent_live'] = Constant::COND_TINYINT[$user['with_parent_live']];
+        $user['sex_text'] = $user['sex_text'];
         if (empty($user['more'])) {
             $user['more'] = [];
         }
@@ -127,6 +132,9 @@ class UserwallController extends LoveBaseController
 
         //择偶要求
         $mating = UserMatingModel::get(['user_id' => $id]);
+        $mating['have_house'] = Constant::COND_TINYINT[$mating['have_house']];
+        $mating['have_car'] = Constant::COND_TINYINT[$mating['have_car']];
+        $mating['with_parent_live'] = Constant::COND_TINYINT[$mating['with_parent_live']];
         $this->assign('mating', $mating);
 
         //礼物列表
@@ -150,7 +158,9 @@ class UserwallController extends LoveBaseController
         $this->assign('is_select', $select_check ? 'true' : 'false');
 
         //增加访客记录
-        if ($user_id != $id) {
+        //足迹
+        $current_user = UserModel::get($user_id);
+        if ($user_id != $id && $current_user['show_footmark'] == 1) {
             $visit = UserVisitModel::get(['from_id' => $user_id, 'to_id' => $id]);
             $time  = time();
             if (empty($visit)) {
@@ -362,7 +372,7 @@ class UserwallController extends LoveBaseController
     /**
      * 申请聊天
      */
-    public function chat()
+    /*public function chat()
     {
         $this->checkStatus();
 
@@ -424,5 +434,44 @@ class UserwallController extends LoveBaseController
                 $this->error('对方拒绝跟您聊天');
             }
         }
+    }*/
+
+    /**
+     * 聊天
+     */
+    public function chat()
+    {
+        $this->checkStatus();
+
+        $id      = $this->request->param('id');
+        $user_id = cmf_get_current_user_id();
+        $time    = time();
+
+        $select = UserSelectModel::where('user_id|uid', '=', $user_id)
+            ->where('is_confirm', 1)
+            ->find();
+        if (!empty($select)) {
+            $this->error('您已有心上人，请一心一意对待哦(*^_^*)');
+        }
+
+        $has_freind = UserFriendModel::where([
+            'user_id'   => $user_id,
+            'friend_id' => $id,
+        ])->find();
+
+        //无好友先添加成好友
+        if (empty($has_freind)) {
+            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,
+            ]);
+        }
+        $this->success('', url('message/detail') . '?id=' . $id);
     }
 }

app/love/model/UserModel.php

@@ -20,5 +20,9 @@ class UserModel extends Model
         'more'   => 'array',
     ];
 
-
+    public function getSexTextAttr($value, $data)
+    {
+        $sex = ['保密', '男', '女'];
+        return $sex[$data['sex']];
+    }
 }

app/portal/controller/IndexController.php

@@ -16,41 +16,56 @@ use app\common\Fun;
 use app\love\controller\LoveBaseController;
 use app\love\model\UserFriendModel;
 use app\love\model\UserInviteModel;
+use app\love\model\UserMatingModel;
 use app\portal\model\UserModel;
 
 class IndexController extends LoveBaseController
 {
     public function index()
     {
-        //男会员
-        $man_list = UserModel::where('user_type', 2)
-            ->where('check_status',2)
-            ->where('is_complete', 1)
-            ->where('is_public', 1)
-            ->where('sex', 1)
-            ->where('id', '<>', cmf_get_current_user_id())
-            ->order('star desc')
-            ->limit(6)
-            ->select();
-        foreach ($man_list as $v) {
-            $v['age'] = empty($v['birthday']) ? '未知' : date('Y') - date('Y', $v['birthday']);
+        $user_id   = cmf_get_current_user_id();
+        $user      = UserModel::get($user_id);
+        $matting   = UserMatingModel::where('user_id', $user_id)->find();
+        $where     = [
+            ['user_type', '=', 2],
+            ['check_status', '=', 2],
+            ['is_complete', '=', 1],
+            ['is_public', '=', 1],
+            ['id', '<>', $user_id],
+            ['sex', '=', $user['sex'] == 1 ? 2 : 1],
+        ];
+        //年龄
+        $age_start = 0;
+        $age_end   = time();
+        if (!empty($matting['max_age'])) {
+            $age_start = strtotime("-{$matting['max_age']} year");
+        }
+        if (!empty($matting['min_age'])) {
+            $age_end = strtotime("-{$matting['min_age']} year");
+        }
+        $where[]  = ['birthday', 'between', [$age_start, $age_end]];
+        //身高
+        $max_high = 200;
+        if (!empty($matting['max_high'])) {
+            $max_high = $matting['max_high'];
+        }
+        $where[]    = ['high', 'between', [$matting['min_high'], $max_high]];
+        //体重
+        $max_weight = 200;
+        if (!empty($matting['max_weight'])) {
+            $max_weight = $matting['max_weight'];
         }
-        $this->assign('man_list', json_encode($man_list));
+        $where[] = ['weight', 'between', [$matting['min_weight'], $max_weight]];
 
-        //女会员
-        $woman_list = UserModel::where('user_type', 2)
-            ->where('check_status',2)
-            ->where('is_complete', 1)
-            ->where('is_public', 1)
-            ->where('sex', 2)
-            ->where('id', '<>', cmf_get_current_user_id())
+        //会员
+        $list = UserModel::where($where)
             ->order('star desc')
             ->limit(6)
             ->select();
-        foreach ($woman_list as $v) {
+        foreach ($list as $v) {
             $v['age'] = empty($v['birthday']) ? '未知' : date('Y') - date('Y', $v['birthday']);
         }
-        $this->assign('woman_list', json_encode($woman_list));
+        $this->assign('list', json_encode($list));
 
         //幻灯片
         $images = SlideItemModel::where('slide_id', 1)->select();

app/user/controller/AdminIndexController.php

@@ -144,12 +144,18 @@ class AdminIndexController extends AdminBaseController
         //获取信息
         $info           = UserModel::get($id);
         $info['family'] = $info['family'] ? implode('，', json_decode($info['family'], true)) : '未填写';
+        $info['have_house'] = Constant::COND_TINYINT[$info['have_house']];
+        $info['have_car'] = Constant::COND_TINYINT[$info['have_car']];
+        $info['with_parent_live'] = Constant::COND_TINYINT[$info['with_parent_live']];
         if (empty($info)) {
             $this->error(lang('信息不存在或已删除'));
         }
         $this->assign('info', $info);
 
         $mating = UserMatingModel::get(['user_id' => $id]);
+        $mating['have_house'] = Constant::COND_TINYINT[$mating['have_house']];
+        $mating['have_car'] = Constant::COND_TINYINT[$mating['have_car']];
+        $mating['with_parent_live'] = Constant::COND_TINYINT[$mating['with_parent_live']];
         $this->assign('mating', $mating);
 
         return $this->fetch();

app/user/controller/AdminUserController.php

@@ -11,6 +11,7 @@
 
 namespace app\user\controller;
 
+use app\common\Constant;
 use app\common\Excel;
 use app\common\Fun;
 use app\love\model\UserAuthModel;
@@ -157,8 +158,10 @@ class AdminUserController extends AdminBaseController
         $url  = $this->request->post('url');
         $file = WEB_ROOT . trim($url, '/');
         if (file_exists($file)) {
-            $excel = new Excel();
-            $data  = $excel->import($file, ['name', 'idcard', 'mobile', 'company'], 1);
+            $excel  = new Excel();
+            $data   = $excel->import($file, ['no', 'name', 'company', 'idcard', 'marry', 'mobile', 'idtype'], 1);
+            $idtype = Constant::ID_TYPE;
+            $marry  = Constant::MARRY;
             foreach ($data as $k => $v) {
                 if (empty($v['name'])) {
                     $this->error("第" . ($k + 2) . "行的姓名不能为空");
@@ -175,14 +178,20 @@ class AdminUserController extends AdminBaseController
                 if (!Fun::isMobile($v['mobile'])) {
                     $this->error("第" . ($k + 2) . "行的手机号格式错误");
                 }
-                $idcardCheck = UserAuthModel::where('idcard',$v['idcard'])->find();
+                $idcardCheck = UserAuthModel::where('idcard', $v['idcard'])->find();
                 if (!empty($idcardCheck)) {
                     $this->error("第" . ($k + 2) . "行的身份证号已存在");
                 }
-                $mobileCheck = UserAuthModel::where('mobile',$v['mobile'])->find();
+                $mobileCheck = UserAuthModel::where('mobile', $v['mobile'])->find();
                 if (!empty($mobileCheck)) {
                     $this->error("第" . ($k + 2) . "行的手机号已存在");
                 }
+                if (in_array($v['idtype'], $idtype)) {
+                    unset($v['idtype']);
+                }
+                if (in_array($v['marry'], $marry)) {
+                    unset($v['marry']);
+                }
                 UserAuthModel::create($v);
             }
         }

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

@@ -44,7 +44,6 @@
                 <th>电话号码</th>
                 <th>{:lang('AVATAR')}</th>
                 <th>{:lang('REGISTRATION_TIME')}</th>
-                <th>推荐部门</th>
                 <th>审核</th>
                 <th>审核备注</th>
                 <th>{:lang('STATUS')}</th>

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

@@ -14,10 +14,6 @@
                     <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group">
-                                <label class="control-label col-md-2">用户名</label>
-                                <div class="col-md-4">
-                                    <div class="input-text">{$info.username}</div>
-                                </div>
                                 <label class="control-label col-md-2">真实姓名</label>
                                 <div class="col-md-4">
                                     <div class="input-text">{$info.realname}</div>
@@ -50,6 +46,10 @@
                                 <div class="col-md-4">
                                     <div class="input-text">{$info['weight'] ? $info['weight'].'KG' : '保密'}</div>
                                 </div>
+                                <label class="control-label col-md-2">婚姻状况</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.marry}</div>
+                                </div>
                                 <label class="control-label col-md-2">学历</label>
                                 <div class="col-md-4">
                                     <div class="input-text">{$info.education}</div>
@@ -66,10 +66,18 @@
                                 <div class="col-md-4">
                                     <div class="input-text">{$info.job}</div>
                                 </div>
+                                <label class="control-label col-md-2">身份类型</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.id_type}</div>
+                                </div>
                                 <label class="control-label col-md-2">家庭成员</label>
                                 <div class="col-md-4">
                                     <div class="input-text">{$info.family}</div>
                                 </div>
+                                <label class="control-label col-md-2">籍贯</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.native}</div>
+                                </div>
                                 <label class="control-label col-md-2">民族</label>
                                 <div class="col-md-4">
                                     <div class="input-text">{$info.nation}</div>
@@ -78,6 +86,7 @@
                                 <div class="col-md-10 col-md-offset-2">
                                     <div class="input-text text-area">{$info.hobby}</div>
                                 </div>
+
                                 <label class="col-md-12">主图</label>
                                 <div class="col-md-10 col-md-offset-2">
                                     <notempty name="info.main_image">
@@ -88,6 +97,35 @@
                         </div>
                     </div>
                 </div>
+                <div class="panel panel-default">
+                    <div class="panel-heading">工作生活</div>
+                    <div class="panel-body">
+                        <div class="form-horizontal">
+                            <div class="form-group">
+                                <label class="col-md-2">是否有房</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.have_house}</div>
+                                </div>
+                                <label class="col-md-2">是否有车</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.have_car}</div>
+                                </div>
+                                <label class="col-md-2">是否吸烟</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.smoke}</div>
+                                </div>
+                                <label class="col-md-2">是否喝酒</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.drink}</div>
+                                </div>
+                                <label class="col-md-2">婚后是否愿意与父母同住</label>
+                                <div class="col-md-4">
+                                    <div class="input-text">{$info.with_parent_live}</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="panel panel-default">
                     <div class="panel-heading">择偶要求</div>
                     <div class="panel-body">

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

@@ -13,23 +13,23 @@
     </van-nav-bar>
 
     <div class="bg_f" style="padding-top:46px;">
-        <div class="pr z100 bg_f pt15">
-            <a href="{:url('message/invite')}">
-                <dl class="pb10 pl75 pr pt10">
-                    <dt class="pa lt pl15 pt10 t_1">
-                        <van-icon class="icon-haoyou img_45 bg-pink br50 iconfont text-center" style="line-height:50px;"></van-icon>
-                    </dt>
-                    <dd class="pb15 bo_bf7">
-                        <h3 class="fz16 fn">我的邀请</h3>
-                        <p class="fz13 color_9">
-                            <span class="inline_block br50" style="background:red;width:20px;height:20px;text-align:center;color:white;" v-if="invite_num > 0">{{invite_num}}</span>
-                            这里是您的聊天邀请
-                        </p>
-                    </dd>
-                </dl>
-            </a>
-            <div class="clear"></div>
-        </div>
+        <!--<div class="pr z100 bg_f pt15">-->
+            <!--<a href="{:url('message/invite')}">-->
+                <!--<dl class="pb10 pl75 pr pt10">-->
+                    <!--<dt class="pa lt pl15 pt10 t_1">-->
+                        <!--<van-icon class="icon-haoyou img_45 bg-pink br50 iconfont text-center" style="line-height:50px;"></van-icon>-->
+                    <!--</dt>-->
+                    <!--<dd class="pb15 bo_bf7">-->
+                        <!--<h3 class="fz16 fn">我的邀请</h3>-->
+                        <!--<p class="fz13 color_9">-->
+                            <!--<span class="inline_block br50" style="background:red;width:20px;height:20px;text-align:center;color:white;" v-if="invite_num > 0">{{invite_num}}</span>-->
+                            <!--这里是您的聊天邀请-->
+                        <!--</p>-->
+                    <!--</dd>-->
+                <!--</dl>-->
+            <!--</a>-->
+            <!--<div class="clear"></div>-->
+        <!--</div>-->
 
         <dl class="pr pl75 plr15 pt15 bg_f cursor" @click="location.href = '{:url('detail')}?id='+item.friend_id" v-for="item in list">
             <dt class="pa lt pt15 pl15">

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

@@ -104,6 +104,25 @@
         ></van-picker>
     </van-popup>
 
+    <van-field
+            required
+            readonly
+            clickable
+            :value="form.marry"
+            label="婚姻状况"
+            placeholder="请选择婚姻状况"
+            @click="showMarry = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showMarry">
+        <van-picker
+                title="婚姻状况"
+                show-toolbar
+                :columns="marry"
+                @confirm="onMarryConfirm"
+                @cancel="showMarry = false"
+        ></van-picker>
+    </van-popup>
+
     <!--学历-->
     <van-field
             required
@@ -343,6 +362,8 @@
                     high: {$high},
                     showWeight: false,
                     weight: {$weight},
+                    showMarry: false,
+                    marry: {$marry},
                     showEducation: false,
                     education: {$education},
                     showIncome: false,
@@ -391,6 +412,10 @@
                         this.$toast('请选择正确的生日');
                         return false;
                     }
+                    if (this.form.marry == '') {
+                        this.$toast('请选择婚姻状况');
+                        return false;
+                    }
                     if (this.form.education == '') {
                         this.$toast('请选择学历');
                         return false;
@@ -443,6 +468,10 @@
                     this.form.weight = value == '保密' ? 0 : value;
                     this.showWeight = false;
                 },
+                onMarryConfirm(value) {
+                    this.form.marry = value;
+                    this.showMarry = false;
+                },
                 onEducationConfirm(value) {
                     this.form.education = value;
                     this.showEducation = false;

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

@@ -44,7 +44,7 @@
             },
             methods: {
                 onSubmit() {
-                    location.href = "{:url('sex')}";
+                    location.href = "{:url('idcard')}";
                 },
             },
         });

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

@@ -115,6 +115,24 @@
                 @cancel="showWeight = false"
         ></van-picker>
     </van-popup>
+    <van-field
+            required
+            readonly
+            clickable
+            :value="form.marry"
+            label="婚姻状况"
+            placeholder="请选择婚姻状况"
+            @click="showMarry = true"
+    ></van-field>
+    <van-popup position="bottom" v-model="showMarry">
+        <van-picker
+                title="婚姻状况"
+                show-toolbar
+                :columns="marry"
+                @confirm="onMarryConfirm"
+                @cancel="showMarry = false"
+        ></van-picker>
+    </van-popup>
 
     <!--学历-->
     <van-field
@@ -359,6 +377,8 @@
                     high: {$high},
                     showWeight: false,
                     weight: {$weight},
+                    showMarry: false,
+                    marry: {$marry},
                     showEducation: false,
                     education: {$education},
                     showIncome: false,
@@ -408,6 +428,10 @@
                         this.$toast('请选择正确的生日');
                         return false;
                     }
+                    if (this.form.marry == '') {
+                        this.$toast('请选择婚姻状况');
+                        return false;
+                    }
                     if (this.form.education == '') {
                         this.$toast('请选择学历');
                         return false;
@@ -461,6 +485,10 @@
                     this.form.weight = value == '保密' ? 0 : value;
                     this.showWeight = false;
                 },
+                onMarryConfirm(value) {
+                    this.form.marry = value;
+                    this.showMarry = false;
+                },
                 onEducationConfirm(value) {
                     this.form.education = value;
                     this.showEducation = false;

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

@@ -53,6 +53,7 @@
                         <dt class="fb fz16 pb5 pr" @click="showDetail">
                             <span class="bg-pink inline_block vam mr5 t_1 pr dian br"></span> 基本资料
                             <span class="pa rt">
+                                <span class="show-more">查看更多</span>
                                 <van-icon name="arrow"></van-icon>
                             </span>
                         </dt>
@@ -63,21 +64,21 @@
                         </dd>
                     </dl>
                     <dl class="p15 pb10">
-                        <dt class="fb fz16 pb5 pr" f="but_open_dialog" data-dialog="more">
+                        <dt class="fb fz16 pb5 pr" @click="mating_show = true">
                             <span class="bg-pink inline_block vam mr5 t_1 pr dian br"></span> 择偶要求
+                            <span class="pa rt">
+                                <span class="show-more">查看更多</span>
+                                <van-icon name="arrow"></van-icon>
+                            </span>
                         </dt>
                         <dd class="fz14 pt10">
                             <span class="ptb5 bg_span plr8 br mb5 dib">年龄：{{mating_age}}</span>
                             <span class="ptb5 bg_span plr8 br mb5 dib">身高：{{mating_high}}</span>
                             <span class="ptb5 bg_span plr8 br mb5 dib">体重：{{mating_weight}}</span>
-                            <span class="ptb5 bg_span plr8 br mb5 dib" v-if="mating.native">籍贯：{{mating.native}}</span>
-                            <span class="ptb5 bg_span plr8 br mb5 dib"
-                                  v-if="mating.education">学历：{{mating.education}}</span>
-                            <span class="ptb5 bg_span plr8 br mb5 dib" v-if="mating.job">职业：{{mating.job}}</span>
                         </dd>
                     </dl>
                     <dl class="p15 pb10">
-                        <dt class="fb fz16 pb5 pr" f="but_open_dialog" data-dialog="more">
+                        <dt class="fb fz16 pb5 pr">
                             <span class="bg-pink inline_block vam mr5 t_1 pr dian br"></span> 爱情宣言
                         </dt>
                         <dd class="fz14 pb10 pt10 p-textarea">{{user.signature}}</dd>
@@ -139,26 +140,60 @@
         <h3 class="fn fz16 color_red mb10 pt20 plr12">详细资料</h3>
         <van-cell-group>
             <van-cell title="UID" :value="user.id"></van-cell>
-            <van-cell title="用户名" :value="user.username ? user.username : '对方还未填写'"></van-cell>
+            <van-cell title="姓名" :value="user.username ? user.username : '对方还未填写'"></van-cell>
+            <van-cell title="性别" :value="user.sex_text"></van-cell>
             <van-cell title="年龄" :value="user.age + '岁'"></van-cell>
             <van-cell title="身高" :value="user.high ? user.high + 'CM' : '保密'"></van-cell>
             <van-cell title="体重" :value="user.weight ? user.weight + 'KG' : '保密'"></van-cell>
+            <van-cell title="婚姻状况" :value="user.marry"></van-cell>
             <van-cell title="学历" :value="user.education"></van-cell>
             <van-cell title="年收入" :value="user.income"></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.id_type"></van-cell>
+            <van-cell title="家庭成功" :value="user.family.toString()"></van-cell>
+            <van-cell title="籍贯" :value="user.native"></van-cell>
+            <van-cell title="民族" :value="user.nation"></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>
         <van-cell-group>
+            <van-cell title="是否有房" :value="user.have_house"></van-cell>
+            <van-cell title="是否有车" :value="user.have_car"></van-cell>
+            <van-cell title="婚后是否愿意与父母同住" :value="user.with_parent_live"></van-cell>
             <van-cell title="宗教信仰" :value="user.faith"></van-cell>
             <van-cell title="是否吸烟" :value="user.smoke"></van-cell>
             <van-cell title="是否喝酒" :value="user.drink"></van-cell>
         </van-cell-group>
     </van-popup>
 
+    <!--择偶要求-->
+    <van-popup v-model="mating_show" position="right" :style="{width: '100%',height: '100%'}">
+        <van-nav-bar
+                left-text="返回"
+                @click-left="mating_show = false"
+        >
+            <template #title>
+                <span class="fz18">择偶要求</span>
+            </template>
+        </van-nav-bar>
+        <van-cell-group>
+            <van-cell title="年龄" :value="mating_age"></van-cell>
+            <van-cell title="身高" :value="mating_high"></van-cell>
+            <van-cell title="体重" :value="mating_weight"></van-cell>
+            <van-cell title="籍贯" :value="mating.native"></van-cell>
+            <van-cell title="学历" :value="mating.education"></van-cell>
+            <van-cell title="年收入" :value="mating.income"></van-cell>
+            <van-cell title="身份类型" :value="mating.id_type"></van-cell>
+            <van-cell title="是否有房" :value="mating.have_house"></van-cell>
+            <van-cell title="是否有车" :value="mating.have_car"></van-cell>
+            <van-cell title="婚后是否愿意与父母同住" :value="mating.with_parent_live"></van-cell>
+            <van-cell title="是否吸烟" :value="mating.smoke"></van-cell>
+            <van-cell title="是否喝酒" :value="mating.drink"></van-cell>
+        </van-cell-group>
+    </van-popup>
+
     <!--送礼物-->
     <van-popup v-model="gift_show" round position="bottom">
         <div class="br8 bg-white bsd">
@@ -223,6 +258,7 @@
                     image_index: 0,
                     gift_show: false,
                     detail_show: false,
+                    mating_show: false,
                     is_favorite: {$is_favorite},
                     is_select: {$is_select},
                     is_friend: {$is_friend},

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

@@ -174,7 +174,7 @@
                     sort_option: [
                         {text: '默认排序', value: 'star desc'},
                         {text: '最新注册', value: 'create_time desc'},
-                        {text: '最新登录', value: 'last_login_time desc'},
+                        {text: '最近登录', value: 'last_login_time desc'},
                     ],
                     sex_option: [
                         {text: '不限', value: 0},

public/themes/simpleboot3/portal/index.html

@@ -9,6 +9,7 @@
         .masonry {
             padding-top:0;
         }
+        .no-image {width:100%;}
     </style>
 </block>
 <block name="body">
@@ -29,76 +30,25 @@
 
     <!--推荐嘉宾-->
     <div style="padding-top:20px;">
-        <div class="index_title">推荐嘉宾</div>
+        <div class="index_title">智能推荐</div>
     </div>
-    <div class="index_cursor">
-        <span :class="tab === 0 ? 'cur' : ''" @click="tab = 0">优质女嘉宾</span>
-        <span :class="tab === 1 ? 'cur' : ''" @click="tab = 1">优质男嘉宾</span>
-    </div>
-    <div class="grid_list index_people" v-show="tab === 0">
+    <div class="grid_list index_people">
         <div class="masonry">
-            <div class="item" v-for="(item) in woman_list">
+            <div class="item" v-for="(item) in list">
                 <div class="item__content">
                     <a :href="'{:url('love/userwall/detail')}?id=' + item.id">
                         <div class="box">
                             <img class="image"
                                  :src="item.main_image_thumb ? item.main_image_thumb : '__TMPL__/public/assets/images/userwall/no_image_thumb.png'"/>
-                            <div class="info">
-                                <h3 class="user_name">
-                                        <span class="inline_block">
-                                            <van-icon
-                                                    :class="[item.sex == 1 ? 'icon-xingbie-nan text-blue' : 'icon-xingbie-nv text-pink','iconfont']"></van-icon>
-                                            {{item.username}}
-                                        </span>
-                                </h3>
-                                <div class="describe">
-                                    {{item.age}}岁
-                                    · {{item.education}}
-                                    · {{item.high}}CM
-                                </div>
-                                <div class="detail">
-                                    {{item.signature}}
-                                </div>
-                            </div>
                         </div>
                     </a>
                 </div>
             </div>
         </div>
-        <div class="van-list__finished-text" v-if="woman_list.length == 0">没有更多了</div>
-        <div class="clear"></div>
-    </div>
-    <div class="grid_list index_people" v-show="tab === 1">
-        <div class="masonry">
-            <div class="item" v-for="(item) in man_list">
-                <div class="item__content">
-                    <a :href="'{:url('love/userwall/detail')}?id=' + item.id">
-                        <div class="box">
-                            <img class="image"
-                                 :src="item.main_image_thumb ? item.main_image_thumb : '__TMPL__/public/assets/images/userwall/no_image_thumb.png'"/>
-                            <div class="info">
-                                <h3 class="user_name">
-                                        <span class="inline_block">
-                                            <van-icon
-                                                    :class="[item.sex == 1 ? 'icon-xingbie-nan text-blue' : 'icon-xingbie-nv text-pink','iconfont']"></van-icon>
-                                            {{item.username}}
-                                        </span>
-                                </h3>
-                                <div class="describe">
-                                    {{item.age}}岁
-                                    · {{item.education}}
-                                    · {{item.high}}CM
-                                </div>
-                                <div class="detail">
-                                    {{item.signature}}
-                                </div>
-                            </div>
-                        </div>
-                    </a>
-                </div>
-            </div>
+        <div class="van-list__finished-text" v-if="list.length == 0">
+            <!--<div class="van-list__finished-text">暂无推荐，请到缘分大厅寻找缘分</div>-->
+            <img class="no-image" src="__TMPL__/public/assets/images/no_user.png">
         </div>
-        <div class="van-list__finished-text" v-if="man_list.length == 0">没有更多了</div>
         <div class="clear"></div>
     </div>
 
@@ -143,9 +93,7 @@
                 return {
                     images: {$images},
                     active: 0,
-                    tab: 0,
-                    man_list: {$man_list},
-                    woman_list: {$woman_list},
+                    list: {$list},
                     unread_num: {$unread_num},
                 };
             },

public/themes/simpleboot3/portal/index_back.html

@@ -0,0 +1,159 @@
+<extend name="public@base"/>
+<block name="css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/index.css?v=1">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/userwall.css">
+    <style>
+        #app {
+            padding-bottom: 50px;
+        }
+        .masonry {
+            padding-top:0;
+        }
+    </style>
+</block>
+<block name="body">
+
+    <!--轮播图-->
+    <van-nav-bar class="bg-pink">
+        <template #title>
+            <span style="color:white;">首页</span>
+        </template>
+    </van-nav-bar>
+    <van-swipe :autoplay="3000">
+        <van-swipe-item v-for="(image, index) in images" :key="index">
+            <van-image width="100%" :src="image.image"></van-image>
+        </van-swipe-item>
+    </van-swipe>
+
+    <div class="split-block"></div>
+
+    <!--推荐嘉宾-->
+    <div style="padding-top:20px;">
+        <div class="index_title">推荐嘉宾</div>
+    </div>
+    <div class="index_cursor">
+        <span :class="tab === 0 ? 'cur' : ''" @click="tab = 0">优质女嘉宾</span>
+        <span :class="tab === 1 ? 'cur' : ''" @click="tab = 1">优质男嘉宾</span>
+    </div>
+    <div class="grid_list index_people" v-show="tab === 0">
+        <div class="masonry">
+            <div class="item" v-for="(item) in woman_list">
+                <div class="item__content">
+                    <a :href="'{:url('love/userwall/detail')}?id=' + item.id">
+                        <div class="box">
+                            <img class="image"
+                                 :src="item.main_image_thumb ? item.main_image_thumb : '__TMPL__/public/assets/images/userwall/no_image_thumb.png'"/>
+                            <div class="info">
+                                <h3 class="user_name">
+                                        <span class="inline_block">
+                                            <van-icon
+                                                    :class="[item.sex == 1 ? 'icon-xingbie-nan text-blue' : 'icon-xingbie-nv text-pink','iconfont']"></van-icon>
+                                            {{item.username}}
+                                        </span>
+                                </h3>
+                                <div class="describe">
+                                    {{item.age}}岁
+                                    · {{item.education}}
+                                    · {{item.high}}CM
+                                </div>
+                                <div class="detail">
+                                    {{item.signature}}
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <div class="van-list__finished-text" v-if="woman_list.length == 0">没有更多了</div>
+        <div class="clear"></div>
+    </div>
+    <div class="grid_list index_people" v-show="tab === 1">
+        <div class="masonry">
+            <div class="item" v-for="(item) in man_list">
+                <div class="item__content">
+                    <a :href="'{:url('love/userwall/detail')}?id=' + item.id">
+                        <div class="box">
+                            <img class="image"
+                                 :src="item.main_image_thumb ? item.main_image_thumb : '__TMPL__/public/assets/images/userwall/no_image_thumb.png'"/>
+                            <div class="info">
+                                <h3 class="user_name">
+                                        <span class="inline_block">
+                                            <van-icon
+                                                    :class="[item.sex == 1 ? 'icon-xingbie-nan text-blue' : 'icon-xingbie-nv text-pink','iconfont']"></van-icon>
+                                            {{item.username}}
+                                        </span>
+                                </h3>
+                                <div class="describe">
+                                    {{item.age}}岁
+                                    · {{item.education}}
+                                    · {{item.high}}CM
+                                </div>
+                                <div class="detail">
+                                    {{item.signature}}
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <div class="van-list__finished-text" v-if="man_list.length == 0">没有更多了</div>
+        <div class="clear"></div>
+    </div>
+
+    <van-tabbar v-model="active" active-color="#FF589B" :before-change="tabbarChange">
+        <van-tabbar-item url="{:url('portal/index/index')}">
+            <span>首页</span>
+            <template #icon>
+                <van-icon name="home-o" size="25px"></van-icon>
+            </template>
+        </van-tabbar-item>
+        <van-tabbar-item url="{:url('love/userwall/index')}">
+            <span>缘份</span>
+            <template #icon>
+                <van-icon name="like-o" size="25px"></van-icon>
+            </template>
+        </van-tabbar-item>
+        <van-tabbar-item url="{:url('love/active/index')}">
+            <span>活动</span>
+            <template #icon>
+                <van-icon name="apps-o" size="25px"></van-icon>
+            </template>
+        </van-tabbar-item>
+        <van-tabbar-item url="{:url('love/message/index')}" :badge="unread_num ? unread_num : ''">
+            <span>消息</span>
+            <template #icon>
+                <van-icon name="comment-o" size="25px"></van-icon>
+            </template>
+        </van-tabbar-item>
+        <van-tabbar-item url="{:url('love/my/index')}">
+            <span>我的</span>
+            <template #icon>
+                <van-icon name="contact" size="25px"></van-icon>
+            </template>
+        </van-tabbar-item>
+    </van-tabbar>
+</block>
+<block name="script">
+    <script>
+        new Vue({
+            el: '#app',
+            data() {
+                return {
+                    images: {$images},
+                    active: 0,
+                    tab: 0,
+                    man_list: {$man_list},
+                    woman_list: {$woman_list},
+                    unread_num: {$unread_num},
+                };
+            },
+            methods: {
+                tabbarChange() {
+                    return false;
+                },
+            },
+        });
+    </script>
+</block>

public/themes/simpleboot3/public/assets/css/userwall.css

@@ -25,6 +25,7 @@
 .image_box .rq {display:flex;position:absolute;left:0;bottom:10px;background: rgba(0, 0, 0, 0.5);padding:5px 10px;color:white;border-radius:0 20px 20px 0;font-size:14px;}
 .image_box .rq img {width:20px;height:20px;margin-right:10px;}
 .detail_describe {width:100%;background:white;padding:22px 0 16px 22px;box-sizing:border-box;}
+.show-more {font-weight: normal;font-size: 14px;position: absolute;width: 60px;right: 10px;}
 .detail_bottom {width:100%;position:fixed;box-sizing:border-box;left:0;bottom:0;height:50px;display:flex;justify-content:center;align-items:center;}
 .detail_bottom .bottom_grid {flex:1;height:50px;display:flex;flex-direction:column;justify-content:center;align-items:center;color:var(--pink);}
 .detail_bottom .bottom_grid span {font-size:13px;}