diff --git a/app/Http/Controllers/GoodController.php b/app/Http/Controllers/GoodController.php index dd49fdd..01ed411 100644 --- a/app/Http/Controllers/GoodController.php +++ b/app/Http/Controllers/GoodController.php @@ -186,7 +186,7 @@ class GoodController extends Controller //$data['tags'] = Tag::orderby('id', 'asc')->get(); if(!$user || $user->baned) return view::make('good.goodInfoForm')->with($data)->withErrors('您的账号被封禁,无法出售商品,请联系系统管理员'); - if(UserInfo::where('user_id', $user_id)->count() == 0) + if(UserInfo::where('user_id', $user_id)->count() == 0 && !$user->wechat_open_id) return view::make('good.goodInfoForm')->with($data)->withErrors('你必须先添加联系方式才能出售'); return view::make('good.goodInfoForm')->with($data); } @@ -197,7 +197,7 @@ class GoodController extends Controller $user = User::find($user_id); if(!$user || $user->baned) return Redirect::back()->withInput()->withErrors('您的账号被封禁,请联系系统管理员'); - if(UserInfo::where('user_id', $user_id)->count() == 0) + if(UserInfo::where('user_id', $user_id)->count() == 0 && !$user->wechat_open_id) return Redirect::back()->withInput()->withErrors('你必须添加联系方式才能出售'); $input = $request->all(); $good = new GoodInfo; diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index b5d1f8a..f5be95d 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -29,7 +29,7 @@ class TransactionController extends Controller $user = User::find($user_id); if(!$user || $user->baned) return Redirect::back()->withInput()->withErrors('您的账号被封禁,请联系系统管理员'); - if(UserInfo::where('user_id', $user_id)->count() == 0) + if(UserInfo::where('user_id', $user_id)->count() == 0 && !$user->wechat_open_id) return Redirect::back()->withInput()->withErrors('你必须添加联系方式才能购买'); $count = $request->count; $result = $this->buy($good_id, $user_id, $count, $request->ip()); diff --git a/app/Http/Middleware/RegisterComplete.php b/app/Http/Middleware/RegisterComplete.php index e1f2ce4..56a39ac 100644 --- a/app/Http/Middleware/RegisterComplete.php +++ b/app/Http/Middleware/RegisterComplete.php @@ -20,8 +20,8 @@ class RegisterComplete if($request->session()->has('user_id')) { $user = User::find($request->session()->get('user_id')); - if($user->registerCompletion()) - return Redirect::to('/register/' . $user->registerCompletion()); + if($user->registerCompletion(true)) + return Redirect::to('/register/' . $user->registerCompletion(true)); return $next($request); } else diff --git a/app/User.php b/app/User.php index 747f127..f0572a2 100644 --- a/app/User.php +++ b/app/User.php @@ -16,9 +16,9 @@ class User extends Model return $this->hasMany('App\UserInfo'); } - public function registerCompletion() + public function registerCompletion($force = false) { - if ($this->nickname == null || !Storage::exists('avatar/' . $this->id)) { + if (!$force && ($this->nickname == null || !Storage::exists('avatar/' . $this->id))) { return 2; } else if (count($this->user_infos) == 0 && $this->wechat_open_id == null) { return 3; diff --git a/resources/views/transaction.blade.php b/resources/views/transaction.blade.php index fad4e98..608cea0 100644 --- a/resources/views/transaction.blade.php +++ b/resources/views/transaction.blade.php @@ -79,6 +79,9 @@ 地址 + @if(count($seller->user_infos) == 0) + 该用户没有填写联系方式,你们可以通过“消息”来联系。“消息”会通过东大小秘书微信公众号进行推送。 + @endif @foreach($seller->user_infos as $userinfo) {{ $seller->realname }} @@ -103,6 +106,9 @@ 地址 + @if(count($buyer->user_infos) == 0) + 该用户没有填写联系方式,你们可以通过“消息”来联系。“消息”会通过东大小秘书微信公众号进行推送。 + @endif @foreach($buyer->user_infos as $userinfo) {{ $buyer->realname }}