From 20ebce97f4a873c98e46f715d2c8b564b8a20414 Mon Sep 17 00:00:00 2001 From: yuki Date: Sat, 17 Jun 2017 02:05:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=A6=96=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E5=85=AC=E7=A4=BA=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AdminController.php | 3 + app/Http/Controllers/ContentController.php | 2 + app/Http/Controllers/MessageController.php | 20 ++-- app/Transaction.php | 1 + app/User.php | 10 ++ resources/views/admin/index.blade.php | 116 ++++++++++++++++++++- resources/views/welcome.blade.php | 90 +++++++++++++++- 7 files changed, 227 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 1ef9c76..23f68d5 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -11,6 +11,7 @@ use App\User; use App\Announcement; use App\Http\Controllers\Controller; use App\Ticket; +use App\Transaction; use Mews\Purifier\Purifier; class AdminController extends Controller @@ -29,6 +30,8 @@ class AdminController extends Controller $data['cats'] = GoodCat::orderby('cat_name', 'asc')->get(); $data['announcements'] = Announcement::orderby('id', 'dsc')->get(); $data['reports'] = Ticket::where('type', '2')->orderby('id', 'dsc')->paginate(16); + $data['users'] = User::orderby('id', 'asc')->paginate(16); + $data['trans'] = Transaction::orderby('id', 'asc')->paginate(16); return View::make('admin.index')->with($data); } diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php index b646999..a8cf819 100644 --- a/app/Http/Controllers/ContentController.php +++ b/app/Http/Controllers/ContentController.php @@ -10,6 +10,7 @@ use App\Http\Controllers\Controller; use App\GoodInfo; use App\GoodCat; use App\Announcement; +use App\Transaction; class ContentController extends Controller { @@ -25,6 +26,7 @@ class ContentController extends Controller $data['catgoods'][$cat->cat_name] = GoodInfo::where('cat_id', $cat->id)->where('baned', false)->inRandomOrder()->limit(4)->get(); } $data['announces'] = Announcement::orderby('id', 'dsc')->limit(3)->get(); + $data['trans'] = Transaction::where('status', '>', 3)->orderby('id', 'dsc')->get(); return View::make('welcome')->with($data); } diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php index f42ef1a..46fc9f8 100644 --- a/app/Http/Controllers/MessageController.php +++ b/app/Http/Controllers/MessageController.php @@ -23,16 +23,6 @@ class MessageController extends Controller { public function showMessageView(Request $request) { - $user_id = $request->session()->get('user_id'); - $post_data = 'user_id='.$user_id.''; - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, '127.0.0.1:6565/notify'); - curl_setopt($ch, CURLOPT_HEADER, 1); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); - $output = curl_exec($ch); - curl_close($ch); return View::make('message.message'); } @@ -49,6 +39,16 @@ class MessageController extends Controller MessageContact::where('user_id', $user_id) ->where('contact_id', $contact_id) ->update(['unread_count' => 0]); + $user_id = $request->session()->get('user_id'); + $post_data = 'user_id='.$user_id.''; + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, '127.0.0.1:6565/notify'); + curl_setopt($ch, CURLOPT_HEADER, 1); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); + $output = curl_exec($ch); + curl_close($ch); return json_encode($messages); } diff --git a/app/Transaction.php b/app/Transaction.php index 8f0ec3f..a8eacf8 100644 --- a/app/Transaction.php +++ b/app/Transaction.php @@ -32,4 +32,5 @@ class Transaction extends Model { return $this->hasOne('App\Ticket', 'trans_id'); } + } diff --git a/app/User.php b/app/User.php index 870749b..71698f7 100644 --- a/app/User.php +++ b/app/User.php @@ -34,4 +34,14 @@ class User extends Model return $this->nickname != "" ? $this->nickname : "一位先锋市场用户"; } + public function getcoding() + { + $len=strlen($this->stuid); + $ans = ""; + $ans = $ans . ($this->stuid)[0]; + for($i=1; $i<($len-1); $i++) $ans = $ans . '*'; + $ans = $ans . ($this->stuid)[$len-1]; + return $ans; + } + } diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 945ca51..a45492e 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -7,7 +7,9 @@
@@ -91,6 +93,7 @@ # 举报者ID 被举报者ID + 举报理由 受理管理员ID 状态 @@ -98,9 +101,10 @@ @foreach($reports as $repo) - {{ $repo->id }} - {{ $repo->sender_id }} - {{ $repo->receiver_id }} + {{$repo->id}} + {{$repo->sender_id}} + {{$repo->receiver_id}} + {{$repo->message}} @if(!$repo->assignee)
@@ -144,6 +148,110 @@ {{ $reports->links() }}
+
+
+ + + + + + + + + + + + + + + @foreach($users as $user) + + + + + + + + + + + + + + @endforeach +
#权限学号真实姓名昵称用户名邮箱是否封禁注册时间
{{$user->id}}{{$user->privilege}}{{$user->stuid}}{{$user->realname}}{{$user->nickname}}{{$user->username}}{{$user->email}} + @if($user->baned == 0) + 否 + @endif + @if($user->baned == 1) + 已封禁{{$user->banedtime}}天 + @endif + @if($user->baned == -1) + 已永久封禁 + @endif + {{$user->created_at}}
+
+ {{ $users->links() }} +
+ +
+
+ + + + + + + + + + + + + @foreach($trans as $tran) + @if($tran->seller != NULL) + + + + + + + + + + + + @endif + @endforeach +
#卖家学号买家学号商品ID交易数目交易状态评价
{{$tran->id}}{{$tran->seller->stuid}}{{$tran->buyer->stuid}}{{$tran->good_id}}{{$tran->number}} + @if($tran->status == 0) + 订单已取消 + @endif + @if($tran->status == 1) + 买家已购买，卖家未确认 + @endif + @if($tran->status == 2) + 卖家已确认 + @endif + @if($tran->status == 3) + 交易失败 + @endif + @if($tran->status == 4) + 交易成功待评价 + @endif + @if($tran->status == 5) + 交易成功已评价 + @endif + + @if($tran->status == 5) + {{$tran->reason}} + @else + 无 + @endif +
+
+ {{ $trans->links() }} +
@@ -186,3 +260,17 @@ @endsection + + From 780eb1b8280d6a21989622d6387fd4452cd75bd3 Mon Sep 17 00:00:00 2001 From: yuki Date: Sat, 17 Jun 2017 12:14:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=A0=8F=E7=9A=84bug=EF=BC=8C=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=9C=AA=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AdminController.php | 6 +-- app/Http/Controllers/MessageController.php | 20 ++++----- app/Transaction.php | 3 +- app/User.php | 4 +- resources/views/admin/index.blade.php | 6 +-- resources/views/welcome.blade.php | 49 ++++++++++++---------- 6 files changed, 47 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 23f68d5..01a17fe 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -29,9 +29,9 @@ class AdminController extends Controller $data['users'] = User::orderby('id', 'asc')->get(); $data['cats'] = GoodCat::orderby('cat_name', 'asc')->get(); $data['announcements'] = Announcement::orderby('id', 'dsc')->get(); - $data['reports'] = Ticket::where('type', '2')->orderby('id', 'dsc')->paginate(16); - $data['users'] = User::orderby('id', 'asc')->paginate(16); - $data['trans'] = Transaction::orderby('id', 'asc')->paginate(16); + $data['reports'] = Ticket::where('type', '2')->orderby('id', 'dsc')->paginate(40); + $data['users'] = User::orderby('id', 'asc')->paginate(40); + $data['trans'] = Transaction::orderby('id', 'asc')->paginate(40); return View::make('admin.index')->with($data); } diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php index 46fc9f8..f42ef1a 100644 --- a/app/Http/Controllers/MessageController.php +++ b/app/Http/Controllers/MessageController.php @@ -23,6 +23,16 @@ class MessageController extends Controller { public function showMessageView(Request $request) { + $user_id = $request->session()->get('user_id'); + $post_data = 'user_id='.$user_id.''; + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, '127.0.0.1:6565/notify'); + curl_setopt($ch, CURLOPT_HEADER, 1); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); + $output = curl_exec($ch); + curl_close($ch); return View::make('message.message'); } @@ -39,16 +49,6 @@ class MessageController extends Controller MessageContact::where('user_id', $user_id) ->where('contact_id', $contact_id) ->update(['unread_count' => 0]); - $user_id = $request->session()->get('user_id'); - $post_data = 'user_id='.$user_id.''; - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, '127.0.0.1:6565/notify'); - curl_setopt($ch, CURLOPT_HEADER, 1); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); - $output = curl_exec($ch); - curl_close($ch); return json_encode($messages); } diff --git a/app/Transaction.php b/app/Transaction.php index a8eacf8..d253b9b 100644 --- a/app/Transaction.php +++ b/app/Transaction.php @@ -20,7 +20,8 @@ class Transaction extends Model public function getSellerIdAttribute() { - return $this->good->user_id; + if($this->good != NULL) + return $this->good->user_id; } public function seller() diff --git a/app/User.php b/app/User.php index 71698f7..df70742 100644 --- a/app/User.php +++ b/app/User.php @@ -38,9 +38,9 @@ class User extends Model { $len=strlen($this->stuid); $ans = ""; - $ans = $ans . ($this->stuid)[0]; + $ans = $ans . substr($this->stuid, 0, 1); for($i=1; $i<($len-1); $i++) $ans = $ans . '*'; - $ans = $ans . ($this->stuid)[$len-1]; + $ans = $ans . substr($this->stuid, -1); return $ans; } diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index a45492e..3ac3d60 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -153,7 +153,7 @@ - + @@ -171,7 +171,7 @@ - +
#用户ID 权限 学号 真实姓名{{$user->privilege}} {{$user->stuid}} {{$user->realname}}{{$user->nickname}}{{$user->nickname}} {{$user->username}} {{$user->email}} @@ -199,7 +199,7 @@ - + diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 9323b5a..e7f35fb 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -4,7 +4,6 @@ @section('asset') -@endsection + + +@endsection + + @section('content')
@@ -245,7 +264,7 @@
    @foreach($trans as $tran) @if($tran->seller != NULL) -
  • 恭喜{{$tran->seller->getcoding()}}和{{$tran->buyer->getcoding()}}成功完成了一笔交易！OvO
    • +
  • 恭喜{{$tran->seller->getcoding()}}和{{$tran->buyer->getcoding()}}成功完成了一笔交易！OvO
    • @endif @endforeach
@@ -260,17 +279,3 @@
@endsection - -
#交易单号 卖家学号 买家学号 商品ID