BF-202205051124\Administrator 3 年 前
コミット
39b5076238

+ 5 - 13
app/Http/Controllers/Api/MemberController.php

@@ -96,7 +96,7 @@ class MemberController extends FrontController
         if (empty($code_ret)) {
             return $this->apiResponseError($send_server->getErrorMsg() ?: '验证码错误');
         }
-        $member = Member::where('phone', $mobile)->where('status',1)->select(['id', 'token_str'])->first();
+        $member = Member::where('address', $mobile)->where('status',1)->select(['id', 'token_str'])->first();
         if ($member) {
             $token_str = PassServer::creatServer()->getMemberToken($member->{'id'});
             Member::where('id', $member->{'id'})->update(['token_str' => $token_str]);
@@ -121,25 +121,17 @@ class MemberController extends FrontController
      */
     function login()
     {
-        $mobile = request()->input('phone', '13900139110');
+        $mobile = request()->input('address', '');
         if (empty($mobile)) {
-            return $this->apiResponseError('请输入手机号码');
-        }
-        $password = request()->input('password', '123456');
-        if (empty($password)) {
-            return $this->apiResponseError('请输入登录密码');
+            return $this->apiResponseError('地址信息错误');
         }
-        $member = Member::where('phone', $mobile)->where('status',1)->select(['id', 'password', 'encrypt'])->first();
+        $member = Member::where('address', $mobile)->where('status',1)->select(['id', 'password', 'encrypt'])->first();
         if (empty($member)) {
             return $this->apiResponseError('当前账户未注册');
         }
-        $pass_server = PassServer::creatServer($password, $member->{'encrypt'});
-        if (!$pass_server->verifyPass($member->{'password'})) {
-            return $this->apiResponseError('登陆密码错误');
-        }
         $token_str = PassServer::creatServer()->getMemberToken($member->{'id'});
         Member::where('id', $member->{'id'})->update(['token_str' => $token_str]);
-        return $this->apiResponseSuccess('登陆成功', ['m_id' => $member->{'id'}, 'token' => $token_str]);
+        return $this->apiResponseSuccess('登陆成功', ['token' => $token_str]);
     }
 
 

+ 0 - 2
app/Http/Controllers/HomeController.php

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 
-use App\Events\UpdateSpecEvent;
-use App\Models\GoodsSpec;
 use App\Servers\AdminLogsServer;
 use App\Servers\IndentNumServer;
 use App\Servers\PassServer;

+ 2 - 18
app/Models/Banner.php

@@ -20,8 +20,6 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property string|null $title 标题
- * @property-read \App\Models\Goods|null $goods
- * @property-read \App\Models\GoodsClass|null $oneClass
  * @method static \Illuminate\Database\Eloquent\Builder|Banner newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Banner newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Banner query()
@@ -36,6 +34,8 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|Banner whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Banner whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @property string $image_en banner英文图片
+ * @method static \Illuminate\Database\Eloquent\Builder|Banner whereImageEn($value)
  */
 class Banner extends Model implements Transformable
 {
@@ -48,21 +48,5 @@ class Banner extends Model implements Transformable
      */
     protected $guarded = ['id', 'updated_at', 'created_at'];
 
-    /**
-     * 关联绑定商品
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    function goods(){
-        return $this->hasOne('App\Models\Goods','id','to_id');
-    }
-
-
-    /**
-     * 关联绑定分类
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    function oneClass(){
-        return $this->hasOne('App\Models\GoodsClass','id','to_id');
-    }
 
 }

+ 4 - 0
app/Models/Config.php

@@ -26,6 +26,10 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|Config whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Config whereValue($value)
  * @mixin \Eloquent
+ * @property int|null $is_update 是否可以修改
+ * @property string|null $title 标题
+ * @method static \Illuminate\Database\Eloquent\Builder|Config whereIsUpdate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Config whereTitle($value)
  */
 class Config extends Model implements Transformable
 {

+ 10 - 0
app/Models/Member.php

@@ -67,6 +67,16 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|Member whereOnLine($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Member whereSid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Member whereSource($value)
+ * @property string $address 手机号码
+ * @property string $recom_mobile 推荐人手机号码
+ * @property string|null $err_msg 锁定说明
+ * @property string|null $m_p
+ * @property int|null $is_lock 是否锁定,1:是,0否
+ * @method static \Illuminate\Database\Eloquent\Builder|Member whereAddress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Member whereErrMsg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Member whereIsLock($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Member whereMP($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Member whereRecomMobile($value)
  */
 class Member extends Model implements Transformable
 {

+ 8 - 0
app/Models/Members.php

@@ -72,6 +72,14 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|Members whereShareImg($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Members whereSid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Members whereSource($value)
+ * @property string $address 手机号码
+ * @property string|null $err_msg 锁定说明
+ * @property string|null $m_p
+ * @property int|null $is_lock 是否锁定,1:是,0否
+ * @method static \Illuminate\Database\Eloquent\Builder|Members whereAddress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Members whereErrMsg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Members whereIsLock($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Members whereMP($value)
  */
 class Members extends Model implements Transformable
 {

+ 2 - 0
app/Models/Menu.php

@@ -38,6 +38,8 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|Menu whereSort($value)
  * @property int|null $version 版本 1旧版 2新版
  * @method static \Illuminate\Database\Eloquent\Builder|Menu whereVersion($value)
+ * @property int|null $is_del
+ * @method static \Illuminate\Database\Eloquent\Builder|Menu whereIsDel($value)
  */
 class Menu extends Model implements Transformable
 {

+ 2 - 0
app/Models/MenuUrl.php

@@ -32,6 +32,8 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @property int|null $child_id 子菜单ID
  * @method static \Illuminate\Database\Eloquent\Builder|MenuUrl whereChildId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|MenuUrl whereParentId($value)
+ * @property int|null $type 类型:1:后台地址,2:api地址
+ * @method static \Illuminate\Database\Eloquent\Builder|MenuUrl whereType($value)
  */
 class MenuUrl extends Model implements Transformable
 {

+ 10 - 0
app/Models/MoneyDetail.php

@@ -40,6 +40,16 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @property int|null $shop_id 店铺ID
  * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetail whereShopId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetail whereLevel($value)
+ * @property string|null $admin_mark 备注(管理员备注)(数目变化)
+ * @property int $member_id 被操作人ID
+ * @property string|null $phone 被操作人账号
+ * @property string|null $mark_en 英文备注
+ * @property int|null $is_ok 是否结算完成
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetail whereAdminMark($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetail whereIsOk($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetail whereMarkEn($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetail whereMemberId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetail wherePhone($value)
  */
 class MoneyDetail extends Model implements Transformable
 {

+ 10 - 0
app/Models/MoneyDetails.php

@@ -40,6 +40,16 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetails whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetails whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @property string|null $admin_mark 备注(管理员备注)(数目变化)
+ * @property int $member_id 被操作人ID
+ * @property string|null $phone 被操作人账号
+ * @property string|null $mark_en 英文备注
+ * @property int|null $is_ok 是否结算完成
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetails whereAdminMark($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetails whereIsOk($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetails whereMarkEn($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetails whereMemberId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MoneyDetails wherePhone($value)
  */
 class MoneyDetails extends Model implements Transformable
 {

+ 4 - 0
app/Models/Notice.php

@@ -30,6 +30,10 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @method static \Illuminate\Database\Eloquent\Builder|Notice whereSort($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Notice whereTitle($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Notice whereUpdatedAt($value)
+ * @property string|null $title_en 标题
+ * @property string|null $content_en 内容(英文)
+ * @method static \Illuminate\Database\Eloquent\Builder|Notice whereContentEn($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Notice whereTitleEn($value)
  */
 class Notice extends Model implements Transformable
 {

+ 6 - 0
app/Models/Withdraw.php

@@ -34,6 +34,12 @@ use Prettus\Repository\Traits\TransformableTrait;
  * @property string|null $wx_data
  * @method static \Illuminate\Database\Eloquent\Builder|Withdraw whereWithdrawType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Withdraw whereWxData($value)
+ * @property int $coin_id 货币类型
+ * @property string $address
+ * @property string $hash
+ * @method static \Illuminate\Database\Eloquent\Builder|Withdraw whereAddress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Withdraw whereCoinId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Withdraw whereHash($value)
  */
 class Withdraw extends Model implements Transformable
 {