Explorar o código

更新一些基础控件与表述

sandm %!s(int64=2) %!d(string=hai) anos
pai
achega
d6843edea4

+ 3 - 3
app/love/controller/MyController.php

@@ -526,14 +526,14 @@ class MyController extends LoveBaseController
         UserMessageModel::create([
             'from_id'     => $user_id,
             'to_id'       => $id,
-            'message'     => '我已接受你的交往请求,请继续努力哦!',
+            'message'     => '我已接受你的交往请求,快来一起聊天吧!',
             'create_time' => $time,
         ]);
 
         //增加最后聊天消息
-        UserFriendModel::update(['last_msg' => '我:我已接受你的交往请求,请继续努力哦!', 'last_msg_time' => $time], ['user_id' => $user_id, 'friend_id' => $id]);
+        UserFriendModel::update(['last_msg' => '我:我已接受你的交往请求,快来一起聊天吧!', 'last_msg_time' => $time], ['user_id' => $user_id, 'friend_id' => $id]);
         $friend                = UserFriendModel::get(['user_id' => $id, 'friend_id' => $user_id]);
-        $friend->last_msg      = '对方:我已接受你的交往请求,请继续努力哦!';
+        $friend->last_msg      = '对方:我已接受你的交往请求,快来一起聊天吧!';
         $friend->last_msg_time = $time;
         $friend->unread_num++;
         $friend->save();

+ 13 - 0
public/themes/simpleboot3/love/my/profile.html

@@ -123,6 +123,14 @@
         ></van-picker>
     </van-popup>
 
+    <van-field
+            v-if="form.marry == '离异'"
+            required
+            v-model="form.children"
+            label="几个小孩"
+            placeholder="请输入您小孩数量"
+    ></van-field>
+
     <!--学历-->
     <van-field
             required
@@ -222,6 +230,7 @@
 
     <!--民族-->
     <van-field
+            required
             readonly
             clickable
             :value="form.nation"
@@ -440,6 +449,10 @@
                         this.$toast('请输入籍贯');
                         return false;
                     }
+                    if (this.form.nation == '') {
+                        this.$toast('请选择民族');
+                        return false;
+                    }
                     $.post("{:url('profilePost')}", this.form, function (json) {
                         history.back();
                     }, 'json');

+ 13 - 0
public/themes/simpleboot3/love/register/profile.html

@@ -134,6 +134,14 @@
         ></van-picker>
     </van-popup>
 
+    <van-field
+            v-if="form.marry == '离异'"
+            required
+            v-model="form.children"
+            label="几个小孩"
+            placeholder="请输入您小孩数量"
+    ></van-field>
+
     <!--学历-->
     <van-field
             required
@@ -233,6 +241,7 @@
 
     <!--民族-->
     <van-field
+            required
             readonly
             clickable
             :value="form.nation"
@@ -456,6 +465,10 @@
                         this.$toast('请输入籍贯');
                         return false;
                     }
+                    if (this.form.nation == '') {
+                        this.$toast('请选择民族');
+                        return false;
+                    }
                     $.post("{:url('profile')}", this.form, function (json) {
                         location.href = "{:url('cond')}";
                     }, 'json');

+ 1 - 1
public/themes/simpleboot3/love/userwall/detail.html

@@ -151,7 +151,7 @@
             <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.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>