后台

app/Http/Controllers/Admin/Messages/InfoController.php

@@ -8,7 +8,9 @@
  */
 namespace App\Http\Controllers\Admin\Messages;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\MessagesFollowerModel;
 use App\Models\MessagesTagModel;
+use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Messages\Criteria\MultiWhere;
@@ -32,6 +34,29 @@ class InfoController extends Controller
             $query = $query->pushCriteria(new OrderBy('id','DESC'));
         }
         $list = $query->paginate();
+        foreach ($list as $key=>$val){
+            $list[$key]['count'] = MessagesFollowerModel::where([['messages_id',$val['id']]])->count();
+            $user = UserInfoModel::find($val['user_id']);
+            $list[$key]['user'] = $user->nickname;
+            switch ($val['type']) {
+                case '0':
+                    $list[$key]['type'] = '免费';
+                    $list[$key]['state'] = '--';
+                    break;
+                case '1':
+                    $list[$key]['type'] = '悬赏';
+                    if($val['state'] == 0){
+                        $list[$key]['state'] = '未完成';
+                    } else {
+                        $list[$key]['state'] = '已结束';
+                    }
+                    break;
+                case '2':
+                    $list[$key]['type'] = '收费';
+                    $list[$key]['state'] = '--';
+                    break;
+            }
+        }
         return view('admin.messages.info.index',compact('list'));
     }
 
@@ -111,6 +136,8 @@ class InfoController extends Controller
 
     public function view(Request $request) {
         $data = $this->repository->find(request('id'));
+        $pic = json_decode($data['pic_url']);
+        $data['pic'] = $pic;
         return view('admin.messages.info.view',compact('data'));
     }
 

app/Http/Controllers/Admin/Messages/TagController.php

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\Messages;
 use App\Http\Controllers\Admin\Controller;
+use App\Repositories\Messages\Criteria\TagWhere;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Messages\Criteria\MultiWhere;
@@ -23,7 +24,7 @@ class TagController extends Controller
 
     function index(Request $request) {
         $search['keyword'] = $request->input('keyword');
-        $query = $this->repository->pushCriteria(new MultiWhere($search));
+        $query = $this->repository->pushCriteria(new TagWhere($search));
 
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
         $query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));

app/Http/Controllers/Admin/Payment/InfoController.php

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\Payment;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Payment\Criteria\MultiWhere;
@@ -31,6 +32,34 @@ class InfoController extends Controller
             $query = $query->pushCriteria(new OrderBy('id','DESC'));
         }
         $list = $query->paginate();
+        foreach ($list as $key=>$val) {
+            if($val['user_id'] == 0){
+                $list[$key]['user'] = '系统';
+            } else {
+                $user = UserInfoModel::find($val['user_id']);
+                $list[$key]['user'] = $user->nickname;
+            }
+            if($val['to_user'] == 0){
+                $list[$key]['to_user_name'] = '系统';
+            } else {
+                $user = UserInfoModel::find($val['to_user']);
+                $list[$key]['to_user_name'] = $user->nickname;
+            }
+            switch ($val['type']) {
+                case '0':
+                    $list[$key]['payment'] = '充值';
+                    break;
+                case '1':
+                    $list[$key]['payment'] = '提现';
+                    break;
+                case '3':
+                    $list[$key]['payment'] = '悬赏知识';
+                    break;
+                case '2':
+                    $list[$key]['payment'] = '付费知识';
+                    break;
+            }
+        }
         return view('admin.payment.info.index',compact('list'));
     }
 

app/Models/PaymentInfoModel.php

@@ -42,7 +42,8 @@ class PaymentInfoModel extends BaseModel
         'out_trade_no',
         'price',
         'type',
-        'msg_id'
+        'msg_id',
+        'to_user'
     ];
 
 }

app/Repositories/Messages/Criteria/MultiWhere.php

@@ -35,10 +35,14 @@ class MultiWhere extends Criteria {
     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-                                    $model = $model->where('updated_at',$this->search['updated_at']);
-                                 }
-
+        if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
+            $keywords = '%' . $this->search['keyword'] . '%';
+            $model = $model->where(function ($query) use ($keywords) {
+                $query->where('id'  , 'like', $keywords)
+                    ->orwhere('title', 'like', $keywords)
+                    ->orwhere('phone', 'like', $keywords);
+            });
+        }
          return $model;
     }
 

app/Repositories/Messages/Criteria/TagWhere.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: 思维定制
+ * Date: 2018/7/19
+ * Time: 18:39
+ */
+
+namespace App\Repositories\Messages\Criteria;
+
+use App\Repositories\Base\Criteria;
+use App\Repositories\Contracts\RepositoryInterface as Repository;
+class TagWhere extends Criteria {
+
+    private $search = [];
+
+    /**
+     * MultiWhere constructor.
+     * @param array $search
+     *
+     */
+    public function __construct(array $search)
+    {
+        $this->search = $search;
+    }
+
+    /**
+     * @param $model
+     * @param RepositoryInterface $repository
+     * @return mixed
+     */
+    public function apply($model, Repository $repository)
+    {
+        if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
+            $keywords = '%' . $this->search['keyword'] . '%';
+            $model = $model->where(function ($query) use ($keywords) {
+                $query->where('id'  , 'like', $keywords)
+                    ->orwhere('name', 'like', $keywords);
+            });
+        }
+        return $model;
+    }
+}

app/Repositories/Payment/Criteria/MultiWhere.php

@@ -35,10 +35,13 @@ class MultiWhere extends Criteria {
     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-                                    $model = $model->where('updated_at',$this->search['updated_at']);
-                                 }
-
+        if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
+            $keywords = '%' . $this->search['keyword'] . '%';
+            $model = $model->where(function ($query) use ($keywords) {
+                $query->where('id'  , 'like', $keywords)
+                    ->orwhere('out_trade_no', 'like', $keywords);
+            });
+        }
          return $model;
     }
 

resources/views/admin/messages/info/index.blade.php

@@ -17,7 +17,7 @@
 
                             <div class="col-sm-4">
                                 <div class="input-group">
-                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="请输入关键词"
+                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="ID/标题/电话"
                                            name="keyword" class="input-sm form-control">
                                     <span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
@@ -34,10 +34,12 @@
 
                             <th class="sorting" data-sort="id"> ID</th>
                             <th class="sorting" data-sort="title"> 标题</th>
-                            <th class="sorting" data-sort="user_id">发布人</th>
+                            <th class="sorting" data-sort="user_id">发布人ID</th>
+                            <th class="sorting">发布人</th>
                             <th class="sorting" data-sort="price"> 金额</th>
+                            <th class="sorting"> 完成度</th>
                             <th class="sorting" data-sort="phone">联系方式</th>
-                            <th class="sorting" data-sort="type"> 类型：0：免费；1：付费；2：收费</th>
+                            <th class="sorting" data-sort="type"> 类型</th>
                             <th width="22%">相关操作</th>
                         </tr>
                         </thead>
@@ -45,17 +47,18 @@
                         @if(isset($list))
                             @foreach($list as $key => $item)
                                 <tr>
-
                                     <td>{{ $item->id }}</td>
                                     <td>{{ $item->title }}</td>
                                     <td>{{ $item->user_id }}</td>
+                                    <td>{{ $item->user }}</td>
                                     <td>{{ $item->price }}</td>
+                                    <td>{{ $item->state }}</td>
                                     <td>{{ $item->phone }}</td>
                                     <td>{{ $item->type }}</td>
                                     <td>
                                         @if(role('Messages/Info/view'))
                                             <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Messages/Info/view',['id'=>$item->id])}}'});"
-                                                    class="btn btn-primary ">查看
+                                                    class="btn btn-primary ">查看内容
                                             </button>
                                         @endif
                                     </td>

resources/views/admin/messages/info/view.blade.php

@@ -4,98 +4,30 @@
 <div class="row">
     <div class="ibox-content">
         <div class="list-group">
-                                 
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">ID</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['id'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">站点ID</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['site_id'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">标题</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['title'] or ''}}</p>
-                                                 
-               </div>                     
                <div class="list-group-item">
                                                   
                    <h3 class="list-group-item-heading">内容</h3>
                                                    
                    <p class="list-group-item-text"> {{ $data['content'] or ''}}</p>
                                                  
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">发布人</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['user_id'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">金额</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['price'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading"></h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['phone'] or ''}}</p>
-                                                 
-               </div>                     
+               </div>
                <div class="list-group-item">
                                                   
                    <h3 class="list-group-item-heading">付费信息</h3>
                                                    
                    <p class="list-group-item-text"> {{ $data['comment'] or ''}}</p>
                                                  
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">类型：0：免费；1：付费；2：收费</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['type'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">排序:越大越靠前</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['sort'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading"></h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">创建时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">更新时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
-                                                 
                </div>
+
+            <div class="list-group-item">
+
+                <h3 class="list-group-item-heading">相关图片</h3>
+                @if(isset($data['pic']) && !empty($data['pic']))
+                    @foreach($data['pic'] as $item)
+                        <img src="{{ $item }}" width="50"/>
+                    @endforeach
+                @endif
+            </div>
         </div>
     </div>
 </div>

resources/views/admin/messages/tag/index.blade.php

@@ -17,7 +17,7 @@
 
                             <div class="col-sm-4">
                                 <div class="input-group">
-                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="请输入关键词"
+                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="ID/名称"
                                            name="keyword" class="input-sm form-control">
                                     <span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
@@ -69,19 +69,9 @@
                                                            class="font-bold">修改</a></li>
                                                 @endif
 
-                                                @if(role('Messages/Tag/destroy'))
-                                                    <li class="divider"></li>
-                                                    <li><a href="{{ U('Messages/Tag/destroy',['id'=>$item->id])}}"
-                                                           onclick="return confirm('你确定执行删除操作？');">删除</a></li>
-                                                @endif
 
                                             </ul>
                                         </div>
-                                        @if(role('Messages/Tag/view'))
-                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Messages/Tag/view',['id'=>$item->id])}}'});"
-                                                    class="btn btn-primary ">查看
-                                            </button>
-                                        @endif
                                     </td>
                                 </tr>
                             @endforeach

resources/views/admin/payment/info/index.blade.php

@@ -5,7 +5,7 @@
         <div class="col-sm-12">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <h5>支付列表</h5>
+                    <h5>交易列表</h5>
                     <div class="ibox-tools">
                         <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
                         </a>
@@ -17,7 +17,7 @@
 
                             <div class="col-sm-4">
                                 <div class="input-group">
-                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="请输入关键词"
+                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="ID/订单号"
                                            name="keyword" class="input-sm form-control">
                                     <span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
@@ -32,12 +32,13 @@
                         <tr>
 
                             <th class="sorting" data-sort="id"> ID</th>
-                            <th class="sorting" data-sort="user_id"> 用户ID</th>
+                            <th class="sorting" data-sort="user_id"> 来源用户</th>
+                            <th class="sorting" data-sort="user_id"> 去向用户</th>
                             <th class="sorting" data-sort="openid"> 用户openid</th>
                             <th class="sorting" data-sort="out_trade_no"> 支付订单号</th>
                             <th class="sorting" data-sort="price"> 支付金额</th>
+                            <th class="sorting" data-sort="type"> 支付类型</th>
                             <th class="sorting" data-sort="created_at"> 创建时间</th>
-                            <th width="22%">相关操作</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -46,18 +47,14 @@
                                 <tr>
 
                                     <td>{{ $item->id }}</td>
-                                    <td>{{ $item->user_id }}</td>
+                                    <td>{{ $item->user }}</td>
+                                    <td>{{ $item->to_user_name }}</td>
                                     <td>{{ $item->openid }}</td>
                                     <td>{{ $item->out_trade_no }}</td>
                                     <td>{{ $item->price }}</td>
+                                    <td>{{ $item->payment }}</td>
                                     <td>{{ $item->created_at }}</td>
-                                    <td>
-                                        @if(role('Payment/Info/view'))
-                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Payment/Info/view',['id'=>$item->id])}}'});"
-                                                    class="btn btn-primary ">查看
-                                            </button>
-                                        @endif
-                                    </td>
+
                                 </tr>
                             @endforeach
                         @endif

resources/views/admin/user/info/index.blade.php

@@ -50,8 +50,6 @@
                                         <td><img src="{{ $item->avatar }}" style="height: 50px"></td>
                                         <td>{{ $item->mobile }}</td>
                                         <td>{{ $item->last_login_time }}</td>
-                                        <td>{{ $item->created_at->format('Y-m-d H:i:s') }}</td>
-
                                         <td>
                                             <div class="btn-group">
                                                 <button data-toggle="dropdown"