add

app/Http/Controllers/Admin/Payment/InfoController.php → app/Http/Controllers/Admin/Map/BannerController.php

@@ -1,24 +1,23 @@
 <?php
 /**
- *  支付列表
+ *  地标轮播图
  *  @author  system
  *  @version    1.0
- *  @date 2018-07-11 06:53:04
+ *  @date 2018-10-26 08:35:43
  *
  */
-namespace App\Http\Controllers\Admin\Payment;
+namespace App\Http\Controllers\Admin\Map;
 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;
-use App\Repositories\Payment\InfoRepository;
+use App\Repositories\Map\Criteria\MultiWhere;
+use App\Repositories\Map\BannerRepository;
 
-class InfoController extends Controller
+class BannerController extends Controller
 {
     private $repository;
 
-    public function __construct(InfoRepository $repository) {
+    public function __construct(BannerRepository $repository) {
         if(!$this->repository) $this->repository = $repository;
     }
 
@@ -32,46 +31,7 @@ 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;
-            }
-            switch ($val['state']) {
-                case '0':
-                    $list[$key]['state'] = '未处理';
-                    break;
-                case '1':
-                    $list[$key]['payment'] = '已通过';
-                    break;
-                case '2':
-                    $list[$key]['payment'] = '已拒绝';
-                    break;
-            }
-        }
-        return view('admin.payment.info.index',compact('list'));
+        return view('admin.map.banner.index',compact('list'));
     }
 
 
@@ -83,7 +43,7 @@ class InfoController extends Controller
             $orderby[$request['sort_field']] = $request['sort_field_by'];
         }
         $list = $this->repository->search($search,$orderby);
-        return view('admin.payment.info.check',compact('list'));
+        return view('admin.map.banner.check',compact('list'));
     }
 
 
@@ -96,7 +56,7 @@ class InfoController extends Controller
         if($request->method() == 'POST') {
             return $this->_createSave();
         }
-        return view('admin.payment.info.edit');
+        return view('admin.map.banner.edit');
     }
 
     /**
@@ -106,11 +66,11 @@ class InfoController extends Controller
         $data = (array) request('data');
         $id = $this->repository->create($data);
         if($id) {
-            $url[] = array('url'=>U( 'Payment/Info/index'),'title'=>'返回列表');
-            $url[] = array('url'=>U( 'Payment/Info/create'),'title'=>'继续添加');
+            $url[] = array('url'=>U( 'Map/Banner/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Banner/create'),'title'=>'继续添加');
             $this->showMessage('添加成功',$url);
         }else{
-            $url[] = array('url'=>U( 'Payment/Info/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Banner/index'),'title'=>'返回列表');
             return $this->showWarning('添加失败',$url);
         }
     }
@@ -126,7 +86,7 @@ class InfoController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($request->get('id'));
-        return view('admin.payment.info.edit',compact('data'));
+        return view('admin.map.banner.edit',compact('data'));
     }
 
     /**
@@ -136,17 +96,17 @@ class InfoController extends Controller
         $data = (array) request('data');
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
-            $url[] = array('url'=>U( 'Payment/Info/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Banner/index'),'title'=>'返回列表');
             return $this->showMessage('操作成功',urldecode(request('_referer')));
         }else{
-            $url[] = array('url'=>U( 'Payment/Info/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Banner/index'),'title'=>'返回列表');
             return $this->showWarning('操作失败',$url);
         }
     }
 
     public function view(Request $request) {
         $data = $this->repository->find(request('id'));
-        return view('admin.payment.info.view',compact('data'));
+        return view('admin.map.banner.view',compact('data'));
     }
 
 

app/Http/Controllers/Admin/Messages/TagController.php → app/Http/Controllers/Admin/Map/LandmarkController.php

@@ -1,30 +1,29 @@
 <?php
 /**
- *  标签列表
+ *  地标
  *  @author  system
  *  @version    1.0
- *  @date 2018-07-11 06:51:31
+ *  @date 2018-10-26 08:38:42
  *
  */
-namespace App\Http\Controllers\Admin\Messages;
+namespace App\Http\Controllers\Admin\Map;
 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;
-use App\Repositories\Messages\TagRepository;
+use App\Repositories\Map\Criteria\MultiWhere;
+use App\Repositories\Map\LandmarkRepository;
 
-class TagController extends Controller
+class LandmarkController extends Controller
 {
     private $repository;
 
-    public function __construct(TagRepository $repository) {
+    public function __construct(LandmarkRepository $repository) {
         if(!$this->repository) $this->repository = $repository;
     }
 
     function index(Request $request) {
         $search['keyword'] = $request->input('keyword');
-        $query = $this->repository->pushCriteria(new TagWhere($search));
+        $query = $this->repository->pushCriteria(new MultiWhere($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']));
@@ -32,7 +31,7 @@ class TagController extends Controller
             $query = $query->pushCriteria(new OrderBy('id','DESC'));
         }
         $list = $query->paginate();
-        return view('admin.messages.tag.index',compact('list'));
+        return view('admin.map.landmark.index',compact('list'));
     }
 
 
@@ -44,7 +43,7 @@ class TagController extends Controller
             $orderby[$request['sort_field']] = $request['sort_field_by'];
         }
         $list = $this->repository->search($search,$orderby);
-        return view('admin.messages.tag.check',compact('list'));
+        return view('admin.map.landmark.check',compact('list'));
     }
 
 
@@ -57,7 +56,7 @@ class TagController extends Controller
         if($request->method() == 'POST') {
             return $this->_createSave();
         }
-        return view('admin.messages.tag.edit');
+        return view('admin.map.landmark.edit');
     }
 
     /**
@@ -67,11 +66,11 @@ class TagController extends Controller
         $data = (array) request('data');
         $id = $this->repository->create($data);
         if($id) {
-            $url[] = array('url'=>U( 'Messages/Tag/index'),'title'=>'返回列表');
-            $url[] = array('url'=>U( 'Messages/Tag/create'),'title'=>'继续添加');
+            $url[] = array('url'=>U( 'Map/Landmark/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Landmark/create'),'title'=>'继续添加');
             $this->showMessage('添加成功',$url);
         }else{
-            $url[] = array('url'=>U( 'Messages/Tag/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Landmark/index'),'title'=>'返回列表');
             return $this->showWarning('添加失败',$url);
         }
     }
@@ -87,7 +86,7 @@ class TagController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($request->get('id'));
-        return view('admin.messages.tag.edit',compact('data'));
+        return view('admin.map.landmark.edit',compact('data'));
     }
 
     /**
@@ -97,17 +96,17 @@ class TagController extends Controller
         $data = (array) request('data');
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
-            $url[] = array('url'=>U( 'Messages/Tag/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Landmark/index'),'title'=>'返回列表');
             return $this->showMessage('操作成功',urldecode(request('_referer')));
         }else{
-            $url[] = array('url'=>U( 'Messages/Tag/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Landmark/index'),'title'=>'返回列表');
             return $this->showWarning('操作失败',$url);
         }
     }
 
     public function view(Request $request) {
         $data = $this->repository->find(request('id'));
-        return view('admin.messages.tag.view',compact('data'));
+        return view('admin.map.landmark.view',compact('data'));
     }
 
 

app/Http/Controllers/Admin/Map/LikeController.php

@@ -0,0 +1,138 @@
+<?php
+/**
+ *  点赞
+ *  @author  system
+ *  @version    1.0
+ *  @date 2018-10-27 09:26:50
+ *
+ */
+namespace App\Http\Controllers\Admin\Map;
+use App\Http\Controllers\Admin\Controller;
+use Illuminate\Http\Request;
+use App\Repositories\Base\Criteria\OrderBy;
+use App\Repositories\Map\Criteria\MultiWhere;
+use App\Repositories\Map\LikeRepository;
+
+class LikeController extends Controller
+{
+    private $repository;
+
+    public function __construct(LikeRepository $repository) {
+        if(!$this->repository) $this->repository = $repository;
+    }
+
+    function index(Request $request) {
+        $search['keyword'] = $request->input('keyword');
+        $query = $this->repository->pushCriteria(new MultiWhere($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']));
+        }else{
+            $query = $query->pushCriteria(new OrderBy('id','DESC'));
+        }
+        $list = $query->paginate();
+        return view('admin.map.like.index',compact('list'));
+    }
+
+
+    function check(Request $request) {
+        $request = $request->all();
+        $search['keyword'] = $request->input('keyword');
+        $orderby = array();
+        if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
+            $orderby[$request['sort_field']] = $request['sort_field_by'];
+        }
+        $list = $this->repository->search($search,$orderby);
+        return view('admin.map.like.check',compact('list'));
+    }
+
+
+    /**
+     * 添加
+     * 
+     */
+    public function create(Request $request)
+    {
+        if($request->method() == 'POST') {
+            return $this->_createSave();
+        }
+        return view('admin.map.like.edit');
+    }
+
+    /**
+     * 保存修改
+     */
+    private function _createSave(){
+        $data = (array) request('data');
+        $id = $this->repository->create($data);
+        if($id) {
+            $url[] = array('url'=>U( 'Map/Like/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Like/create'),'title'=>'继续添加');
+            $this->showMessage('添加成功',$url);
+        }else{
+            $url[] = array('url'=>U( 'Map/Like/index'),'title'=>'返回列表');
+            return $this->showWarning('添加失败',$url);
+        }
+    }
+    
+    /**
+     * 
+     * 修改
+     * 
+     * 
+     */
+    public function update(Request $request) {
+        if($request->method() == 'POST') {
+            return $this->_updateSave();
+        }
+        $data = $this->repository->find($request->get('id'));
+        return view('admin.map.like.edit',compact('data'));
+    }
+
+    /**
+     * 保存修改
+     */
+    private function _updateSave() {
+        $data = (array) request('data');
+        $ok = $this->repository->update(request('id'),$data);
+        if($ok) {
+            $url[] = array('url'=>U( 'Map/Like/index'),'title'=>'返回列表');
+            return $this->showMessage('操作成功',urldecode(request('_referer')));
+        }else{
+            $url[] = array('url'=>U( 'Map/Like/index'),'title'=>'返回列表');
+            return $this->showWarning('操作失败',$url);
+        }
+    }
+
+    public function view(Request $request) {
+        $data = $this->repository->find(request('id'));
+        return view('admin.map.like.view',compact('data'));
+    }
+
+
+    /**
+     *
+     * 状态改变
+     *
+     */
+    public function status(Request $request) {
+        $ok = $this->repository->updateStatus(request('id'),request('status'));
+        if($ok) {
+            return $this->showMessage('操作成功');
+        }else{
+            return $this->showWarning('操作失败');
+        }
+    }
+    
+    /**
+     * 删除
+     */
+    public function destroy(Request $request) {
+        $bool = $this->repository->destroy($request->get('id'));
+        if($bool) {
+            return  $this->showMessage('操作成功');
+        }else{
+            return  $this->showWarning("操作失败");
+        }
+    }
+}

app/Http/Controllers/Admin/Messages/InfoController.php → app/Http/Controllers/Admin/Map/MessageController.php

@@ -1,26 +1,23 @@
 <?php
 /**
- *  信息列表
+ *  评论
  *  @author  system
  *  @version    1.0
- *  @date 2018-07-11 06:50:54
+ *  @date 2018-10-26 08:39:11
  *
  */
-namespace App\Http\Controllers\Admin\Messages;
+namespace App\Http\Controllers\Admin\Map;
 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;
-use App\Repositories\Messages\InfoRepository;
+use App\Repositories\Map\Criteria\MultiWhere;
+use App\Repositories\Map\MessageRepository;
 
-class InfoController extends Controller
+class MessageController extends Controller
 {
     private $repository;
 
-    public function __construct(InfoRepository $repository) {
+    public function __construct(MessageRepository $repository) {
         if(!$this->repository) $this->repository = $repository;
     }
 
@@ -34,30 +31,7 @@ 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'));
+        return view('admin.map.message.index',compact('list'));
     }
 
 
@@ -69,7 +43,7 @@ class InfoController extends Controller
             $orderby[$request['sort_field']] = $request['sort_field_by'];
         }
         $list = $this->repository->search($search,$orderby);
-        return view('admin.messages.info.check',compact('list'));
+        return view('admin.map.message.check',compact('list'));
     }
 
 
@@ -82,9 +56,7 @@ class InfoController extends Controller
         if($request->method() == 'POST') {
             return $this->_createSave();
         }
-        $tags = MessagesTagModel::orderBy('sort','desc')->get();
-
-        return view('admin.messages.info.edit',compact('tags'));
+        return view('admin.map.message.edit');
     }
 
     /**
@@ -94,11 +66,11 @@ class InfoController extends Controller
         $data = (array) request('data');
         $id = $this->repository->create($data);
         if($id) {
-            $url[] = array('url'=>U( 'Messages/Info/index'),'title'=>'返回列表');
-            $url[] = array('url'=>U( 'Messages/Info/create'),'title'=>'继续添加');
+            $url[] = array('url'=>U( 'Map/Message/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Message/create'),'title'=>'继续添加');
             $this->showMessage('添加成功',$url);
         }else{
-            $url[] = array('url'=>U( 'Messages/Info/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Message/index'),'title'=>'返回列表');
             return $this->showWarning('添加失败',$url);
         }
     }
@@ -114,9 +86,7 @@ class InfoController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($request->get('id'));
-        $tags = MessagesTagModel::orderBy('sort','desc')->get();
-
-        return view('admin.messages.info.edit',compact('data','tags'));
+        return view('admin.map.message.edit',compact('data'));
     }
 
     /**
@@ -126,19 +96,17 @@ class InfoController extends Controller
         $data = (array) request('data');
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
-            $url[] = array('url'=>U( 'Messages/Info/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Message/index'),'title'=>'返回列表');
             return $this->showMessage('操作成功',urldecode(request('_referer')));
         }else{
-            $url[] = array('url'=>U( 'Messages/Info/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'Map/Message/index'),'title'=>'返回列表');
             return $this->showWarning('操作失败',$url);
         }
     }
 
     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'));
+        return view('admin.map.message.view',compact('data'));
     }
 
 

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

@@ -1,9 +1,9 @@
 <?php
 /**
- *  用户表
+ *  用户管理
  *  @author  system
  *  @version    1.0
- *  @date 2017-05-30 12:16:56
+ *  @date 2018-10-26 08:35:26
  *
  */
 namespace App\Http\Controllers\Admin\User;
@@ -26,7 +26,7 @@ class InfoController extends Controller
         $query = $this->repository->pushCriteria(new MultiWhere($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']));
+        $query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
         }else{
             $query = $query->pushCriteria(new OrderBy('id','DESC'));
         }
@@ -94,7 +94,6 @@ class InfoController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
-        dd($data);
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
             $url[] = array('url'=>U( 'User/Info/index'),'title'=>'返回列表');

app/Http/Controllers/Admin/Wechat/AppController.php

@@ -1,9 +1,9 @@
 <?php
 /**
- *  11
+ *  微信配置
  *  @author  system
  *  @version    1.0
- *  @date 2018-07-26 01:43:25
+ *  @date 2018-10-27 08:03:48
  *
  */
 namespace App\Http\Controllers\Admin\Wechat;
@@ -86,7 +86,6 @@ class AppController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($request->get('id'));
-        //($request->get('id'));
         return view('admin.wechat.app.edit',compact('data'));
     }
 

app/Http/Controllers/Api/V1/AttachmentController.php

@@ -0,0 +1,168 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Helper\AttachmentHelper;
+use App\Models\BaseAttachmentModel;
+use Illuminate\Http\Request;
+use App\Services\Base\Attachment;
+use App\Services\Base\ErrorCode;
+use Validator, Response;
+
+class AttachmentController extends Controller
+{
+    use AttachmentHelper;
+
+    /**
+     * @api {get} /api/attachment/download/{md5} 下载文件（图片）
+     * @apiDescription 下载文件（图片）(get code)
+     * @apiGroup Attachment
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {string} md5   图片md5码
+     * @apiSuccessExample {json} Success-Response:
+     *     HTTP/1.1 200 OK
+     *     {
+     *       文件二进制码
+     *     }
+     * @apiErrorExample {json} Error-Response:
+     *     HTTP/1.1 404 Not found
+     */
+    public function download($md5)
+    {
+        $attachment = Attachment::where(['md5' => $md5])->first();
+        if (!$attachment) {
+            return view('errors.404');
+        }
+
+        return Response::download($attachment->path, $attachment->name, [
+            'Content-type'  => $attachment->file_type,
+            'Accept-Ranges' => 'bytes',
+            'Accept-Length' => $attachment->size,
+        ]);
+    }
+
+    /**
+     * @api {post} /api/attachment/upload 通用上传接口
+     * @apiDescription 通用上传接口
+     * @apiGroup Attachment
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {string} tag 附件标签 avatar video dream
+     * @apiParam {File} file 附件（可以多个，使用file.xxx，可返回多个）[默认大小【10M】, 类型图片png jpg gif,视频类型mp4]
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+     * {
+     *     "state": true,
+     *     "code": 0,
+     *     "message": "",
+     *     "data": [
+     *         "file": "f72e7dad80f597ed6621a009e82243ad",
+     *         "real": "真实路径"
+     *          //文件访问url http://localhost/attachment/f72e7dad80f597ed6621a009e82243ad
+     *     ]
+     * }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     * {
+     *     "state": false,
+     *     "code": 1000,
+     *     "message": "传入参数不正确",
+     *     "data": null or []
+     * }
+     * 可能出现的错误代码：
+     *    200     SAVE_USER_FAILED                保存用户数据失败
+     *    201     ATTACHMENT_MKDIR_FAILED         创建附件目录失败
+     *    202     ATTACHMENT_UPLOAD_INVALID       上传附件文件无效
+     *    203     ATTACHMENT_SAVE_FAILED          保存附件失败
+     *    204     ATTACHMENT_MOVE_FAILED          移动附件失败
+     *    205     ATTACHMENT_DELETE_FAILED        删除附件文件失败
+     *    206     ATTACHMENT_RECORD_DELETE_FAILED 删除附件记录失败
+     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
+     *    1101    INCORRECT_VERIFY_CODE           输入验证码错误
+     *    1105    USER_DOES_NOT_EXIST             用户不存在
+     *    1200    ATTACHMENT_UPLOAD_FAILED        附件上传失败
+     *    1201    ATTACHMENT_SIZE_EXCEEDED        附件大小超过限制
+     *    1202    ATTACHMENT_MIME_NOT_ALLOWED     附件类型不允许
+     *    1203    ATTACHMENT_NOT_EXIST            附件不存在
+     */
+    public function upload(Request $request) {
+        \Log::info($request->all());
+        $validator = Validator::make($request->all(),
+            [
+                'tag'         => 'required|alpha_dash',
+            ],
+            [
+                'tag.required'      => 'tag必填',
+                'tag.alpha_dash'    => 'tag只能为字母数字中/下划线',
+            ]
+        );
+
+        if ($validator->fails()) {
+            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '', $validator->messages());
+        }
+
+        $result = $this->uploadAttachment($request, $request->get('file'), $request->get('tag'), 10 * 1024 * 1024, [
+            'image/jpeg',
+            'image/png',
+            'image/gif',
+            'video/mp4',
+        ]);
+        //dd($result);
+        if (is_array($result)) {
+            return $this->api($result);
+        } elseif (is_string($result)) {
+            return $this->api(['file' => $result]);
+        } else {
+            return $this->error($result);
+        }
+
+    }
+
+    /**
+     * @api {get} /api/attachment/delete/{md5} 删除文件（图片）
+     * @apiDescription 删除文件（图片）
+     * @apiGroup Attachment
+     * @apiPermission Passport
+     * @apiVersion 0.1.0
+     * @apiParam {string} md5   图片md5码
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+     * {
+     *     "state": true,
+     *     "code": 0,
+     *     "message": "",
+     *     "data": {
+     *         "result": true/false
+     *     }
+     * }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     * {
+     *     "state": false,
+     *     "code": 1000,
+     *     "message": "传入参数不正确",
+     *     "data": null or []
+     * }
+     * 可能出现的错误代码：
+     *    205     ATTACHMENT_DELETE_FAILED        删除附件文件失败
+     *    206     ATTACHMENT_RECORD_DELETE_FAILED 删除附件记录失败
+     *    1203    ATTACHMENT_NOT_EXIST            附件不存在
+     */
+    public function delete($md5) {
+        $result = $this->deleteAttachment($md5);
+        if ($result === 0) {
+            return $this->api(['result' => true]);
+        } else {
+            return $this->error($result);
+        }
+    }
+
+    public function index(){
+        $result = BaseAttachmentModel::all()->sortByDesc('id');
+        return $this->api($result);
+    }
+
+
+
+}

app/Http/Controllers/Api/V1/AuthController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Models\Merchant;
+use App\Models\MemberMerchant;
+use App\Models\UserBanks;
+use App\Models\Setting;
+
+use Illuminate\Http\Request;
+//use App\Http\HelperTraits\AttachmentHelper;
+use App\Services\Base\ErrorCode;
+use App\User;
+use Illuminate\Support\Facades\Hash;
+use Validator, Auth, Cache;
+
+class AuthController extends Controller
+{
+
+    private $expireTime     = 1;
+    private $keySmsCode     = 'auth:sms:';
+    private $keySmsCodeExist     = 'auth:sms:exist';
+    private $expireTimeExist     = 24*60;
+
+    public function test(){
+//        return $this->error(ErrorCode::SAVE_USER_FAILED);
+        return $this->api(['test' => 'test']);
+    }
+
+}

app/Http/Controllers/Api/V1/BaseController.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: 思维定制
+ * Date: 2018/10/27
+ * Time: 12:01
+ */
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Library\ErrorCode;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Validator;
+
+class BaseController extends Controller
+{
+    public function validateError(Validator $validator, $code = ErrorCode::CLIENT_WRONG_PARAMS)
+    {
+        return $this->generateApiResponse(null, $code, $validator->errors()->first());
+    }
+
+    public function success($data = null, $code = 0, $message = '')
+    {
+        return $this->generateApiResponse($data, $code, $message);
+    }
+
+    public function generateApiResponse($data, $code = 0, $message = '')
+    {
+        if($code !== 0 && empty($message)) {
+            $message = ErrorCode::message($code);
+        }
+        $ret = [
+            'state'     => $code == 0,
+            'code'      => $code,
+            'message'   => $message,
+            'data'      => $data
+        ];
+        $status = $code === 0 ? 200 : 400;
+        return response()->json($ret, $status);
+    }
+}

app/Http/Controllers/Api/V1/Controller.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use App\Services\Base\ErrorCode;
+use Request, Response, Auth,Log;
+
+class Controller extends BaseController
+{
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+//    protected $_data = null;
+    protected $_user = null;
+
+    public function __construct() {
+
+        $this->middleware('auth:api', [
+            'except' => [
+                'upload', 'getCode', 'reset', 'login', 'get', 'register', 'alipayNotify', 'wechatpayNotify',
+                'get', 'area', 'get_province', 'get_city', 'get_county', 'test', 'indexMenu', 'userRelease', 'indexTag', 'indexMessage', 'indexGetMessage', 'getLandMark', 'getDetail', 'doLike'
+            ]
+        ]);
+
+//        \DB::connection()->enableQueryLog();
+//        $queries = \DB::getQueryLog();
+//        dd($queries);
+
+//        $this->_user = Auth::user();
+//        if ($this->_user !== null) {
+//            $this->_user->last_ip = Request::ip();
+//        }
+//        $data = $this->rawPostData();
+//        if (!$this->checkSignature($data, env('APP_SECRET'))) {
+//            $this->rawError(ErrorCode::CLIENT_APP_CHECKSUM_ERROR);
+//        }
+//        unset($data['nonce_str'], $data['timestamp'], $data['sig']);
+
+//        $this->_data = $data;
+    }
+
+//    public function saveLastIp() {
+//        if ($this->_user !== null) {
+//            $this->_user->save();
+//        }
+//    }
+
+    public function getUserId()
+    {
+        return 1;
+        return session('user_id');
+    }
+
+    public function rawPostData() {
+        $request = Request::instance();
+        $data = $request->getContent();
+        return json_decode($data, true);
+    }
+
+    public function rawApi($data, $code = 0, $message = '') {
+        $ret = $this->genApiData($data, $code, $message);
+        return json_encode($ret);
+    }
+
+    public function api($data, $code = 0, $message = '') {
+        $ret = $this->genApiData($data, $code, $message);
+        $status = $code === 0 ? 200 : 400;
+        return Response::json($ret, $status);
+    }
+
+    public function validatorError($arr, $code = 0, $message = '') {
+        Log::info($arr);
+        foreach ($arr as $val){
+            if($val&&$message==''){
+                $message = $val;
+            }
+        }
+        $ret = $this->genApiData(null, $code, $message);
+        $status = $code === 0 ? 200 : 400;
+        return Response::json($ret, $status);
+    }
+
+    public function error($code, $message = '', $data = null) {
+        return $this->api($data, $code, $message);
+    }
+
+    public function rawError($code, $message = '') {
+        echo $this->rawApi(null, $code, $message);
+        exit;
+    }
+
+    private function genApiData($data, $code = 0, $message = '') {
+        if ($code !== 0 && ErrorCode::CLIENT_WRONG_PARAMS && empty($message)) {
+            $message = ErrorCode::message($code);
+        }
+        $ret = [
+            'status'     => $code == 0,
+            'status_code'      => $code,
+            'message'   => $message,
+            'data'      => $data
+        ];
+        return $ret;
+    }
+}

app/Http/Controllers/Api/V1/LandMarkController.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: 思维定制
+ * Date: 2018/10/26
+ * Time: 16:48
+ */
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Models\MapBannerModel;
+use App\Models\MapLikeModel;
+use App\Models\MapMessageModel;
+use App\Models\UserInfoModel;
+use App\Models\WechatAppModel;
+use EasyWeChat\Factory;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use App\Library\ErrorCode;
+use App\Models\MapLandmarkModel;
+use Auth;
+
+class LandMarkController extends BaseController
+{
+    public function getLandMark()
+    {
+        $data = MapLandmarkModel::all();
+        return $this->api($data);
+    }
+
+    public function getDetail(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'id' => 'required'
+        ], [
+            'id.required' => 'ID必填'
+        ]);
+        $userAuth = Auth('api')->user();
+        if(!$userAuth) return $this->error(null, ErrorCode::NO_AUTH);
+        if($validator->fails()) {
+            return $this->validateError($validator);
+        }
+
+        $id = $request->input('id');
+
+        $data = MapLandmarkModel::find($id);
+        $banner = MapBannerModel::where('mark_id',$id)->orderBy('sort','desc')->get();
+        foreach ($banner as $key=>$val){
+            $data->banner[]=$val['image'];
+        }
+        $message = MapMessageModel::where('mark_id',$id)->orderBy('id','desc')->get();
+        foreach ($message as $val){
+            $user = UserInfoModel::find($val->user_id);
+            $val->avatar = $user->avatar;
+            $val->nickname = $user->nickname;
+        }
+        $data->message = $message;
+
+        $like = MapLikeModel::where([['user_id',$userAuth->id],['mark_id',$id]])->first();
+        if($like){
+            $data->isLike=1;
+        }else{
+            $data->isLike=0;
+        }
+
+        return $this->api($data);
+    }
+
+    public function doLike(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'id' => 'required'
+        ], [
+            'id.required' => 'ID必填'
+        ]);
+        $userAuth = Auth('api')->user();
+        if(!$userAuth) return $this->error(null, ErrorCode::NO_AUTH);
+        if($validator->fails()) {
+            return $this->validateError($validator);
+        }
+
+        $id = $request->input('id');
+        $like = MapLikeModel::where([['user_id',$userAuth->id],['mark_id',$id]])->first();
+        if($like){
+            $res = $like->delete();
+            $mark = MapLandmarkModel::find($id);
+            $update['like'] = $mark->like -1;
+            $state = 0;
+        }else{
+            $data['user_id'] = $userAuth->id;
+            $data['mark_id'] = $id;
+            $res = MapLikeModel::create($data);
+            $mark = MapLandmarkModel::find($id);
+            $update['like'] = $mark->like +1;
+            $state =1;
+        }
+        $res_up = MapLandmarkModel::where('id',$id)->update($update);
+        if($res && $res_up){
+            return $this->success($state);
+        }else{
+            dd(111);
+        }
+    }
+}

app/Http/Controllers/Api/V1/LoginController.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: 思维定制
+ * Date: 2018/7/11
+ * Time: 15:59
+ */
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Models\UserInfoModel;
+use App\Models\WechatAppModel;
+use EasyWeChat\Factory;
+use Illuminate\Http\Request;
+use Auth;
+
+class LoginController extends Controller
+{
+    private $config;
+
+    public function __construct()
+    {
+        $wechat_app = WechatAppModel::find(1);
+        //dd($wechat_app);
+        $this->config = [
+            'app_id' => $wechat_app->appid,
+            'secret' => $wechat_app->appsecret,
+            'response_type' => 'array',
+        ];
+    }
+
+    /**
+     * @api {post} /api/login 登陆（login）
+     * @apiDescription 登陆(login)login
+     * @apiGroup Login
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {string}  nickname   手机号码
+     * @apiParam {string} avatar
+     * @apiParam {string} password   password
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+     * {
+     *     "state": true,
+     *     "code": 0,
+     *     "message": {
+     *         "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjYWUyYzFmYTUwMTIyZDI0ZTRiYTZhZGZhNmQxYmZlOWNiMzIxMTBmYWJlZjNjYzIyNmViZjRmNGExNWM3NjllNmU2ZTNiYWE5OGNhOWUzIn0.eyJhdWQiOiIxIiwianRpIjoiN2NhZTJjMWZhNTAxMjJkMjRlNGJhNmFkZmE2ZDFiZmU5Y2IzMjExMGZhYmVmM2NjMjI2ZWJmNGY0YTE1Yzc2OWU2ZTZlM2JhYTk4Y2E5ZTMiLCJpYXQiOjE0NzU0MTE1NTgsIm5iZiI6MTQ3NTQxMTU1OCwiZXhwIjo0NjMxMDg1MTU4LCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.E9YGEzuRUOk02aV1EiWLJ_pD0hKoCyW0k_sGy63hM3u5X8K_HI1kVhaU6JNLqLZeszIAroTEDB8XMgZKAqTLlwtL8PLCJcuDoxfk1BRHbfjhDheTsahBysKGalvNEpzRCrGlao0mS0Cg9qDpEsndtypPFS8sfaflToOzbJjiSK2DvQiHSH8xZI3zHJTezgZMz-pB_hPTxp8ajdv0ve1gWtWjs3vERr0Y91X4hngO8X7LuXtAYtfxGZRIye12YE7TuLBMYzj8CCfiRt7Smhyf4palNW5mzKlZpa2l87n6NQ14Iy4oMzQ2PON1j_swrosuE2yZohGOn6fDdSCBRdJ6dLD_emjBdQCQOoB63R7BbhFZgvFX25TjzFJ7r9AdVMiGmebuRKEVSZV_JCGu1C71OIbQk-UK35s00gSr2fmJGBbN2cZTXBRTJpfuMZ_ihFYEZrvVq_Ih2X0xkd36JUuxaUld1BXRgPZvH-9jBuhe0YW2OOlgwpdm6ZB8BMcuS4ftLoi6FipgzFqfIuy-0ZqPMDnJaG7Gycrdpxza00mgOFxYxJtqwZNsUWFRZEVU881l6VC_cy294YXSPQxUwEoyKg-G5Pm8AEB9bqv5z4EU4B8-XTd3zKNqtNba_snHbc711i4EytCiZfYSjNB1hwenq45YYOAhPTwOpFI0kxyRazc",
+     *         "msg": '登录成功'
+     *     }
+     * }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     * {
+     *     "state": false,
+     *     "code": 1000,
+     *     "message": "传入参数不正确",
+     *     "data": null or []
+     * }
+     * 可能出现的错误代码：
+     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
+     *    1102    INCORRECT_USER_OR_PASS          用户名或密码不正确
+     */
+    public function login(Request $request)
+    {
+        $data = $request->input();
+       // dd($data);
+        $app = Factory::miniProgram($this->config);
+        $res = $app->auth->session($data['code']);
+        if (!$res || empty($res['openid'])) {
+            $message= [
+                'code' => 1,
+                'msg' => '获取用户OpenId失败',
+                'data' => $res,
+            ];
+            return $this->api($message);
+        }
+        $check_user = UserInfoModel::where('openid',$res['openid'])->first();
+        //dd($check_user);
+        if($check_user && Auth::loginUsingId($check_user->id)) {
+            $user = Auth::user();
+
+            $success['token'] =  $user->createToken($user->id . '-' . $user->openid)->accessToken;
+            $save['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
+            $save['avatar'] = $data['avatar'];
+            $query = UserInfoModel::where('openid',$res['openid'])->update($save);
+            //echo 111;die;
+            if($query){
+                $message = [
+                    'msg'=>'登录成功',
+                    'token'=>$success['token'],
+                ];
+                return $this->api($message);
+            }
+        }else {
+            // dd($res);
+            $add['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
+            $add['openid'] = $res['openid'];
+            $add['avatar'] = $data['avatar'];
+            $res_add = UserInfoModel::create($add);
+            if($res_add){
+                $data_user = UserInfoModel::where('openid',$res['openid'])->first();
+                if(Auth::loginUsingId($data_user->id)) {
+                    $user = Auth::user();
+                    $success['token'] = $user->createToken($user->id . '-' . $user->openid)->accessToken;
+                    $message = [
+                        'msg'=>'登录成功',
+                        'token'=>$success['token'],
+                    ];
+                }
+            } else {
+                $message= [
+                    'msg' => '登陆失败',
+                ];
+            }
+            return $this->api($message);
+        }
+    }
+}

app/Library/ErrorCode.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: 思维定制
+ * Date: 2018/10/27
+ * Time: 11:58
+ */
+
+namespace App\Library;
+
+
+class ErrorCode
+{
+    const VERIFY_CODE_SEND_FAIL = 3000;
+    const CLIENT_WRONG_PARAMS = 1000;
+    const NO_AUTH = 1001;
+    //错误常量枚举
+    private static $_msg = [
+        self::VERIFY_CODE_SEND_FAIL => '验证码发送失败',
+        self::CLIENT_WRONG_PARAMS => '传入参数不正确',
+        self::NO_AUTH => '用户未登录',
+    ];
+
+    public static function message($code) {
+        if (isset(self::$_msg[$code])) {
+            return self::$_msg[$code];
+        } else {
+            return null;
+        }
+    }
+}

app/Models/FavoriteModel.php

@@ -1,44 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: 思维定制
- * Date: 2018/7/13
- * Time: 17:52
- */
-
-namespace App\Models;
-
-
-
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class FavoriteModel extends BaseModel
-{
-    use SoftDeletes;
-    protected $dates = ['delete_at'];
-
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'favorite';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'messages_id',
-        'user_id'
-    ];
-}

app/Models/MessagesTagModel.php → app/Models/MapBannerModel.php

@@ -1,22 +1,26 @@
 <?php
 namespace App\Models;
 use App\Models\BaseModel;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
 /**
- *  @description 标签列表
+ *  @description 地标轮播图
  *  @author  system;
  *  @version    1.0
- *  @date 2018-07-11 06:51:31
+ *  @date 2018-10-26 08:35:43
  *
  */
-class MessagesTagModel extends BaseModel
+class MapBannerModel extends BaseModel
 {
+    use SoftDeletes;
+    protected $dates = ['delete_at'];
     /**
      * 数据表名
      *
      * @var string
      *
      */
-    protected $table = 'messages_tag';
+    protected $table = 'map_banner';
     /**
     主键
      */
@@ -31,15 +35,9 @@ class MessagesTagModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-                           'site_id',
-                           'name',
+                           'mark_id',
+                           'image',
                            'sort'
                           ];
 
-
-    public function messgaes()
-    {
-        return $this->belongsToMany('App\Models\MessagesInfoModel', 'messages_tag_relation',  'tag_id', 'messages_id');
-    }
-
 }

app/Models/MapLandmarkModel.php

@@ -0,0 +1,48 @@
+<?php
+namespace App\Models;
+use App\Models\BaseModel;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ *  @description 地标
+ *  @author  system;
+ *  @version    1.0
+ *  @date 2018-10-26 08:38:42
+ *
+ */
+class MapLandmarkModel extends BaseModel
+{
+    use SoftDeletes;
+    protected $dates = ['delete_at'];
+    /**
+     * 数据表名
+     *
+     * @var string
+     *
+     */
+    protected $table = 'map_landmark';
+    /**
+    主键
+     */
+    protected $primaryKey = 'id';
+
+    //分页
+    protected $perPage = PAGE_NUMS;
+
+    /**
+     * 可以被集体附值的表的字段
+     *
+     * @var string
+     */
+    protected $fillable = [
+                           'lat',
+                           'cover',
+                           'address',
+                           'lng',
+                           'title',
+                           'subtitle',
+                           'content',
+                           'like'
+                          ];
+
+}

app/Models/MessagesTagRelationModel.php → app/Models/MapLikeModel.php

@@ -1,17 +1,14 @@
 <?php
-
 namespace App\Models;
-
 use App\Models\BaseModel;
-
 /**
- * @description 标签列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:51:31
+ *  @description 点赞
+ *  @author  system;
+ *  @version    1.0
+ *  @date 2018-10-27 09:26:50
  *
  */
-class MessagesTagRelationModel extends BaseModel
+class MapLikeModel extends BaseModel
 {
     /**
      * 数据表名
@@ -19,9 +16,9 @@ class MessagesTagRelationModel extends BaseModel
      * @var string
      *
      */
-    protected $table = 'messages_tag_relation';
+    protected $table = 'map_like';
     /**
-     * 主键
+    主键
      */
     protected $primaryKey = 'id';
 
@@ -34,9 +31,8 @@ class MessagesTagRelationModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-        'site_id',
-        'messages_id',
-        'tag_id'
-    ];
+                           'user_id',
+                           'mark_id'
+                          ];
 
 }

app/Models/MapMessageModel.php

@@ -0,0 +1,39 @@
+<?php
+namespace App\Models;
+use App\Models\BaseModel;
+/**
+ *  @description 评论
+ *  @author  system;
+ *  @version    1.0
+ *  @date 2018-10-26 08:39:11
+ *
+ */
+class MapMessageModel extends BaseModel
+{
+    /**
+     * 数据表名
+     *
+     * @var string
+     *
+     */
+    protected $table = 'map_message';
+    /**
+    主键
+     */
+    protected $primaryKey = 'id';
+
+    //分页
+    protected $perPage = PAGE_NUMS;
+
+    /**
+     * 可以被集体附值的表的字段
+     *
+     * @var string
+     */
+    protected $fillable = [
+                           'user_id',
+                           'content',
+                           'mark_id'
+                          ];
+
+}

app/Models/MessagesFollowerModel.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\BaseModel;
-
-/**
- * @description 标签列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:51:31
- *
- */
-class MessagesFollowerModel extends BaseModel
-{
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'messages_followers';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'site_id',
-        'messages_id',
-        'user_id',
-        'username',
-        'mobile',
-        'state'
-    ];
-
-    public function infos()
-    {
-        return $this->belongsTo('App\Models\MessagesInfoModel',  'messages_id', 'id');
-    }
-}

app/Models/MessagesInfoModel.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\BaseModel;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-/**
- * @description 信息列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:50:54
- *
- */
-class MessagesInfoModel extends BaseModel
-{
-    use SoftDeletes;
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'messages_info';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'site_id',
-        'title',
-        'content',
-        'user_id',
-        'price',
-        'phone',
-        'comment',
-        'type',
-        'sort',
-        'pic_url'
-    ];
-
-    public function tags()
-    {
-        return $this->belongsToMany('App\Models\MessagesTagModel', 'messages_tag_relation', 'messages_id', 'tag_id');
-    }
-
-}

app/Models/PaymentInfoModel.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\BaseModel;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-/**
- * @description 支付列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:53:04
- *
- */
-class PaymentInfoModel extends BaseModel
-{
-    use SoftDeletes;
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'payment_info';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'site_id',
-        'user_id',
-        'openid',
-        'out_trade_no',
-        'price',
-        'type',
-        'msg_id',
-        'to_user',
-        'state',
-        'poundage',
-        'name'
-    ];
-
-}

app/Models/UserInfoModel.php

@@ -1,22 +1,18 @@
 <?php
-
 namespace App\Models;
-
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Laravel\Passport\HasApiTokens;
 use Illuminate\Notifications\Notifiable;
 /**
- * @description 用户表
- * @author  system;
- * @version    1.0
- * @date 2017-05-30 12:16:56
+ *  @description 用户管理
+ *  @author  system;
+ *  @version    1.0
+ *  @date 2018-10-26 08:35:26
  *
  */
 class UserInfoModel extends Authenticatable
 {
     use HasApiTokens, Notifiable;
-    use SoftDeletes;
     /**
      * 数据表名
      *
@@ -24,8 +20,8 @@ class UserInfoModel extends Authenticatable
      *
      */
     protected $table = 'user_info';
-    /**W
-     * 主键
+    /**
+    主键
      */
     protected $primaryKey = 'id';
 
@@ -38,13 +34,12 @@ class UserInfoModel extends Authenticatable
      * @var string
      */
     protected $fillable = [
-        'nickname',
-        'openid',
-        'mobile',
-        'avatar',
-        'lost_login_time',
-        'remember_token',
-        'money'
-    ];
+                           'nickname',
+                           'openid',
+                           'mobile',
+                           'avatar',
+                           'last_login_time',
+                           'remember_token'
+                          ];
 
 }

app/Models/WechatAppModel.php

@@ -2,10 +2,10 @@
 namespace App\Models;
 use App\Models\BaseModel;
 /**
- *  @description 11
+ *  @description 微信配置
  *  @author  system;
  *  @version    1.0
- *  @date 2018-07-26 01:43:25
+ *  @date 2018-10-27 08:03:48
  *
  */
 class WechatAppModel extends BaseModel
@@ -31,11 +31,8 @@ class WechatAppModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-                           'appId',
-                           'appSecret',
-                           'mchId',
-                           'key',
-                           'poundage'
+                           'appid',
+                           'appsecret'
                           ];
 
 }

app/Repositories/Base/Criteria/WhereIn.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * User: Mike
+ * Email: m@9026.com
+ * Date: 2017/1/12
+ * Time: 17:52
+ */
+
+namespace App\Repositories\Base\Criteria;
+
+use App\Repositories\Base\Criteria;
+use App\Repositories\Contracts\RepositoryInterface as Repository;
+
+class WhereIn extends Criteria {
+
+    private $field = '';
+    private $array = [];
+
+    public function __construct($field, $array=[])
+    {
+        $this->field = $field;
+        $this->array = $array;
+    }
+
+    /**
+     * @param $model
+     * @param RepositoryInterface $repository
+     * @return mixed
+     */
+    public function apply($model, Repository $repository)
+    {
+        $model = $model->whereIn($this->field,$this->array);
+        return $model;
+    }
+
+}

app/Repositories/Map/BannerRepository.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ *   地标轮播图
+ *  @author  system
+ *  @version    1.0
+ *  @date 2018-10-26 08:35:43
+ *
+ */
+namespace App\Repositories\Map;
+
+use App\Repositories\Base\Repository;
+
+
+class BannerRepository extends Repository {
+
+    public function model() {
+        return \App\Models\MapBannerModel::class;
+    }
+
+    
+}

app/Repositories/Payment/Criteria/MultiWhere.php → app/Repositories/Map/Criteria/MultiWhere.php

@@ -6,7 +6,7 @@
  * Time: 17:52
  */
 
-namespace App\Repositories\Payment\Criteria;
+namespace App\Repositories\Map\Criteria;
 
 
 
@@ -35,13 +35,10 @@ class MultiWhere extends Criteria {
     */
     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('out_trade_no', 'like', $keywords);
-            });
-        }
+          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
+                                    $model = $model->where('updated_at',$this->search['updated_at']);
+                                 }
+
          return $model;
     }
 

app/Repositories/Map/LandmarkRepository.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ *   地标
+ *  @author  system
+ *  @version    1.0
+ *  @date 2018-10-26 08:38:42
+ *
+ */
+namespace App\Repositories\Map;
+
+use App\Repositories\Base\Repository;
+
+
+class LandmarkRepository extends Repository {
+
+    public function model() {
+        return \App\Models\MapLandmarkModel::class;
+    }
+
+    
+}

app/Repositories/Map/LikeRepository.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ *   点赞
+ *  @author  system
+ *  @version    1.0
+ *  @date 2018-10-27 09:26:50
+ *
+ */
+namespace App\Repositories\Map;
+
+use App\Repositories\Base\Repository;
+
+
+class LikeRepository extends Repository {
+
+    public function model() {
+        return \App\Models\MapLikeModel::class;
+    }
+
+    
+}

app/Repositories/Map/MessageRepository.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ *   评论
+ *  @author  system
+ *  @version    1.0
+ *  @date 2018-10-26 08:39:11
+ *
+ */
+namespace App\Repositories\Map;
+
+use App\Repositories\Base\Repository;
+
+
+class MessageRepository extends Repository {
+
+    public function model() {
+        return \App\Models\MapMessageModel::class;
+    }
+
+    
+}

app/Repositories/Messages/Criteria/MultiWhere.php

@@ -1,49 +0,0 @@
-<?php
-/**
- * User: Mike
- * Email: m@9026.com
- * Date: 2017/1/12
- * Time: 17:52
- */
-
-namespace App\Repositories\Messages\Criteria;
-
-
-
-
-use App\Repositories\Base\Criteria;
-use App\Repositories\Contracts\RepositoryInterface as Repository;
-
-class MultiWhere 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('title', 'like', $keywords)
-                    ->orwhere('phone', 'like', $keywords);
-            });
-        }
-         return $model;
-    }
-
-}

app/Repositories/Messages/Criteria/TagWhere.php

@@ -1,43 +0,0 @@
-<?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/Messages/InfoRepository.php

@@ -1,21 +0,0 @@
-<?php
-/**
- *   信息列表
- *  @author  system
- *  @version    1.0
- *  @date 2018-07-11 06:50:54
- *
- */
-namespace App\Repositories\Messages;
-
-use App\Repositories\Base\Repository;
-
-
-class InfoRepository extends Repository {
-
-    public function model() {
-        return \App\Models\MessagesInfoModel::class;
-    }
-
-    
-}

app/Repositories/Messages/TagRepository.php

@@ -1,21 +0,0 @@
-<?php
-/**
- *   标签列表
- *  @author  system
- *  @version    1.0
- *  @date 2018-07-11 06:51:31
- *
- */
-namespace App\Repositories\Messages;
-
-use App\Repositories\Base\Repository;
-
-
-class TagRepository extends Repository {
-
-    public function model() {
-        return \App\Models\MessagesTagModel::class;
-    }
-
-    
-}

app/Repositories/Payment/InfoRepository.php

@@ -1,21 +0,0 @@
-<?php
-/**
- *   支付列表
- *  @author  system
- *  @version    1.0
- *  @date 2018-07-11 06:53:04
- *
- */
-namespace App\Repositories\Payment;
-
-use App\Repositories\Base\Repository;
-
-
-class InfoRepository extends Repository {
-
-    public function model() {
-        return \App\Models\PaymentInfoModel::class;
-    }
-
-    
-}

app/Repositories/User/Criteria/MultiWhere.php

@@ -35,14 +35,11 @@ class MultiWhere extends Criteria {
     */
     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('mobile', 'like', $keywords);
-            });
-        }
-        return $model;
+          if(isset($this->search['deleted_at']) && $this->search['deleted_at']) {
+                                    $model = $model->where('deleted_at',$this->search['deleted_at']);
+                                 }
+
+         return $model;
     }
 
 }

app/Repositories/User/InfoRepository.php

@@ -1,9 +1,9 @@
 <?php
 /**
- *   用户表
+ *   用户管理
  *  @author  system
  *  @version    1.0
- *  @date 2017-05-30 12:16:56
+ *  @date 2018-10-26 08:35:26
  *
  */
 namespace App\Repositories\User;

app/Repositories/Wechat/AppRepository.php

@@ -1,9 +1,9 @@
 <?php
 /**
- *   11
+ *   微信配置
  *  @author  system
  *  @version    1.0
- *  @date 2018-07-26 01:43:25
+ *  @date 2018-10-27 08:03:48
  *
  */
 namespace App\Repositories\Wechat;

app/Repositories/Wechat/Criteria/MultiWhere.php

@@ -35,8 +35,8 @@ class MultiWhere extends Criteria {
     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['poundage']) && $this->search['poundage']) {
-                                    $model = $model->where('poundage',$this->search['poundage']);
+          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
+                                    $model = $model->where('updated_at',$this->search['updated_at']);
                                  }
 
          return $model;

database/migrations/2017_05_30_203526_create_user_info_table.php

@@ -19,7 +19,6 @@ class CreateUserInfoTable extends Migration
     {
         Schema::create('user_info', function (Blueprint $table) {
             $table->increments('id')->comment('用户ID');
-            $table->integer('site_id')->nullable()->comment('站点ID');
             $table->char('nickname', 64)->nullable()->comment('微信昵称');
             $table->char('openid', 64)->nullable()->comment('微信openid');
             $table->char('mobile', 11)->comment('手机号');
@@ -28,11 +27,7 @@ class CreateUserInfoTable extends Migration
             $table->string('remember_token', 255)->nullable();
             $table->timestamps();
             $table->softDeletes();
-
             $table->index('deleted_at', 'idx_deleted_at');
-
-            
-
         });
     }
 

database/migrations/2018_10_26_073013_create_table_message.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTableMessage extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('map_message', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('user_id')->comment('用户id');
+            $table->longText('content')->comment('文本内容');
+            $table->string('lat',20)->comment('纬度');
+            $table->string('lng',20)->comment('经度');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('map_message');
+    }
+}

database/migrations/2018_10_26_075112_create_table_landmark.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTableLandmark extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('map_landmark', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('lat',20)->comment('纬度');
+            $table->string('lng',20)->comment('经度');
+            $table->string('title',100)->comment('标题');
+            $table->string('subtitle',100)->comment('副标题');
+            $table->longText('content')->comment('地标详情');
+            $table->unsignedInteger('like')->comment('点赞');
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('map_landmark');
+    }
+}

database/migrations/2018_10_26_080621_create_table_banner.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTableBanner extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('map_banner', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('mark_id')->comment('标记id');
+            $table->longText('image')->comment('图片');
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('map_banner');
+    }
+}

database/migrations/2018_10_27_022007_add_column_to_landmark.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnToLandmark extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('map_landmark', function (Blueprint $table) {
+            //
+            $table->longText('cover')->nullable()->comment('缩略图');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('map_landmark', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2018_10_27_032226_add_column_address_to_landmark.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnAddressToLandmark extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('map_landmark', function (Blueprint $table) {
+            //
+            $table->string('address',255)->nullable()->comment('详细地址');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('map_landmark', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2018_10_27_041405_add_column_sort_to_map_banner.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnSortToMapBanner extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('map_banner', function (Blueprint $table) {
+            //
+            $table->unsignedInteger('sort')->default(100)->comment('排序');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('map_banner', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2018_10_27_080125_create_table_wechat_app.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTableWechatApp extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('wechat_app', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('appid')->comment('AppID');
+            $table->string('appsecret')->comment('AppSecret');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('wechat_app');
+    }
+}

database/migrations/2018_10_27_082856_edit_table_map_message.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class EditTableMapMessage extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('map_message', function (Blueprint $table) {
+            //
+            $table->dropColumn('lat');
+            $table->dropColumn('lng');
+            $table->unsignedInteger('mark_id')->comment('地标id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('map_message', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2018_10_27_091520_create_table_map_like.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTableMapLike extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('map_like', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('user_id')->comment('用户id');
+            $table->unsignedInteger('mark_id')->comment('地标id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('map_like');
+    }
+}

resources/views/admin/banner/check.blade.php

@@ -0,0 +1,86 @@
+@extends('admin.layout')
+
+@section('content')
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>轮播图</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('Banner/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Banner/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="mark_id"> 标记id </th>
+            <th class="sorting" data-sort="image"> 图片 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->mark_id }}</td>
+            <td>{{ $item->image }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+									<td>
+										@if(role('Banner/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Banner/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	@include('admin.tools.check_script');
+
+@endsection

resources/views/admin/banner/edit.blade.php

@@ -0,0 +1,77 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>轮播图</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('Banner/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Banner/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">标记id</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_mark_id" name="data[mark_id]" class="form-control" value="{{ $data['mark_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">图片</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_image" name="data[image]" class="form-control" value="{{ $data['image'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+@endsection

resources/views/admin/banner/index.blade.php

@@ -0,0 +1,101 @@
+@extends('admin.layout') 
+
+@section('content')
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>轮播图</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('Banner/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Banner/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="mark_id"> 标记id </th>
+            <th class="sorting" data-sort="image"> 图片 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->mark_id }}</td>
+            <td>{{ $item->image }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('Banner/update'))
+											<li><a href="{{ U('Banner/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('Banner/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('Banner/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('Banner/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Banner/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

resources/views/admin/banner/view.blade.php

@@ -0,0 +1,53 @@
+@extends('admin.layout')
+
+@section('content')
+<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['mark_id'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">图片</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['image'] 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>
+    </div>
+</div>
+@endsection

resources/views/admin/landmark/check.blade.php

@@ -0,0 +1,90 @@
+@extends('admin.layout')
+
+@section('content')
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>地标</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('Landmark/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Landmark/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="title"> 标题 </th>
+            <th class="sorting" data-sort="subtitle"> 副标题 </th>
+            <th class="sorting" data-sort="content"> 地标详情 </th>
+            <th class="sorting" data-sort="like"> 点赞 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->title }}</td>
+            <td>{{ $item->subtitle }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->like }}</td>
+									<td>
+										@if(role('Landmark/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Landmark/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	@include('admin.tools.check_script');
+
+@endsection

resources/views/admin/landmark/edit.blade.php

@@ -0,0 +1,113 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>地标</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('Landmark/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Landmark/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">纬度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lat" name="data[lat]" class="form-control" value="{{ $data['lat'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">经度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lng" name="data[lng]" class="form-control" value="{{ $data['lng'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">标题</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_title" name="data[title]" class="form-control" value="{{ $data['title'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">副标题</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_subtitle" name="data[subtitle]" class="form-control" value="{{ $data['subtitle'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">地标详情</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_content" name="data[content]" class="form-control" value="{{ $data['content'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">点赞</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_like" name="data[like]" class="form-control" value="{{ $data['like'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+@endsection

resources/views/admin/landmark/index.blade.php

@@ -0,0 +1,105 @@
+@extends('admin.layout') 
+
+@section('content')
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>地标</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('Landmark/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Landmark/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="title"> 标题 </th>
+            <th class="sorting" data-sort="subtitle"> 副标题 </th>
+            <th class="sorting" data-sort="content"> 地标详情 </th>
+            <th class="sorting" data-sort="like"> 点赞 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->title }}</td>
+            <td>{{ $item->subtitle }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->like }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('Landmark/update'))
+											<li><a href="{{ U('Landmark/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('Landmark/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('Landmark/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('Landmark/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Landmark/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

resources/views/admin/landmark/view.blade.php

@@ -0,0 +1,81 @@
+@extends('admin.layout')
+
+@section('content')
+<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">纬度</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['lat'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">经度</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['lng'] 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['subtitle'] 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['like'] 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>
+    </div>
+</div>
+@endsection

resources/views/admin/map/banner/check.blade.php

@@ -0,0 +1,86 @@
+@extends('admin.layout')
+
+@section('content')
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>地标轮播图</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('Map/Banner/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Map/Banner/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="mark_id"> 标记id </th>
+            <th class="sorting" data-sort="image"> 图片 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->mark_id }}</td>
+            <td>{{ $item->image }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+									<td>
+										@if(role('Map/Banner/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Banner/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	@include('admin.tools.check_script');
+
+@endsection

resources/views/admin/map/banner/edit.blade.php

@@ -0,0 +1,77 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>地标轮播图</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('Map/Banner/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Banner/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">标记id</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_mark_id" name="data[mark_id]" class="form-control" value="{{ $data['mark_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">图片</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_image" name="data[image]" class="form-control" value="{{ $data['image'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+@endsection

resources/views/admin/map/banner/index.blade.php

@@ -0,0 +1,101 @@
+@extends('admin.layout') 
+
+@section('content')
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>地标轮播图</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('Map/Banner/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Banner/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="mark_id"> 标记id </th>
+            <th class="sorting" data-sort="image"> 图片 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->mark_id }}</td>
+            <td>{{ $item->image }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('Map/Banner/update'))
+											<li><a href="{{ U('Map/Banner/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('Map/Banner/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('Map/Banner/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('Map/Banner/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Banner/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

resources/views/admin/map/banner/view.blade.php

@@ -0,0 +1,53 @@
+@extends('admin.layout')
+
+@section('content')
+<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['mark_id'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">图片</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['image'] 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>
+    </div>
+</div>
+@endsection

resources/views/admin/map/landmark/check.blade.php

@@ -0,0 +1,90 @@
+@extends('admin.layout')
+
+@section('content')
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>地标</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('Map/Landmark/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Map/Landmark/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="title"> 标题 </th>
+            <th class="sorting" data-sort="subtitle"> 副标题 </th>
+            <th class="sorting" data-sort="content"> 地标详情 </th>
+            <th class="sorting" data-sort="like"> 点赞 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->title }}</td>
+            <td>{{ $item->subtitle }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->like }}</td>
+									<td>
+										@if(role('Map/Landmark/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Landmark/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	@include('admin.tools.check_script');
+
+@endsection

resources/views/admin/map/landmark/edit.blade.php

@@ -0,0 +1,113 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>地标</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('Map/Landmark/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Landmark/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">纬度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lat" name="data[lat]" class="form-control" value="{{ $data['lat'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">经度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lng" name="data[lng]" class="form-control" value="{{ $data['lng'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">标题</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_title" name="data[title]" class="form-control" value="{{ $data['title'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">副标题</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_subtitle" name="data[subtitle]" class="form-control" value="{{ $data['subtitle'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">地标详情</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_content" name="data[content]" class="form-control" value="{{ $data['content'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">点赞</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_like" name="data[like]" class="form-control" value="{{ $data['like'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+@endsection

resources/views/admin/map/landmark/index.blade.php

@@ -0,0 +1,105 @@
+@extends('admin.layout') 
+
+@section('content')
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>地标</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('Map/Landmark/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Landmark/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="title"> 标题 </th>
+            <th class="sorting" data-sort="subtitle"> 副标题 </th>
+            <th class="sorting" data-sort="content"> 地标详情 </th>
+            <th class="sorting" data-sort="like"> 点赞 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->title }}</td>
+            <td>{{ $item->subtitle }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->like }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('Map/Landmark/update'))
+											<li><a href="{{ U('Map/Landmark/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('Map/Landmark/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('Map/Landmark/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('Map/Landmark/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Landmark/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

resources/views/admin/map/landmark/view.blade.php

@@ -0,0 +1,81 @@
+@extends('admin.layout')
+
+@section('content')
+<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">纬度</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['lat'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">经度</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['lng'] 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['subtitle'] 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['like'] 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>
+    </div>
+</div>
+@endsection

resources/views/admin/map/like/check.blade.php

@@ -0,0 +1,86 @@
+@extends('admin.layout')
+
+@section('content')
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>点赞</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('Map/Like/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Map/Like/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="user_id"> 用户id </th>
+            <th class="sorting" data-sort="mark_id"> 地标id </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->mark_id }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+									<td>
+										@if(role('Map/Like/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Like/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	@include('admin.tools.check_script');
+
+@endsection

resources/views/admin/map/like/edit.blade.php

@@ -0,0 +1,77 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>点赞</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('Map/Like/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Like/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">用户id</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_user_id" name="data[user_id]" class="form-control" value="{{ $data['user_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">地标id</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_mark_id" name="data[mark_id]" class="form-control" value="{{ $data['mark_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+@endsection

resources/views/admin/map/like/index.blade.php

@@ -0,0 +1,101 @@
+@extends('admin.layout') 
+
+@section('content')
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>点赞</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('Map/Like/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Like/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="user_id"> 用户id </th>
+            <th class="sorting" data-sort="mark_id"> 地标id </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->mark_id }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('Map/Like/update'))
+											<li><a href="{{ U('Map/Like/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('Map/Like/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('Map/Like/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('Map/Like/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Like/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

resources/views/admin/map/like/view.blade.php

@@ -0,0 +1,46 @@
+@extends('admin.layout')
+
+@section('content')
+<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['user_id'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">地标id</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['mark_id'] 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>
+    </div>
+</div>
+@endsection

resources/views/admin/map/message/check.blade.php

@@ -0,0 +1,90 @@
+@extends('admin.layout')
+
+@section('content')
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>评论</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('Map/Message/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Map/Message/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="user_id"> 用户id </th>
+            <th class="sorting" data-sort="content"> 文本内容 </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+									<td>
+										@if(role('Map/Message/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Message/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	@include('admin.tools.check_script');
+
+@endsection

resources/views/admin/map/message/edit.blade.php

@@ -0,0 +1,95 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>评论</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('Map/Message/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Message/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">用户id</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_user_id" name="data[user_id]" class="form-control" value="{{ $data['user_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">文本内容</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_content" name="data[content]" class="form-control" value="{{ $data['content'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">纬度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lat" name="data[lat]" class="form-control" value="{{ $data['lat'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">经度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lng" name="data[lng]" class="form-control" value="{{ $data['lng'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+@endsection

resources/views/admin/map/message/index.blade.php

@@ -0,0 +1,105 @@
+@extends('admin.layout') 
+
+@section('content')
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>评论</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('Map/Message/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Map/Message/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="user_id"> 用户id </th>
+            <th class="sorting" data-sort="content"> 文本内容 </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('Map/Message/update'))
+											<li><a href="{{ U('Map/Message/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('Map/Message/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('Map/Message/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('Map/Message/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Map/Message/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

resources/views/admin/map/message/view.blade.php

@@ -0,0 +1,60 @@
+@extends('admin.layout')
+
+@section('content')
+<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['user_id'] 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['lat'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">经度</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['lng'] 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>
+    </div>
+</div>
+@endsection

resources/views/admin/message/check.blade.php

@@ -0,0 +1,90 @@
+@extends('admin.layout')
+
+@section('content')
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>评论</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('Message/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Message/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="user_id"> 用户id </th>
+            <th class="sorting" data-sort="content"> 文本内容 </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+									<td>
+										@if(role('Message/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Message/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	@include('admin.tools.check_script');
+
+@endsection

resources/views/admin/message/edit.blade.php

@@ -0,0 +1,95 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>评论</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('Message/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Message/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">用户id</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_user_id" name="data[user_id]" class="form-control" value="{{ $data['user_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">文本内容</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_content" name="data[content]" class="form-control" value="{{ $data['content'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">纬度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lat" name="data[lat]" class="form-control" value="{{ $data['lat'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">经度</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_lng" name="data[lng]" class="form-control" value="{{ $data['lng'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+@endsection

resources/views/admin/message/index.blade.php

@@ -0,0 +1,105 @@
+@extends('admin.layout') 
+
+@section('content')
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>评论</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('Message/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Message/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="user_id"> 用户id </th>
+            <th class="sorting" data-sort="content"> 文本内容 </th>
+            <th class="sorting" data-sort="lat"> 纬度 </th>
+            <th class="sorting" data-sort="lng"> 经度 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->content }}</td>
+            <td>{{ $item->lat }}</td>
+            <td>{{ $item->lng }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('Message/update'))
+											<li><a href="{{ U('Message/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('Message/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('Message/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('Message/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Message/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection

resources/views/admin/message/view.blade.php

@@ -0,0 +1,60 @@
+@extends('admin.layout')
+
+@section('content')
+<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['user_id'] 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['lat'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">经度</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['lng'] 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>
+    </div>
+</div>
+@endsection

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

@@ -1,7 +1,6 @@
 @extends('admin.layout')
 
 @section('content')
-	<div class="wrapper wrapper-content animated fadeInRight">
 		<div class="row">
 			<div class="col-sm-12">
 				<div class="ibox float-e-margins">
@@ -37,34 +36,13 @@
 							<tr>
 								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
 								
-            <th class="sorting" data-sort="id"> 用户ID </th>
-            <th class="sorting" data-sort="username"> 登录名 </th>
-            <th class="sorting" data-sort="real_name"> 姓名 </th>
-            <th class="sorting" data-sort="password"> 密码 </th>
-            <th class="sorting" data-sort="email"> EMAIL </th>
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="nickname"> 微信昵称 </th>
+            <th class="sorting" data-sort="openid"> 微信openid </th>
             <th class="sorting" data-sort="mobile"> 手机号 </th>
             <th class="sorting" data-sort="avatar"> 用户头像 </th>
-            <th class="sorting" data-sort="gender"> 性别,1:男,2:女,参照数据字典 </th>
-            <th class="sorting" data-sort="province"> 居住地址省 </th>
-            <th class="sorting" data-sort="city"> 居住地址市 </th>
-            <th class="sorting" data-sort="county"> 居住地址区县 </th>
-            <th class="sorting" data-sort="work_type"> 工作类型：上班，自由职业者 </th>
-            <th class="sorting" data-sort="address"> 详细地址 </th>
-            <th class="sorting" data-sort="address_time"> 居住时长 </th>
-            <th class="sorting" data-sort="idcard"> 身份证号 </th>
-            <th class="sorting" data-sort="idcard_positive"> 身份证正面 </th>
-            <th class="sorting" data-sort="idcard_back"> 身份证背面 </th>
-            <th class="sorting" data-sort="educational"> 学历 </th>
-            <th class="sorting" data-sort="marital"> 婚姻状况 </th>
             <th class="sorting" data-sort="last_login_time"> 最后一次登录时间 </th>
-            <th class="sorting" data-sort="contact_bind"> 直系亲属联系人关系 </th>
-            <th class="sorting" data-sort="contact_name"> 直系亲属联系人姓名 </th>
-            <th class="sorting" data-sort="contact_mobile"> 直系亲属联系人手机 </th>
-            <th class="sorting" data-sort="other_contact_bind"> 其他联系人关系 </th>
-            <th class="sorting" data-sort="other_contact_name"> 直系亲属联系人姓名 </th>
-            <th class="sorting" data-sort="other_contact_mobile"> 直系亲属联系人手机 </th>
-            <th class="sorting" data-sort="created_at"> 创建时间 </th>
-            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+            <th class="sorting" data-sort="remember_token">  </th>
 								<th width="22%">相关操作</th>
 							</tr>
 							</thead>
@@ -75,33 +53,12 @@
 									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
 									
             <td>{{ $item->id }}</td>
-            <td>{{ $item->username }}</td>
-            <td>{{ $item->real_name }}</td>
-            <td>{{ $item->password }}</td>
-            <td>{{ $item->email }}</td>
+            <td>{{ $item->nickname }}</td>
+            <td>{{ $item->openid }}</td>
             <td>{{ $item->mobile }}</td>
             <td>{{ $item->avatar }}</td>
-            <td>{{ $item->gender }}</td>
-            <td>{{ $item->province }}</td>
-            <td>{{ $item->city }}</td>
-            <td>{{ $item->county }}</td>
-            <td>{{ dict()->get('user_info','work_type',$item->work_type) }}</td>
-            <td>{{ $item->address }}</td>
-            <td>{{ dict()->get('user_info','address_time',$item->address_time) }}</td>
-            <td>{{ $item->idcard }}</td>
-            <td>{{ $item->idcard_positive }}</td>
-            <td>{{ $item->idcard_back }}</td>
-            <td>{{ $item->educational }}</td>
-            <td>{{ dict()->get('user_info','marital',$item->marital) }}</td>
             <td>{{ $item->last_login_time }}</td>
-            <td>{{ dict()->get('user_info','contact_bind',$item->contact_bind) }}</td>
-            <td>{{ $item->contact_name }}</td>
-            <td>{{ $item->contact_mobile }}</td>
-            <td>{{ dict()->get('user_info','other_contact_bind',$item->other_contact_bind) }}</td>
-            <td>{{ $item->other_contact_name }}</td>
-            <td>{{ $item->other_contact_mobile }}</td>
-            <td>{{ $item->created_at }}</td>
-            <td>{{ $item->updated_at }}</td>
+            <td>{{ $item->remember_token }}</td>
 									<td>
 										@if(role('User/Info/view'))
 											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
@@ -128,7 +85,6 @@
 				</div>
 			</div>
 		</div>
-	</div>
 	@include('admin.tools.check_script');
 
 @endsection

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

@@ -2,357 +2,112 @@
 
 @section('content')
 
-    <?php
-    if (!isset($data)) $data = array();
-    if (!$data && session("data")) {
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
         $data = session("data");
     }
-    if (!$data && session('_old_input')) {
+    if(!$data && session('_old_input')){
         $data = session("_old_input");
     }
-    ?>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>用户管理</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-                        </a>
-                    </div>
-                </div>
-                <div class="ibox-content">
+?>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>用户管理</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
                     @if(role('User/Info/index'))
-                        <div class="row">
-                            <div class="col-sm-3 pull-right">
-                                <a href="{{ U('User/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
-                            </div>
-                        </div>
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('User/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
                     @endif
 
-                    <div class="row">
+		            <div class="row">
                         <div class="col-lg-10">
-                            <form name="form_product" id="form-validation" action=""
-                                  class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
-
-
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">登录名</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_username" name="data[username]" class="form-control"
-                                               value="{{ $data['username'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">姓名</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_real_name" name="data[real_name]" isChinese class="form-control"
-                                               value="{{ $data['real_name'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">密码</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_password" name="data[password]" class="form-control"
-                                               value="{{ $data['password'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">EMAIL</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_email" name="data[email]" email="true" class="form-control"
-                                               value="{{ $data['email'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">手机号</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_mobile" name="data[mobile]" isMobile="true" class="form-control"
-                                               value="{{ $data['mobile'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">用户头像</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_avatar" name="data[avatar]" class="form-control"
-                                               value="{{ $data['avatar'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">性别</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_gender" name="data[gender]" class="form-control"
-                                               value="{{ $data['gender'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-
-                                {{--<div class="form-group">
-                                    <label class="control-label col-sm-3">工作类型</label>
-
-                                    <div class="col-sm-9">
-                                        @if(dict()->get('user_info','work_type') != null)
-                                            @foreach(dict()->get('user_info','work_type') as $key=>$val)
-                                                <label class="radio-inline">
-                                                    <input type="radio" name="data[work_type]" value="{{$key}}"
-                                                           @if(isset($data['work_type']) && $data['work_type'] == $key)checked="checked" @endif/>{{$val}}
-                                                </label>
-                                            @endforeach
-                                        @else
-                                            <label class="radio-inline">
-                                                <input type="radio" name="data[work_type]">
-                                            </label>
-                                        @endif
-                                    </div>
-
-                                </div>--}}
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">居住地址省</label>
-
-                                    <div class="col-sm-9">
-                                        <div class="col-sm-2">
-                                            <select class="form-control" id="cmbProvince"
-                                                    name="place_province_id"></select>
-                                        </div>
-                                        <div class="col-sm-2">
-                                            <select class="form-control" id="cmbCity" name="place_city_id"></select>
-                                        </div>
-                                        <div class="col-sm-2">
-                                            <select class="form-control" id="cmbArea" name=""></select>
-                                        </div>
-                                        <script type="text/javascript" src="/base/js/areadata.min.js"></script>
-                                        <script type="text/javascript">
-                                            areadata({
-                                                _cmbProvince: 'cmbProvince',//省
-                                                _cmbCity: 'cmbCity',//市
-                                                _cmbArea: 'cmbArea',//县
-                                                _infoname: 'place_area_id',
-                                                _default: "{{ $data['place_area_id'] or '' }}"//默认县
-                                            });
-                                        </script>
-                                    </div>
-
-                                </div>
-
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">简介</label>
-
-                                    <div class="col-sm-9">
-
-                                        {!! editor() !!}
-                                        <script id="container" name="content"
-                                                type="text/plain">{{ $data['address'] or ''}}</script>
-
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">居住时长</label>
-
-                                    <div class="col-sm-9">
-                                        @if(dict()->get('user_info','address_time') != null)
-                                            @foreach(dict()->get('user_info','address_time') as $key=>$val)
-                                                <label class="radio-inline">
-                                                    <input type="radio" name="data[address_time]" value="{{$key}}"
-                                                           @if(isset($data['address_time']) && $data['address_time'] == $key)checked="checked" @endif/>{{$val}}
-                                                </label>
-                                            @endforeach
-                                        @else
-                                            <label class="radio-inline">
-                                                <input type="radio" name="data[address_time]">
-                                            </label>
-                                        @endif
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">身份证号</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_idcard" name="data[idcard]" isIdCardNo="true"
-                                               class="form-control" value="{{ $data['idcard'] or ''}}" required=""
-                                               aria-required="true" placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">身份证正面</label>
-
-                                    <div class="col-sm-9">
-                                        {!!  widget('Tools.ImgUpload')->single('idcard_positive',"data[idcard_positive]", isset($data['idcard_positive'])? $data['idcard_positive'] : "") !!}
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    <label class="control-label col-sm-3">身份证背面</label>
-
-                                    <div class="col-sm-9">
-                                        {!!  widget('Tools.ImgUpload')->multi('idcard_back',"data[idcard_back]", isset($data['idcard_back'])? $data['idcard_back'] : "") !!}
-                                    </div>
-
-                                </div>
-                                <div class="form-group">
-
-                                    {{-- <label class="control-label col-sm-3">学历</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','educational') != null)
-                                           @foreach(dict()->get('user_info','educational') as $key=>$val)
-                                               <label class="radio-inline">
-                                                   <input type="radio" name="data[educational]" value="{{$key}}" @if(isset($data['educational']) && $data['educational'] == $key)checked="checked" @endif/>{{$val}}
-                                               </label>
-                                           @endforeach
-                                        @else
-                                               <label class="radio-inline">
-                                                   <input type="radio" name="data[educational]">
-                                               </label>
-                                              @endif
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">婚姻状况</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','marital') != null)
-                                       @foreach(dict()->get('user_info','marital') as $key=>$val)
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[marital]" value="{{$key}}" @if(isset($data['marital']) && $data['marital'] == $key)checked="checked" @endif/>{{$val}}
-                                                                       </label>
-                                                                @endforeach
-                                                                @else
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[marital]">
-                                                                       </label>
-                                                                @endif
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人关系</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','contact_bind') != null)
-                                       @foreach(dict()->get('user_info','contact_bind') as $key=>$val)
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[contact_bind]" value="{{$key}}" @if(isset($data['contact_bind']) && $data['contact_bind'] == $key)checked="checked" @endif/>{{$val}}
-                                                                       </label>
-                                                                @endforeach
-                                                                @else
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[contact_bind]">
-                                                                       </label>
-                                                                @endif
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人姓名</label>
-
-                                       <div class="col-sm-9">
-                                         <input id="data_contact_name" name="data[contact_name]" isChinese="true" class="form-control" value="{{ $data['contact_name'] or ''}}" required="" aria-required="true"  placeholder="">
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人手机</label>
-
-                                       <div class="col-sm-9">
-                                         <input id="data_contact_mobile" isMobile="true"  name="data[contact_mobile]" class="form-control" value="{{ $data['contact_mobile'] or ''}}" required="" aria-required="true"  placeholder="">
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">其他联系人关系</label>
-
-                                       <div class="col-sm-9">
-                                       @if(dict()->get('user_info','other_contact_bind') != null)
-                                       @foreach(dict()->get('user_info','other_contact_bind') as $key=>$val)
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[other_contact_bind]" value="{{$key}}" @if(isset($data['other_contact_bind']) && $data['other_contact_bind'] == $key)checked="checked" @endif/>{{$val}}
-                                                                       </label>
-                                                                @endforeach
-                                                                @else
-                                                                       <label class="radio-inline">
-                                                                           <input type="radio" name="data[other_contact_bind]">
-                                                                       </label>
-                                                                @endif
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人姓名</label>
-
-                                       <div class="col-sm-9">
-                                         <input id="data_other_contact_name" isChinese="true" name="data[other_contact_name]" class="form-control" value="{{ $data['other_contact_name'] or ''}}" required="" aria-required="true"  placeholder="">
-                                        </div>
-
-                                        </div>
-                                    <div class="form-group">
-
-                                     <label class="control-label col-sm-3">直系亲属联系人手机</label>--}}
-
-                                    <div class="col-sm-9">
-                                        {{--<input id="data_other_contact_mobile" isMobile="true"  name="data[other_contact_mobile]" class="form-control" value="{{ $data['other_contact_mobile'] or ''}}" required="" aria-required="true"  placeholder="">--}}
-                                    </div>
-                                </div>
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">微信昵称</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_nickname" name="data[nickname]" class="form-control" value="{{ $data['nickname'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">微信openid</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_openid" name="data[openid]" class="form-control" value="{{ $data['openid'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">手机号</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_mobile" name="data[mobile]" class="form-control" value="{{ $data['mobile'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">用户头像</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_avatar" name="data[avatar]" class="form-control" value="{{ $data['avatar'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">最后一次登录时间</label>
+                                    
+                   <div class="col-sm-9">
+  <input name="data[last_login_time]" class="form-control laydate-icon help-block m-b-none" style="width:200px; height:34px;" value="{{ $data['last_login_time'] or ''}}" placeholder="最后一次登录时间" onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})" aria-invalid="false"> 
+                    </div>
+                                
+                </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3"></label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_remember_token" name="data[remember_token]" class="form-control" value="{{ $data['remember_token'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                </div>
+                                
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">&nbsp;</label>
                                     <div class="col-sm-9">
-                                        <input type="hidden" name="_referer"
-                                               value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
                                         <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
                                         <input type="submit" class="btn btn-success" style="margin-right:20px;">
-                                        <input type="reset" class="btn btn-default">
+                                        <input type="reset" class="btn btn-default" >
                                     </div>
                                 </div>
-
+        
                             </form>
                         </div>
                         <!-- /.col-lg-10 -->
                     </div>
                     <!-- /.row -->
-                </div>
-            </div>
-        </div>
-    </div>
+				</div>
+			</div>
+		</div>
+	</div>
 
 @endsection

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

@@ -1,87 +1,105 @@
-@extends('admin.layout')
+@extends('admin.layout') 
 
 @section('content')
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>用户管理</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="row">
-                            <form method="GET" action="" accept-charset="UTF-8">
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>用户管理</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
 
-                                <div class="col-sm-4">
-                                    <div class="input-group">
-                                        <input type="text" value="{{Request::get('keyword')}}" placeholder="请输入关键词"
-                                               name="keyword" class="input-sm form-control">
-                                        <span class="input-group-btn">
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
 								</span>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('User/Info/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('User/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> ID </th>
+            <th class="sorting" data-sort="nickname"> 微信昵称 </th>
+            <th class="sorting" data-sort="openid"> 微信openid </th>
+            <th class="sorting" data-sort="mobile"> 手机号 </th>
+            <th class="sorting" data-sort="avatar"> 用户头像 </th>
+            <th class="sorting" data-sort="last_login_time"> 最后一次登录时间 </th>
+            <th class="sorting" data-sort="remember_token">  </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->nickname }}</td>
+            <td>{{ $item->openid }}</td>
+            <td>{{ $item->mobile }}</td>
+            <td>{{ $item->avatar }}</td>
+            <td>{{ $item->last_login_time }}</td>
+            <td>{{ $item->remember_token }}</td>
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
 
-                        <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
-                            <thead>
-                            <tr>
 
-                                <th class="sorting" data-sort="id"> 用户ID</th>
-                                <th class="sorting" data-sort="nickname"> 昵称</th>
-                                <th class="sorting" data-sort="avatar"> 头像</th>
-                                <th class="sorting" data-sort="mobile"> 手机号</th>
-                                <th class="sorting" data-sort="last_login_time"> 最后登陆时间</th>
+											@if(role('User/Info/update'))
+											<li><a href="{{ U('User/Info/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
 
-                            </tr>
-                            </thead>
-                            <tbody>
+											@if(role('User/Info/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('User/Info/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
 
-                            @if(isset($list))
-                                @foreach($list as $key => $item)
-                                    <tr>
-                                        <td>{{ $item->id }}</td>
-                                        <td>{{ $item->nickname }}</td>
-                                        <td><img src="{{ $item->avatar }}" style="height: 50px"></td>
-                                        <td>{{ $item->mobile }}</td>
-                                        <td>{{ $item->last_login_time }}</td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button data-toggle="dropdown"
-                                                        class="btn btn-warning btn-sm dropdown-toggle"
-                                                        aria-expanded="false">
-                                                    操作 <span class="caret"></span>
-                                                </button>
+										</ul>
+									</div>
+								@if(role('User/Info/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
 
-                                            </div>
-                                        </td>
-                                    </tr>
-                                @endforeach
-                            @endif
-
-                            </tbody>
-                        </table>
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <div class="dataTables_info" id="DataTables_Table_0_info"
-                                     role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}
-                                    条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。
-                                </div>
-                            </div>
-                            <div class="col-sm-6">
-                                <div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
-                                    {!! $list->setPath('')->appends(Request::all())->render() !!}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 @endsection

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

@@ -7,37 +7,23 @@
                                  
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">用户ID</h3>
+                   <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">登录名</h3>
+                   <h3 class="list-group-item-heading">微信昵称</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['username'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['nickname'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">姓名</h3>
+                   <h3 class="list-group-item-heading">微信openid</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['real_name'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">密码</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['password'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">EMAIL</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['email'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['openid'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
@@ -53,90 +39,6 @@
                                                    
                    <p class="list-group-item-text"> {{ $data['avatar'] or ''}}</p>
                                                  
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">性别,1:男,2:女,参照数据字典</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['gender'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">居住地址省</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['province'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">居住地址市</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['city'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">居住地址区县</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['county'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">工作类型：上班，自由职业者</h3>
-                                                   
-                   <p class="list-group-item-text">{{ dict()->get('user_info','work_type',$data['work_type']) }}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">详细地址</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['address'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">居住时长</h3>
-                                                   
-                   <p class="list-group-item-text">{{ dict()->get('user_info','address_time',$data['address_time']) }}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">身份证号</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['idcard'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">身份证正面</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['idcard_positive'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">身份证背面</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['idcard_back'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">学历</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['educational'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">婚姻状况</h3>
-                                                   
-                   <p class="list-group-item-text">{{ dict()->get('user_info','marital',$data['marital']) }}</p>
-                                                 
                </div>                     
                <div class="list-group-item">
                                                   
@@ -147,44 +49,9 @@
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">直系亲属联系人关系</h3>
-                                                   
-                   <p class="list-group-item-text">{{ dict()->get('user_info','contact_bind',$data['contact_bind']) }}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">直系亲属联系人姓名</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['contact_name'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">直系亲属联系人手机</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['contact_mobile'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">其他联系人关系</h3>
-                                                   
-                   <p class="list-group-item-text">{{ dict()->get('user_info','other_contact_bind',$data['other_contact_bind']) }}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">直系亲属联系人姓名</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['other_contact_name'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">直系亲属联系人手机</h3>
+                   <h3 class="list-group-item-heading"></h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['other_contact_mobile'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['remember_token'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
@@ -203,7 +70,7 @@
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">删除时间</h3>
+                   <h3 class="list-group-item-heading"></h3>
                                                    
                    <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
                                                  

resources/views/admin/wechat/app/check.blade.php

@@ -5,7 +5,7 @@
 			<div class="col-sm-12">
 				<div class="ibox float-e-margins">
 					<div class="ibox-title">
-						<h5>11</h5>
+						<h5>微信配置</h5>
 						<div class="ibox-tools">
 							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 							</a>
@@ -37,10 +37,8 @@
 								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
 								
             <th class="sorting" data-sort="id"> ID </th>
-            <th class="sorting" data-sort="appId"> appid </th>
-            <th class="sorting" data-sort="appSecret"> appsecret </th>
-            <th class="sorting" data-sort="mchId"> 商户id </th>
-            <th class="sorting" data-sort="key"> 商户key </th>
+            <th class="sorting" data-sort="appid"> AppID </th>
+            <th class="sorting" data-sort="appsecret"> AppSecret </th>
             <th class="sorting" data-sort="created_at"> 创建时间 </th>
             <th class="sorting" data-sort="updated_at"> 更新时间 </th>
 								<th width="22%">相关操作</th>
@@ -53,10 +51,8 @@
 									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
 									
             <td>{{ $item->id }}</td>
-            <td>{{ $item->appId }}</td>
-            <td>{{ $item->appSecret }}</td>
-            <td>{{ $item->mchId }}</td>
-            <td>{{ $item->key }}</td>
+            <td>{{ $item->appid }}</td>
+            <td>{{ $item->appsecret }}</td>
             <td>{{ $item->created_at }}</td>
             <td>{{ $item->updated_at }}</td>
 									<td>

resources/views/admin/wechat/app/edit.blade.php

@@ -15,14 +15,20 @@
 		<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>
 					</div>
 				</div>
 				<div class="ibox-content">
-
+                    @if(role('Wechat/App/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('Wechat/App/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
 
 		            <div class="row">
                         <div class="col-lg-10">
@@ -31,46 +37,19 @@
                                     
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">appid</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_appId" name="data[appId]" class="form-control" value="{{ $data['appId'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">appsecret</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_appSecret" name="data[appSecret]" class="form-control" value="{{ $data['appSecret'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">商户id</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_mchId" name="data[mchId]" class="form-control" value="{{ $data['mchId'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">商户key</label>
+                 <label class="control-label col-sm-3">AppID</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_key" name="data[key]" class="form-control" value="{{ $data['key'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_appid" name="data[appid]" class="form-control" value="{{ $data['appid'] or ''}}" required="" aria-required="true"  placeholder=""> 
                     </div>
                                 
                 </div>    
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">手续费</label>
+                 <label class="control-label col-sm-3">AppSecret</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_poundage" name="data[poundage]" class="form-control" value="{{ $data['poundage'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_appsecret" name="data[appsecret]" class="form-control" value="{{ $data['appsecret'] or ''}}" required="" aria-required="true"  placeholder=""> 
                     </div>
                                 
                 </div>

resources/views/admin/wechat/app/index.blade.php

@@ -5,7 +5,7 @@
 		<div class="col-sm-12">
 			<div class="ibox float-e-margins">
 				<div class="ibox-title">
-					<h5>11</h5>
+					<h5>微信配置</h5>
 					<div class="ibox-tools">
 						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 						</a>
@@ -36,10 +36,8 @@
     						<tr>
 								
             <th class="sorting" data-sort="id"> ID </th>
-            <th class="sorting" data-sort="appId"> appid </th>
-            <th class="sorting" data-sort="appSecret"> appsecret </th>
-            <th class="sorting" data-sort="mchId"> 商户id </th>
-            <th class="sorting" data-sort="key"> 商户key </th>
+            <th class="sorting" data-sort="appid"> AppID </th>
+            <th class="sorting" data-sort="appsecret"> AppSecret </th>
             <th class="sorting" data-sort="created_at"> 创建时间 </th>
             <th class="sorting" data-sort="updated_at"> 更新时间 </th>
         						<th width="22%">相关操作</th>
@@ -50,10 +48,8 @@
 							@foreach($list as $key => $item)							<tr>
 								
             <td>{{ $item->id }}</td>
-            <td>{{ $item->appId }}</td>
-            <td>{{ $item->appSecret }}</td>
-            <td>{{ $item->mchId }}</td>
-            <td>{{ $item->key }}</td>
+            <td>{{ $item->appid }}</td>
+            <td>{{ $item->appsecret }}</td>
             <td>{{ $item->created_at }}</td>
             <td>{{ $item->updated_at }}</td>
 								<td>

resources/views/admin/wechat/app/view.blade.php

@@ -14,30 +14,16 @@
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">appid</h3>
+                   <h3 class="list-group-item-heading">AppID</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['appId'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['appid'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">appsecret</h3>
+                   <h3 class="list-group-item-heading">AppSecret</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['appSecret'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">商户id</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['mchId'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">商户key</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['key'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['appsecret'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
@@ -53,13 +39,6 @@
                                                    
                    <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
                                                  
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">手续费</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['poundage'] or ''}}</p>
-                                                 
                </div>
         </div>
     </div>

routes/api.php

@@ -21,28 +21,17 @@ $api = app('Dingo\Api\Routing\Router');
 //
 $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($api) {
 //    // test
-    $api->post('/login', [
-        'as' => 'login.login',
-        'uses' => 'LoginController@login',
-    ]);
 
     Route::group(['middleware' => 'auth:api'], function(){
 
     });
-    $api->get('/index/menu', 'IndexController@indexMenu');
-    $api->get('/index/message', 'IndexController@indexMessage');
-    $api->get('/index/get_message', 'IndexController@indexGetMessage');
-    $api->get('index/tag', 'IndexController@indexTag');
-    $api->get('index/tag', 'IndexController@indexTag');
-    $api->post('/user/release', 'UserController@userRelease');
-    $api->get('/user/edit_favorite', 'UserController@userEditFavorite');
-    $api->get('/user/favorite', 'UserController@userFavorite');
-    $api->get('/user/my_message', 'UserController@userMyMessage');
-    $api->get('/user/get_message', 'UserController@userGetMessages');
-    $api->get('/user/message_detail', 'UserController@userMessageDetail');
-    $api->post('/pay/recharge', 'PayController@recharge');
-    $api->post('/pay/cash', 'PayController@cash');
-    $api->post('/attachment/upload', 'AttachmentController@upload');
+    $api->get('/land-mark/get-land-mark', 'LandMarkController@getLandMark');
+    $api->get('/land-mark/get-detail', 'LandMarkController@getDetail');
+    $api->get('/land-mark/do-like', 'LandMarkController@doLike');
+    $api->post('/login', 'LoginController@login');
+
+
+
 //    $api->post('auth/logout', [
 //        'as' => 'auth.logout',
 //        'uses' => 'AuthController@logout',