Browse Source

去掉属性和鞋码

lizhen_gitee 8 months ago
parent
commit
005d0e9ef6

+ 0 - 2
application/admin/lang/zh-cn/user/user.php

@@ -52,8 +52,6 @@ return [
     'Is_active'              => '是否活跃',
     'Is_active 1'            => '是',
     'Is_active 0'            => '否',
-    'Attribute'              => '属性',
-    'Shoesize'               => '鞋码',
     'Is_tuijian'             => '首页推荐',
     'Is_tuijian 1'           => '是',
     'Is_tuijian 0'           => '否',

+ 1 - 12
application/admin/view/user/user/add.html

@@ -250,18 +250,7 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Attribute')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-attribute" class="form-control" name="row[attribute]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Shoesize')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-shoesize" class="form-control" name="row[shoesize]" type="text" value="">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_tuijian')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 3 - 0
application/api/controller/Lianmeng.php

@@ -12,6 +12,9 @@ class Lianmeng extends Api
     protected $noNeedLogin = ['*'];
     protected $noNeedRight = ['*'];
 
+    public function __construct(){
+        exit;
+    }
 
     //道具列表
     public function decorate_list(){

+ 1 - 1
application/api/controller/Sms.php

@@ -64,7 +64,7 @@ class Sms extends Api
         if ($ret) {
             $this->success(__('发送成功'));
         } else {
-            $this->error(__('发送失败,请检查短信配置是否正确'));
+            $this->error(__('发送失败'));
         }
     }
 

+ 2 - 3
application/api/controller/Usercenter.php

@@ -36,8 +36,7 @@ class Usercenter extends Api
         'photo_images',
 
         'tag_ids',
-        'attribute',
-        'shoesize',
+
     ];
 
     //搜索用户列表
@@ -49,7 +48,7 @@ class Usercenter extends Api
 
         $list = Db::name('user')->alias('user')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where('user.username',$username)->order('is_active desc,id asc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);

+ 5 - 5
application/api/controller/Userfollow.php

@@ -32,7 +32,7 @@ class Userfollow extends Api
             ->alias('follow')
             ->join('user','follow.follow_uid = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where('follow.uid',$user_id)->order('follow.id desc')->group('follow.follow_uid')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -75,7 +75,7 @@ class Userfollow extends Api
             ->join('user','follow.uid = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
             ->join('user_power power','user.id = power.user_id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where('follow.follow_uid',$user_id)
             ->where('power.yinsi',0)
             ->group('follow.uid')
@@ -106,7 +106,7 @@ class Userfollow extends Api
             ->alias('follow')
             ->join('user','follow.uid = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where('follow.follow_uid',$this->auth->id)
             ->group('follow.uid')
             ->order('follow.id desc')->autopage()->select();
@@ -147,7 +147,7 @@ class Userfollow extends Api
             ->alias('follow')
             ->join('user','follow.uid = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where('follow.follow_uid',$this->auth->id)->where('user.id','NOT IN',$my_follow_uids)->order('follow.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -175,7 +175,7 @@ class Userfollow extends Api
         $list = Db::name('message')->alias('msg')
             ->join('user user','user.id = msg.infotype_id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('msg.id as msg_id,user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('msg.id as msg_id,user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where(['msg.infotype'=>'newfriend','msg.user_id'=>$this->auth->id,'msg.audit_status'=>0])
             ->where('msg.infotype_id','NOT IN',$my_follow_uids)
             ->order('msg.id desc')->autopage()->select();

+ 0 - 2
application/common/library/Auth.php

@@ -56,8 +56,6 @@ class Auth
 
         'wechat_openid',
 
-        'attribute',
-        'shoesize',
 
         'jinyantype',
         'jinyantime',