6 年之前 · 337b2e5c74
--- a/app/Helper/AttachmentHelper.php
+++ b/app/Helper/AttachmentHelper.php
@@ -76,7 +76,7 @@ trait AttachmentHelper
 
				                     $attachment->file_type = $fileMimeType;
			
 
				                     if ($attachment->save()) {
			
 
				                         //$result[$idx]['real'] = env('APP_URL').'/'.$real_path;
			
 
				-                        $result[$idx] = env('APP_URL').'/'.$real_path;
			
 
				+                        $result[$idx] = env('APP_URL').$url_path;
			
 
				                         //$result[$idx] = $md5;
			
 
				                     } else {
			
 
				                         @unlink($real_path);
			
--- a/app/Helper/functions.inc.php
+++ b/app/Helper/functions.inc.php
@@ -28,7 +28,32 @@ if (! function_exists('array_unique_two_dimensional')) {
 
				     }
			
 
				 }
			
 
				 
			
 
				+function ueditor() {
			
 
				 
			
 
				+    $editer = <<<HTML
			
 
				+    <!-- 配置文件 -->
			
 
				+    <script type="text/javascript" src="/base/neditor-1.5.3/neditor.config.js"></script>
			
 
				+    <!-- 编辑器源码文件 -->
			
 
				+    <script type="text/javascript" src="/base/neditor-1.5.3/neditor.all.js"></script>
			
 
				+    <!-- 实例化编辑器 -->
			
 
				+    <script type="text/javascript">
			
 
				+        var ue = UE.getEditor('container',{
			
 
				+             toolbars: [
			
 
				+          ["fullscreen","source","autotypeset","bold", "italic","underline","forecolor", "paragraph","fontfamily","fontsize","indent","justifyleft", "justifycenter","justifyright","justifyjustify","link","unlink","insertimage","insertcode"
			
 
				+          ]],
			
 
				+           autoHeightEnabled: true,
			
 
				+           autoFloatEnabled: true,
			
 
				+           initialFrameHeight:320
			
 
				+        });
			
 
				+   
			
 
				+        ue.ready(function(){
			
 
				+        ue.execCommand('serverparam', '_token', '{{ csrf_token() }}');
			
 
				+    })
			
 
				+    </script>
			
 
				+HTML;
			
 
				+
			
 
				+    return $editer;
			
 
				+}
			
 
				 
			
 
				 if( ! function_exists('array_to_sort')) {
			
 
				     /**
			
--- a/app/Http/Controllers/Admin/Controller.php
+++ b/app/Http/Controllers/Admin/Controller.php
@@ -32,6 +32,22 @@ abstract class Controller extends BaseController
 
				         return (new Formhash())->checkFormHash();
			
 
				     }
			
 
				 
			
 
				+    public function formatImgUrl($url){
			
 
				+        // echo substr($url, 0, 7);
			
 
				+        //dd($url);
			
 
				+        if (substr($url, 0, 7) == 'http://' || substr($url, 0, 8) == 'https://') {
			
 
				+           /* if(substr($url, 0, 7) == 'http://'){
			
 
				+                $url = str_replace('http://','https://',$url);
			
 
				+            }
			
 
				+            if(substr($url,0,19) == 'https://t6.9026.com'){
			
 
				+                $url = str_replace('https://t6.9026.com',env('CDN_URL'),$url);
			
 
				+            }*/
			
 
				+            return $url;
			
 
				+        } else {
			
 
				+            return env('APP_URL').$url;
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				     /**
			
 
				      * 启用操作日志记录
			
 
				      */
			
--- a/app/Http/Controllers/Admin/Map/BannerController.php
+++ b/app/Http/Controllers/Admin/Map/BannerController.php
@@ -1,138 +0,0 @@
 
				-<?php
			
 
				-/**
			
 
				- *  地标轮播图
			
 
				- *  @author  system
			
 
				- *  @version    1.0
			
 
				- *  @date 2018-10-26 08:35:43
			
 
				- *
			
 
				- */
			
 
				-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\BannerRepository;
			
 
				-
			
 
				-class BannerController extends Controller
			
 
				-{
			
 
				-    private $repository;
			
 
				-
			
 
				-    public function __construct(BannerRepository $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.banner.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.banner.check',compact('list'));
			
 
				-    }
			
 
				-
			
 
				-
			
 
				-    /**
			
 
				-     * 添加
			
 
				-     * 
			
 
				-     */
			
 
				-    public function create(Request $request)
			
 
				-    {
			
 
				-        if($request->method() == 'POST') {
			
 
				-            return $this->_createSave();
			
 
				-        }
			
 
				-        return view('admin.map.banner.edit');
			
 
				-    }
			
 
				-
			
 
				-    /**
			
 
				-     * 保存修改
			
 
				-     */
			
 
				-    private function _createSave(){
			
 
				-        $data = (array) request('data');
			
 
				-        $id = $this->repository->create($data);
			
 
				-        if($id) {
			
 
				-            $url[] = array('url'=>U( 'Map/Banner/index'),'title'=>'返回列表');
			
 
				-            $url[] = array('url'=>U( 'Map/Banner/create'),'title'=>'继续添加');
			
 
				-            $this->showMessage('添加成功',$url);
			
 
				-        }else{
			
 
				-            $url[] = array('url'=>U( 'Map/Banner/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.banner.edit',compact('data'));
			
 
				-    }
			
 
				-
			
 
				-    /**
			
 
				-     * 保存修改
			
 
				-     */
			
 
				-    private function _updateSave() {
			
 
				-        $data = (array) request('data');
			
 
				-        $ok = $this->repository->update(request('id'),$data);
			
 
				-        if($ok) {
			
 
				-            $url[] = array('url'=>U( 'Map/Banner/index'),'title'=>'返回列表');
			
 
				-            return $this->showMessage('操作成功',urldecode(request('_referer')));
			
 
				-        }else{
			
 
				-            $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.map.banner.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("操作失败");
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/app/Http/Controllers/Admin/Map/LandmarkController.php
+++ b/app/Http/Controllers/Admin/Map/LandmarkController.php
@@ -8,6 +8,8 @@
 
				  */
			
 
				 namespace App\Http\Controllers\Admin\Map;
			
 
				 use App\Http\Controllers\Admin\Controller;
			
 
				+use App\Models\MapBannerModel;
			
 
				+use App\Repositories\Map\Criteria\MarkWhere;
			
 
				 use Illuminate\Http\Request;
			
 
				 use App\Repositories\Base\Criteria\OrderBy;
			
 
				 use App\Repositories\Map\Criteria\MultiWhere;
			
@@ -23,7 +25,7 @@ class LandmarkController extends Controller
 
				 
			
 
				     function index(Request $request) {
			
 
				         $search['keyword'] = $request->input('keyword');
			
 
				-        $query = $this->repository->pushCriteria(new MultiWhere($search));
			
 
				+        $query = $this->repository->pushCriteria(new MarkWhere($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']));
			
@@ -64,7 +66,22 @@ class LandmarkController extends Controller
 
				      */
			
 
				     private function _createSave(){
			
 
				         $data = (array) request('data');
			
 
				+        if(!empty($data['banner']['url'])){
			
 
				+            $banner = $data['banner']['url'];
			
 
				+            unset($data['banner']);
			
 
				+        }
			
 
				+
			
 
				+        $data['cover'] = $this->formatImgUrl($data['cover']);
			
 
				         $id = $this->repository->create($data);
			
 
				+        if(!empty($data['banner']['url'])){
			
 
				+            foreach($banner as $key=>$val){
			
 
				+                $add['image'] = $this->formatImgUrl($val);
			
 
				+                $add['mark_id'] = $id;
			
 
				+                $add['sort'] = 0;
			
 
				+                MapBannerModel::create($add);
			
 
				+            }
			
 
				+        }
			
 
				+
			
 
				         if($id) {
			
 
				             $url[] = array('url'=>U( 'Map/Landmark/index'),'title'=>'返回列表');
			
 
				             $url[] = array('url'=>U( 'Map/Landmark/create'),'title'=>'继续添加');
			
@@ -86,6 +103,12 @@ class LandmarkController extends Controller
 
				             return $this->_updateSave();
			
 
				         }
			
 
				         $data = $this->repository->find($request->get('id'));
			
 
				+        $banner = MapBannerModel::where('mark_id',$data['id'])->get();
			
 
				+        $imgs = array();
			
 
				+        foreach($banner as $key=>$val){
			
 
				+            $imgs[] = $val['image'];
			
 
				+        }
			
 
				+        $data->banner = $imgs;
			
 
				         return view('admin.map.landmark.edit',compact('data'));
			
 
				     }
			
 
				 
			
@@ -94,6 +117,17 @@ class LandmarkController extends Controller
 
				      */
			
 
				     private function _updateSave() {
			
 
				         $data = (array) request('data');
			
 
				+        $id = request('id');
			
 
				+        MapBannerModel::where('mark_id',$id)->delete();
			
 
				+        foreach($data['banner']['url'] as $key=>$val){
			
 
				+            $add['image'] = $this->formatImgUrl($val);
			
 
				+            $add['mark_id'] = $id;
			
 
				+            $add['sort'] = 0;
			
 
				+            MapBannerModel::create($add);
			
 
				+        }
			
 
				+        unset($data['banner']);
			
 
				+        $data['cover'] = $this->formatImgUrl($data['cover']);
			
 
				+       // dd($data);
			
 
				         $ok = $this->repository->update(request('id'),$data);
			
 
				         if($ok) {
			
 
				             $url[] = array('url'=>U( 'Map/Landmark/index'),'title'=>'返回列表');
			
--- a/app/Http/Controllers/Admin/Map/LikeController.php
+++ b/app/Http/Controllers/Admin/Map/LikeController.php
@@ -1,138 +0,0 @@
 
				-<?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("操作失败");
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/app/Http/Controllers/Admin/Map/MessageController.php
+++ b/app/Http/Controllers/Admin/Map/MessageController.php
@@ -8,6 +8,9 @@
 
				  */
			
 
				 namespace App\Http\Controllers\Admin\Map;
			
 
				 use App\Http\Controllers\Admin\Controller;
			
 
				+use App\Models\MapLandmarkModel;
			
 
				+use App\Models\UserInfoModel;
			
 
				+use App\Repositories\Map\Criteria\MessageWhere;
			
 
				 use Illuminate\Http\Request;
			
 
				 use App\Repositories\Base\Criteria\OrderBy;
			
 
				 use App\Repositories\Map\Criteria\MultiWhere;
			
@@ -23,7 +26,7 @@ class MessageController extends Controller
 
				 
			
 
				     function index(Request $request) {
			
 
				         $search['keyword'] = $request->input('keyword');
			
 
				-        $query = $this->repository->pushCriteria(new MultiWhere($search));
			
 
				+        $query = $this->repository->pushCriteria(new MessageWhere($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']));
			
@@ -31,6 +34,12 @@ class MessageController extends Controller
 
				             $query = $query->pushCriteria(new OrderBy('id','DESC'));
			
 
				         }
			
 
				         $list = $query->paginate();
			
 
				+        foreach ($list as $key=>$val){
			
 
				+            $user = UserInfoModel::find($val['user_id']);
			
 
				+            $mark = MapLandmarkModel::find($val['mark_id']);
			
 
				+            $val->mark = $mark->title;
			
 
				+            $val->user = $user->nickname;
			
 
				+        }
			
 
				         return view('admin.map.message.index',compact('list'));
			
 
				     }
			
 
				 
			
@@ -106,7 +115,8 @@ class MessageController extends Controller
 
				 
			
 
				     public function view(Request $request) {
			
 
				         $data = $this->repository->find(request('id'));
			
 
				-        return view('admin.map.message.view',compact('data'));
			
 
				+        $img = explode(',',$data->img);
			
 
				+        return view('admin.map.message.view',compact('data','img'));
			
 
				     }
			
 
				 
			
 
				 
			
--- a/app/Http/Controllers/Admin/User/InfoController.php
+++ b/app/Http/Controllers/Admin/User/InfoController.php
@@ -10,7 +10,7 @@ namespace App\Http\Controllers\Admin\User;
 
				 use App\Http\Controllers\Admin\Controller;
			
 
				 use Illuminate\Http\Request;
			
 
				 use App\Repositories\Base\Criteria\OrderBy;
			
 
				-use App\Repositories\User\Criteria\MultiWhere;
			
 
				+use App\Repositories\User\Criteria\UserWhere;
			
 
				 use App\Repositories\User\InfoRepository;
			
 
				 
			
 
				 class InfoController extends Controller
			
@@ -23,7 +23,7 @@ class InfoController extends Controller
 
				 
			
 
				     function index(Request $request) {
			
 
				         $search['keyword'] = $request->input('keyword');
			
 
				-        $query = $this->repository->pushCriteria(new MultiWhere($search));
			
 
				+        $query = $this->repository->pushCriteria(new UserWhere($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']));
			
--- a/app/Http/Controllers/Api/V1/AttachmentController.php
+++ b/app/Http/Controllers/Api/V1/AttachmentController.php
@@ -88,6 +88,7 @@ class AttachmentController extends Controller
 
				      */
			
 
				     public function upload(Request $request) {
			
 
				         \Log::info($request->all());
			
 
				+
			
 
				         $validator = Validator::make($request->all(),
			
 
				             [
			
 
				                 'tag'         => 'required|alpha_dash',
			
@@ -108,7 +109,7 @@ class AttachmentController extends Controller
 
				             'image/gif',
			
 
				             'video/mp4',
			
 
				         ]);
			
 
				-        //dd($result);
			
 
				+    //    print_r($result);
			
 
				         if (is_array($result)) {
			
 
				             return $this->api($result);
			
 
				         } elseif (is_string($result)) {
			
@@ -163,6 +164,4 @@ class AttachmentController extends Controller
 
				         return $this->api($result);
			
 
				     }
			
 
				 
			
 
				-
			
 
				-
			
 
				 }
			
--- a/app/Http/Controllers/Api/V1/Controller.php
+++ b/app/Http/Controllers/Api/V1/Controller.php
@@ -21,7 +21,7 @@ class Controller extends BaseController
 
				         $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'
			
 
				+                'get', 'area', 'get_province', 'get_city', 'get_county', 'test', 'indexMenu', 'userRelease', 'indexTag', 'indexMessage', 'indexGetMessage', 'getLandMark', 'getDetail', 'doLike', 'doComment'
			
 
				             ]
			
 
				         ]);
			
 
				 
			
--- a/app/Http/Controllers/Api/V1/LandMarkController.php
+++ b/app/Http/Controllers/Api/V1/LandMarkController.php
@@ -25,6 +25,7 @@ class LandMarkController extends BaseController
 
				     public function getLandMark()
			
 
				     {
			
 
				         $data = MapLandmarkModel::all();
			
 
				+
			
 
				         return $this->api($data);
			
 
				     }
			
 
				 
			
@@ -45,17 +46,20 @@ class LandMarkController extends BaseController
 
				 
			
 
				         $data = MapLandmarkModel::find($id);
			
 
				         $banner = MapBannerModel::where('mark_id',$id)->orderBy('sort','desc')->get();
			
 
				+        $img = Array();
			
 
				         foreach ($banner as $key=>$val){
			
 
				-            $data->banner[]=$val['image'];
			
 
				+            $img[]=$val['image'];
			
 
				         }
			
 
				+        $data->banner = $img;
			
 
				         $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;
			
 
				+            $val->imgs = explode(',',$val->img);
			
 
				         }
			
 
				         $data->message = $message;
			
 
				-
			
 
				+       // $c = explode(',',$message->img);
			
 
				         $like = MapLikeModel::where([['user_id',$userAuth->id],['mark_id',$id]])->first();
			
 
				         if($like){
			
 
				             $data->isLike=1;
			
@@ -98,7 +102,36 @@ class LandMarkController extends BaseController
 
				         if($res && $res_up){
			
 
				             return $this->success($state);
			
 
				         }else{
			
 
				-            dd(111);
			
 
				+            return $this->error(null, ErrorCode::SAVE_FALL);
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    public function doComment(Request $request)
			
 
				+    {
			
 
				+        $validator = Validator::make($request->all(), [
			
 
				+            'content' => 'required',
			
 
				+            'mark_id' => 'required'
			
 
				+        ], [
			
 
				+            'content.required' => '详情必填',
			
 
				+            'mark_id.required' => 'id必填'
			
 
				+        ]);
			
 
				+        $userAuth = Auth('api')->user();
			
 
				+        if(!$userAuth) return $this->error(null, ErrorCode::NO_AUTH);
			
 
				+        if($validator->fails()) {
			
 
				+            return $this->validateError($validator);
			
 
				+        }
			
 
				+
			
 
				+        $check_land = MapLandmarkModel::find($request->input('mark_id'));
			
 
				+        if(!$check_land) return $this->error(null, ErrorCode::CLIENT_WRONG_PARAMS);
			
 
				+
			
 
				+        $data = $request->all();
			
 
				+        $data['user_id'] = $userAuth->id;
			
 
				+      //  print_r($data);die;
			
 
				+        $res = MapMessageModel::create($data);
			
 
				+        if($res){
			
 
				+            return $this->success();
			
 
				+        }else{
			
 
				+            return $this->error(null, ErrorCode::SAVE_FALL);
			
 
				         }
			
 
				     }
			
 
				 }
			
--- a/app/Library/ErrorCode.php
+++ b/app/Library/ErrorCode.php
@@ -14,11 +14,13 @@ class ErrorCode
 
				     const VERIFY_CODE_SEND_FAIL = 3000;
			
 
				     const CLIENT_WRONG_PARAMS = 1000;
			
 
				     const NO_AUTH = 1001;
			
 
				+    const SAVE_FALL = 1002;
			
 
				     //错误常量枚举
			
 
				     private static $_msg = [
			
 
				         self::VERIFY_CODE_SEND_FAIL => '验证码发送失败',
			
 
				         self::CLIENT_WRONG_PARAMS => '传入参数不正确',
			
 
				         self::NO_AUTH => '用户未登录',
			
 
				+        self::SAVE_FALL => '数据保存失败',
			
 
				     ];
			
 
				 
			
 
				     public static function message($code) {
			
--- a/app/Models/MapMessageModel.php
+++ b/app/Models/MapMessageModel.php
@@ -33,7 +33,8 @@ class MapMessageModel extends BaseModel
 
				     protected $fillable = [
			
 
				                            'user_id',
			
 
				                            'content',
			
 
				-                           'mark_id'
			
 
				+                           'mark_id',
			
 
				+                            'img'
			
 
				                           ];
			
 
				 
			
 
				 }
			
--- a/app/Repositories/Map/Criteria/MarkWhere.php
+++ b/app/Repositories/Map/Criteria/MarkWhere.php
@@ -0,0 +1,45 @@
 
				+<?php
			
 
				+/**
			
 
				+ * Created by PhpStorm.
			
 
				+ * User: 思维定制
			
 
				+ * Date: 2018/10/28
			
 
				+ * Time: 13:46
			
 
				+ */
			
 
				+
			
 
				+namespace App\Repositories\Map\Criteria;
			
 
				+
			
 
				+
			
 
				+use App\Repositories\Base\Criteria;
			
 
				+
			
 
				+use App\Repositories\Contracts\RepositoryInterface as Repository;
			
 
				+
			
 
				+class MarkWhere 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']) && $this->search['keyword']) {
			
 
				+            $keyword = '%'.$this->search['keyword'].'%';
			
 
				+            $model = $model->where([['title','like',$keyword]]);
			
 
				+        }
			
 
				+
			
 
				+        return $model;
			
 
				+    }
			
 
				+
			
 
				+}
			
--- a/app/Repositories/Map/Criteria/MessageWhere.php
+++ b/app/Repositories/Map/Criteria/MessageWhere.php
@@ -0,0 +1,45 @@
 
				+<?php
			
 
				+/**
			
 
				+ * Created by PhpStorm.
			
 
				+ * User: 思维定制
			
 
				+ * Date: 2018/10/28
			
 
				+ * Time: 13:41
			
 
				+ */
			
 
				+
			
 
				+namespace App\Repositories\Map\Criteria;
			
 
				+
			
 
				+
			
 
				+use App\Repositories\Base\Criteria;
			
 
				+
			
 
				+use App\Repositories\Contracts\RepositoryInterface as Repository;
			
 
				+
			
 
				+class MessageWhere 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']) && $this->search['keyword']) {
			
 
				+            $keyword = '%'.$this->search['keyword'].'%';
			
 
				+            $model = $model->where([['title','like',$keyword]]);
			
 
				+        }
			
 
				+
			
 
				+        return $model;
			
 
				+    }
			
 
				+
			
 
				+}
			
--- a/app/Repositories/User/Criteria/MultiWhere.php
+++ b/app/Repositories/User/Criteria/MultiWhere.php
@@ -14,7 +14,7 @@ namespace App\Repositories\User\Criteria;
 
				 use App\Repositories\Base\Criteria;
			
 
				 use App\Repositories\Contracts\RepositoryInterface as Repository;
			
 
				 
			
 
				-class MultiWhere extends Criteria {
			
 
				+class UserWhere extends Criteria {
			
 
				 
			
 
				     private $search = [];
			
 
				 
			
@@ -35,9 +35,10 @@ class MultiWhere extends Criteria {
 
				     */
			
 
				     public function apply($model, Repository $repository)
			
 
				     {
			
 
				-          if(isset($this->search['deleted_at']) && $this->search['deleted_at']) {
			
 
				-                                    $model = $model->where('deleted_at',$this->search['deleted_at']);
			
 
				-                                 }
			
 
				+        if(isset($this->search['keyword']) && $this->search['keyword']) {
			
 
				+            $keyword = '%'.$this->search['keyword'].'%';
			
 
				+            $model = $model->where([['nickname','like',$keyword]]);
			
 
				+        }
			
 
				 
			
 
				          return $model;
			
 
				     }
			
--- a/app/Widget/Tools/ImgUpload.php
+++ b/app/Widget/Tools/ImgUpload.php
@@ -96,6 +96,152 @@ EOF;
 
				 
			
 
				     }
			
 
				 
			
 
				+    public function single2($folder, $id, $name="data", $file="", $option=[]){
			
 
				+        $folder = urlencode($folder);
			
 
				+        $imgHtml =  "";
			
 
				+        $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
			
 
				+        $option['watermark'] = isset($option['watermark']) ? $option['watermark'] : "";
			
 
				+        $option['sizex'] = isset($option['sizex']) ? $option['sizex'] : "";
			
 
				+        $option['sizey'] = isset($option['sizey']) ? $option['sizey'] : "";
			
 
				+        if(!$option['callback'] && !empty($file)) {  //$img错误！已改$file gq
			
 
				+            if(!is_array($file)){
			
 
				+                $img['url'] = $file;
			
 
				+                $img['alt'] = '';
			
 
				+            }else{
			
 
				+                $img = $file;
			
 
				+            }
			
 
				+            /*$imgHtml .=  " <li><em class=\"close\" onclick='$(this).parent().remove()'>×</em>
			
 
				+                    <img src=\"{$img}\" alt=\"{$img}\">
			
 
				+                    <p class=\"rate\" style=\"display: none;\"><span style=\"width: 100%;\"></span></p>
			
 
				+                    <p class=\"yes\" style=\"display: none;\"></p>
			
 
				+                    <p class=\"no\"></p>
			
 
				+                    <input type=\"hidden\" name=\"{$name}\" value=\"{$img}\">
			
 
				+                </li>";*/
			
 
				+
			
 
				+            $iconImage = in_array(fileExt($img['url']), ['jpg', 'png' , 'gif' , 'jpeg' , 'bmp']) ? " <div class='image'><img src=\"{$img['url']}\" alt= /></div>" : "<div class='icon'><i class='fa fa-file'></i></div>";
			
 
				+
			
 
				+            $imgHtml .="<li >
			
 
				+                    <div class=\"file\">
			
 
				+                        <span class=\"corner\"></span>
			
 
				+                        {$iconImage}
			
 
				+                        <div class=\"file-name\">
			
 
				+                            <p>{$img['alt']}</p>
			
 
				+                            <small></small>
			
 
				+                        </div>
			
 
				+                    </div>
			
 
				+                    <em class=\"close\" onclick=\"$(this).parent().remove()\" >×</em>
			
 
				+                    <input type=\"hidden\" name=\"data[{$name}]\" value=\"{$img['url']}\">
			
 
				+                    </li>";
			
 
				+        }
			
 
				+
			
 
				+        $html = <<<EOF
			
 
				+           <script type="text/javascript" src="/base/plugins/imguploader/uploader.js"></script>
			
 
				+            <div class="layout_upload">
			
 
				+                <ul class="ullit">
			
 
				+                    $imgHtml
			
 
				+                    <li>
			
 
				+                        <a class="layout_upload_but" id="$id">&nbsp;</a>
			
 
				+                    </li>
			
 
				+                    <div class="ov_h"></div>
			
 
				+                </ul>
			
 
				+            </div>
			
 
				+            <script type="text/javascript">
			
 
				+            /*
			
 
				+             UploaderPick:"#",                       //绑定按钮id
			
 
				+             UploaderUrl:"",                         //百度插件地址
			
 
				+             UploaderServer:"",                      //上传api
			
 
				+             UploaderMax:1                           //现在最大上传个数
			
 
				+             UploadHiddenField:""                    //隐藏域name
			
 
				+             */
			
 
				+            new upload({
			
 
				+                UploaderPick:"#$id",
			
 
				+                UploaderMax:0,
			
 
				+                UploadHiddenField:"data[$name]",
			
 
				+                UploaderServer:"/admin/Base/Attachment/webupload?elementid=&watermark={$option['watermark']}&sizex={$option['sizex']}&sizey={$option['sizey']}&folder=$folder&_time=" + Math.random(),
			
 
				+                UploaderSingle:true
			
 
				+            });
			
 
				+        </script>
			
 
				+EOF;
			
 
				+        return $html;
			
 
				+    }
			
 
				+
			
 
				+    public function multi2($folder, $id, $name="data[image]", $imgs=[], $option=[]){
			
 
				+        $folder = urlencode($folder);
			
 
				+
			
 
				+        $imgHtml =  "";
			
 
				+        $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
			
 
				+        $option['max'] = isset($option['max']) ? $option['max'] : 200;
			
 
				+        $option['max'] = $option['max']-count($imgs);
			
 
				+        $option['watermark'] = isset($option['watermark']) ? $option['watermark'] : "";
			
 
				+        $option['sizex'] = isset($option['sizex']) ? $option['sizex'] : "";
			
 
				+        $option['sizey'] = isset($option['sizey']) ? $option['sizey'] : "";
			
 
				+        $class = isset($option['class']) ? $option['class'] : "";
			
 
				+        if(!$option['callback'] && !empty($imgs)) {
			
 
				+            foreach($imgs as $key=>$val) {
			
 
				+                if(is_string($val)) {
			
 
				+                    $img['url'] = $val;
			
 
				+                    $img['alt'] = '';
			
 
				+                }else{
			
 
				+                    $img = $val;
			
 
				+                }
			
 
				+                /*$imgHtml .=  " <li><em class=\"close\" onclick='$(this).parent().remove()'>×</em>
			
 
				+                        <img src=\"{$img['url']}\" alt=\"{$img['alt']}\">
			
 
				+                        <p class=\"rate\" style=\"display: none;\"><span style=\"width: 100%;\"></span></p>
			
 
				+                        <p class=\"yes\" style=\"display: none;\"></p>
			
 
				+                        <p class=\"no\"></p>
			
 
				+                        <input type=\"hidden\" name=\"{$name}[alt][]\" value=\"{$img['alt']}\">
			
 
				+                        <input type=\"hidden\" name=\"{$name}[url][]\" value=\"{$img['url']}\">
			
 
				+                    </li>";*/
			
 
				+                //echo  in_array(fileExt($img['url']), ['jpg', 'png']) ? "<div class='icon'><i class='fa fa-file'></i></div>" :" <div class='image'><img src= alt= /></div>";
			
 
				+                $iconImage = in_array(fileExt($img['url']), ['jpg', 'png' , 'gif' , 'jpeg' , 'bmp']) ? " <div class='image'><img src=\"{$img['url']}\" alt= /></div>" : "<div class='icon'><i class='fa fa-file'></i></div>";
			
 
				+
			
 
				+                $imgHtml .="<li >
			
 
				+                        <div class=\"file\">
			
 
				+                            <span class=\"corner\"></span>
			
 
				+                            {$iconImage}
			
 
				+                            <div class=\"file-name\">
			
 
				+                                <p>{$img['alt']}</p>
			
 
				+                                <small></small>
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+                        <em class=\"close\" onclick=\"$(this).parent().remove()\" >×</em>
			
 
				+                        
			
 
				+                        <input type=\"hidden\" name=\"{$name}[url][]\" value=\"{$img['url']}\">
			
 
				+                        </li>";
			
 
				+            }
			
 
				+        }
			
 
				+
			
 
				+        $html = <<<EOF
			
 
				+           <script type="text/javascript" src="/base/plugins/imguploader/uploader.js"></script>
			
 
				+            <div class="layout_upload">
			
 
				+                <ul class="ullit">
			
 
				+                                    $imgHtml
			
 
				+
			
 
				+                    <li>
			
 
				+                        <a class="layout_upload_but" id="$id">&nbsp;</a>
			
 
				+                    </li>
			
 
				+                    <div class="ov_h"></div>
			
 
				+                </ul>
			
 
				+            </div>
			
 
				+            <script type="text/javascript">
			
 
				+            /*
			
 
				+             UploaderPick:"#",                       //绑定按钮id
			
 
				+             UploaderUrl:"",                         //百度插件地址
			
 
				+             UploaderServer:"",                      //上传api
			
 
				+             UploaderMax:5                           //现在最大上传个数
			
 
				+             UploadHiddenField:""                    //隐藏域name
			
 
				+             */
			
 
				+            new upload({
			
 
				+                UploaderPick:"#$id",
			
 
				+                UploaderMax:{$option['max']},
			
 
				+                UploaderServer:"/admin/Base/Attachment/webupload?elementid=&watermark={$option['watermark']}&sizex={$option['sizex']}&sizey={$option['sizey']}&folder=$folder&class=$class&_time=" + Math.random(),
			
 
				+                UploadHiddenField:"$name"
			
 
				+            });
			
 
				+        </script>
			
 
				+EOF;
			
 
				+        return $html;
			
 
				+    }
			
 
				+
			
 
				     /**
			
 
				      * 统一多张图片
			
 
				      * @param $folder
			
--- a/database/migrations/2018_10_28_025500_add_column_to_message.php
+++ b/database/migrations/2018_10_28_025500_add_column_to_message.php
@@ -0,0 +1,33 @@
 
				+<?php
			
 
				+
			
 
				+use Illuminate\Support\Facades\Schema;
			
 
				+use Illuminate\Database\Schema\Blueprint;
			
 
				+use Illuminate\Database\Migrations\Migration;
			
 
				+
			
 
				+class AddColumnToMessage extends Migration
			
 
				+{
			
 
				+    /**
			
 
				+     * Run the migrations.
			
 
				+     *
			
 
				+     * @return void
			
 
				+     */
			
 
				+    public function up()
			
 
				+    {
			
 
				+        Schema::table('map_message', function (Blueprint $table) {
			
 
				+            //
			
 
				+            $table->longText('img')->nullable()->comment('图片');
			
 
				+        });
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * Reverse the migrations.
			
 
				+     *
			
 
				+     * @return void
			
 
				+     */
			
 
				+    public function down()
			
 
				+    {
			
 
				+        Schema::table('map_message', function (Blueprint $table) {
			
 
				+            //
			
 
				+        });
			
 
				+    }
			
 
				+}
			
--- a/resources/views/admin/banner/check.blade.php
+++ b/resources/views/admin/banner/check.blade.php
@@ -1,86 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/banner/edit.blade.php
+++ b/resources/views/admin/banner/edit.blade.php
@@ -1,77 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/banner/index.blade.php
+++ b/resources/views/admin/banner/index.blade.php
@@ -1,101 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/banner/view.blade.php
+++ b/resources/views/admin/banner/view.blade.php
@@ -1,53 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/landmark/check.blade.php
+++ b/resources/views/admin/landmark/check.blade.php
@@ -1,90 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/landmark/edit.blade.php
+++ b/resources/views/admin/landmark/edit.blade.php
@@ -1,113 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/landmark/index.blade.php
+++ b/resources/views/admin/landmark/index.blade.php
@@ -1,105 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/landmark/view.blade.php
+++ b/resources/views/admin/landmark/view.blade.php
@@ -1,81 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/banner/check.blade.php
+++ b/resources/views/admin/map/banner/check.blade.php
@@ -1,86 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/banner/edit.blade.php
+++ b/resources/views/admin/map/banner/edit.blade.php
@@ -1,77 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/banner/index.blade.php
+++ b/resources/views/admin/map/banner/index.blade.php
@@ -1,101 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/banner/view.blade.php
+++ b/resources/views/admin/map/banner/view.blade.php
@@ -1,53 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/landmark/edit.blade.php
+++ b/resources/views/admin/map/landmark/edit.blade.php
@@ -70,16 +70,28 @@
 
				                      <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>
			
 
				+                                <div class="form-group">
			
 
				+
			
 
				+                                    <label class="control-label col-sm-3">地标详情</label>
			
 
				+
			
 
				+                                    <div class="col-sm-9">
			
 
				+                                        {!! ueditor('') !!}
			
 
				+
			
 
				+                                        <script id="container" name="data[content]"
			
 
				+                                                type="text/plain">{!! $data['content'] or '' !!}</script>
			
 
				+                                    </div>
			
 
				+
			
 
				+                                </div>
			
 
				+                                <div class="form-group">
			
 
				+
			
 
				+                                    <label class="control-label col-sm-3">详细地址</label>
			
 
				+
			
 
				+                                    <div class="col-sm-9">
			
 
				+                                        <input id="data_address" name="data[address]" class="form-control" value="{{ $data['address'] or ''}}" required="" aria-required="true"  placeholder="">
			
 
				+                                    </div>
			
 
				+
			
 
				+                                </div>
			
 
				                 <div class="form-group">
			
 
				                                     
			
 
				                  <label class="control-label col-sm-3">点赞</label>
			
@@ -89,10 +101,29 @@
 
				                     </div>
			
 
				                                 
			
 
				                 </div>
			
 
				-                                
			
 
				+
			
 
				+                <div class="form-group">
			
 
				+
			
 
				+                    <label class="control-label col-sm-3">封面图片(500*500)</label>
			
 
				+                    <div class="col-sm-9">
			
 
				+                        {!!  widget('Tools.ImgUpload')->single2('/upload/cover','cover',"cover",  isset($data['cover'])? $data['cover'] : '',array("sizex"=>500,"sizey"=>500)) !!}
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+
			
 
				+                <div class="form-group">
			
 
				+
			
 
				+                    <label class="control-label col-sm-3">地标轮播图(1920*1080)</label>
			
 
				+                    <div class="col-sm-9">
			
 
				+                        {{--{!!  widget('Tools.ImgUpload')->single2('/upload/attr','attr',"attr",  isset($data['attr'])? $data['attr'] : '',array("sizex"=>1920,"sizey"=>1080)) !!}--}}
			
 
				+                        {!!  widget('Tools.ImgUpload')->multi2('/upload/banner','banner',"data[banner]",  isset($data['banner'])? $data['banner'] : '',array("sizex"=>1920,"sizey"=>1080)) !!}
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+
			
 
				+
			
 
				                                 <div class="form-group">
			
 
				                                     <label class="control-label col-sm-3">&nbsp;</label>
			
 
				                                     <div class="col-sm-9">
			
 
				+                                        <input type="hidden" name="id" value="{{ $data['id'] or ''}}"/>
			
 
				                                         <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;">
			
--- a/resources/views/admin/map/landmark/index.blade.php
+++ b/resources/views/admin/map/landmark/index.blade.php
@@ -40,7 +40,7 @@
 
				             <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="content"> 地址 </th>
			
 
				             <th class="sorting" data-sort="like"> 点赞 </th>
			
 
				         						<th width="22%">相关操作</th>
			
 
				         					</tr>
			
@@ -54,7 +54,7 @@
 
				             <td>{{ $item->lng }}</td>
			
 
				             <td>{{ $item->title }}</td>
			
 
				             <td>{{ $item->subtitle }}</td>
			
 
				-            <td>{{ $item->content }}</td>
			
 
				+            <td>{{ $item->address }}</td>
			
 
				             <td>{{ $item->like }}</td>
			
 
				 								<td>
			
 
				 									<div class="btn-group">
			
--- a/resources/views/admin/map/landmark/view.blade.php
+++ b/resources/views/admin/map/landmark/view.blade.php
@@ -4,42 +4,6 @@
 
				 <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>
			
@@ -49,32 +13,12 @@
 
				                </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>
			
 
				+                   <h3 class="list-group-item-heading">封面图片</h3>
			
 
				                                                    
			
 
				-                   <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
			
 
				+                  <img width="100px" src="{{$data['cover'] or ''}}"/>
			
 
				                                                  
			
 
				                </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>
			
--- a/resources/views/admin/map/like/check.blade.php
+++ b/resources/views/admin/map/like/check.blade.php
@@ -1,86 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/like/edit.blade.php
+++ b/resources/views/admin/map/like/edit.blade.php
@@ -1,77 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/like/index.blade.php
+++ b/resources/views/admin/map/like/index.blade.php
@@ -1,101 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/like/view.blade.php
+++ b/resources/views/admin/map/like/view.blade.php
@@ -1,46 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/map/message/index.blade.php
+++ b/resources/views/admin/map/message/index.blade.php
@@ -13,7 +13,7 @@
 
				 				</div>
			
 
				 				<div class="ibox-content">
			
 
				 				    <div class="row">
			
 
				-				        <form method="GET" action="" accept-charset="UTF-8">
			
 
				+				       {{-- <form method="GET" action="" accept-charset="UTF-8">
			
 
				 
			
 
				 				        <div class="col-sm-4">
			
 
				 				            <div class="input-group">
			
@@ -23,12 +23,7 @@
 
				 								</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
			
 
				+				        </form>--}}
			
 
				 					</div>
			
 
				 					
			
 
				 					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
			
@@ -36,12 +31,8 @@
 
				     						<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 > 用户 </th>
			
 
				+            <th > 地标 </th>
			
 
				         						<th width="22%">相关操作</th>
			
 
				         					</tr>
			
 
				 						</thead>
			
@@ -50,12 +41,8 @@
 
				 							@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>{{ $item->user }}</td>
			
 
				+            <td>{{ $item->mark }}</td>
			
 
				 								<td>
			
 
				 									<div class="btn-group">
			
 
				 										<button data-toggle="dropdown"
			
@@ -66,10 +53,6 @@
 
				 										<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>
			
--- a/resources/views/admin/map/message/view.blade.php
+++ b/resources/views/admin/map/message/view.blade.php
@@ -5,53 +5,22 @@
 
				     <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>
			
 
				                <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['updated_at'] or ''}}</p>
			
 
				+
			
 
				+                   @foreach($img as $key=>$val)
			
 
				+                        <img width="100px" src="{{$val}}"/>
			
 
				+                   @endforeach
			
 
				                                                  
			
 
				                </div>
			
 
				         </div>
			
--- a/resources/views/admin/message/check.blade.php
+++ b/resources/views/admin/message/check.blade.php
@@ -1,90 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/message/edit.blade.php
+++ b/resources/views/admin/message/edit.blade.php
@@ -1,95 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/message/index.blade.php
+++ b/resources/views/admin/message/index.blade.php
@@ -1,105 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/message/view.blade.php
+++ b/resources/views/admin/message/view.blade.php
@@ -1,60 +0,0 @@
 
				-@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
			
--- a/resources/views/admin/messages/info/check.blade.php
+++ b/resources/views/admin/messages/info/check.blade.php
@@ -1,90 +0,0 @@
 
				-@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('Messages/Info/create'))
			
 
				-								<div class="col-sm-3 pull-right">
			
 
				-									<a href="{{ U('Messages/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 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="site_id"> 站点ID </th>
			
 
				-            <th class="sorting" data-sort="title"> 标题 </th>
			
 
				-            <th class="sorting" data-sort="user_id"> 发布人 </th>
			
 
				-            <th class="sorting" data-sort="price"> 金额 </th>
			
 
				-            <th class="sorting" data-sort="phone">  </th>
			
 
				-            <th class="sorting" data-sort="type"> 类型：0：免费；1：付费；2：收费 </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->site_id }}</td>
			
 
				-            <td>{{ $item->title }}</td>
			
 
				-            <td>{{ $item->user_id }}</td>
			
 
				-            <td>{{ $item->price }}</td>
			
 
				-            <td>{{ $item->phone }}</td>
			
 
				-            <td>{{ $item->type }}</td>
			
 
				-									<td>
			
 
				-										@if(role('Messages/Info/view'))
			
 
				-											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Messages/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</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
			
--- a/resources/views/admin/messages/info/edit.blade.php
+++ b/resources/views/admin/messages/info/edit.blade.php
@@ -1,146 +0,0 @@
 
				-@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('Messages/Info/index'))
			
 
				-				    <div class="row">
			
 
				-    					<div class="col-sm-3 pull-right">
			
 
				-    					   <a href="{{ U('Messages/Info/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_site_id" name="data[site_id]" class="form-control" value="{{ $data['site_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_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">
			
 
				-                     {!! editor('') !!}
			
 
				-
			
 
				-                     <script id="container" name="data[content]" type="text/plain">{!! $data['content'] or '' !!}</script>
			
 
				-
			
 
				-                    </div>
			
 
				-
			
 
				-                </div>
			
 
				-                <div class="form-group">
			
 
				-
			
 
				-                 <label class="control-label col-sm-3">发布人</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_price" name="data[price]" class="form-control" value="{{ $data['price'] 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_phone" name="data[phone]" class="form-control" value="{{ $data['phone'] 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">
			
 
				-                     {!! editor('') !!}
			
 
				-
			
 
				-                     <script id="container" name="data[comment]" type="text/plain">{!! $data['comment'] or '' !!}</script>
			
 
				-
			
 
				-                    </div>
			
 
				-
			
 
				-                </div>
			
 
				-                <div class="form-group">
			
 
				-
			
 
				-                 <label class="control-label col-sm-3">类型：0：免费；1：付费；2：收费</label>
			
 
				-
			
 
				-                   <div class="col-sm-9">
			
 
				-                     <input id="data_type" name="data[type]" class="form-control" value="{{ $data['type'] 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_sort" name="data[sort]" class="form-control" value="{{ $data['sort'] 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
			
--- a/resources/views/admin/messages/info/index.blade.php
+++ b/resources/views/admin/messages/info/index.blade.php
@@ -1,88 +0,0 @@
 
				-@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="ID/标题/电话"
			
 
				-                                           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>
			
 
				-
			
 
				-                    <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="title"> 标题</th>
			
 
				-                            <th class="sorting" data-sort="user_id">发布人ID</th>
			
 
				-                            <th class="sorting">发布人</th>
			
 
				-                            <th class="sorting" data-sort="price"> 金额</th>
			
 
				-                            <th class="sorting"> 完成度</th>
			
 
				-                            <th class="sorting" data-sort="phone">联系方式</th>
			
 
				-                            <th class="sorting" data-sort="type"> 类型</th>
			
 
				-                            <th width="22%">相关操作</th>
			
 
				-                        </tr>
			
 
				-                        </thead>
			
 
				-                        <tbody>
			
 
				-                        @if(isset($list))
			
 
				-                            @foreach($list as $key => $item)
			
 
				-                                <tr>
			
 
				-                                    <td>{{ $item->id }}</td>
			
 
				-                                    <td>{{ $item->title }}</td>
			
 
				-                                    <td>{{ $item->user_id }}</td>
			
 
				-                                    <td>{{ $item->user }}</td>
			
 
				-                                    <td>{{ $item->price }}</td>
			
 
				-                                    <td>{{ $item->state }}</td>
			
 
				-                                    <td>{{ $item->phone }}</td>
			
 
				-                                    <td>{{ $item->type }}</td>
			
 
				-                                    <td>
			
 
				-                                        @if(role('Messages/Info/view'))
			
 
				-                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Messages/Info/view',['id'=>$item->id])}}'});"
			
 
				-                                                    class="btn btn-primary ">查看内容
			
 
				-                                            </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
			
--- a/resources/views/admin/messages/info/view.blade.php
+++ b/resources/views/admin/messages/info/view.blade.php
@@ -1,34 +0,0 @@
 
				-@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">内容</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['comment'] or ''}}</p>
			
 
				-                                                 
			
 
				-               </div>
			
 
				-
			
 
				-            <div class="list-group-item">
			
 
				-
			
 
				-                <h3 class="list-group-item-heading">相关图片</h3>
			
 
				-                @if(isset($data['pic']) && !empty($data['pic']))
			
 
				-                    @foreach($data['pic'] as $item)
			
 
				-                        <img src="{{ $item }}" width="50"/>
			
 
				-                    @endforeach
			
 
				-                @endif
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</div>
			
 
				-@endsection
			
--- a/resources/views/admin/messages/tag/check.blade.php
+++ b/resources/views/admin/messages/tag/check.blade.php
@@ -1,88 +0,0 @@
 
				-@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('Messages/Tag/create'))
			
 
				-								<div class="col-sm-3 pull-right">
			
 
				-									<a href="{{ U('Messages/Tag/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="site_id"> 站点ID </th>
			
 
				-            <th class="sorting" data-sort="name"> 名称 </th>
			
 
				-            <th class="sorting" data-sort="sort"> 排序：越大越靠前 </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->site_id }}</td>
			
 
				-            <td>{{ $item->name }}</td>
			
 
				-            <td>{{ $item->sort }}</td>
			
 
				-            <td>{{ $item->created_at }}</td>
			
 
				-            <td>{{ $item->updated_at }}</td>
			
 
				-									<td>
			
 
				-										@if(role('Messages/Tag/view'))
			
 
				-											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Messages/Tag/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
			
 
				-										@endif
			
 
				-									</td>
			
 
				-								</tr>
			
 
				-								@endforeach
			
 
				-							@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
			
--- a/resources/views/admin/messages/tag/edit.blade.php
+++ b/resources/views/admin/messages/tag/edit.blade.php
@@ -1,77 +0,0 @@
 
				-@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('Messages/Tag/index'))
			
 
				-				    <div class="row">
			
 
				-    					<div class="col-sm-3 pull-right">
			
 
				-    					   <a href="{{ U('Messages/Tag/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_name" name="data[name]" class="form-control" value="{{ $data['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_sort" name="data[sort]" class="form-control" value="{{ $data['sort'] 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
			
--- a/resources/views/admin/messages/tag/index.blade.php
+++ b/resources/views/admin/messages/tag/index.blade.php
@@ -1,99 +0,0 @@
 
				-@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="ID/名称"
			
 
				-                                           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('Messages/Tag/create'))
			
 
				-                            <div class="col-sm-3 pull-right">
			
 
				-                                <a href="{{ U('Messages/Tag/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="name"> 名称</th>
			
 
				-                            <th class="sorting" data-sort="sort"> 排序：越大越靠前</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->name }}</td>
			
 
				-                                    <td>{{ $item->sort }}</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('Messages/Tag/update'))
			
 
				-                                                    <li><a href="{{ U('Messages/Tag/update',['id'=>$item->id])}}"
			
 
				-                                                           class="font-bold">修改</a></li>
			
 
				-                                                @endif
			
 
				-
			
 
				-
			
 
				-                                            </ul>
			
 
				-                                        </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>
			
 
				-@endsection
			
--- a/resources/views/admin/messages/tag/view.blade.php
+++ b/resources/views/admin/messages/tag/view.blade.php
@@ -1,48 +0,0 @@
 
				-@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['name'] or ''}}</p>
			
 
				-                                                 
			
 
				-               </div>                     
			
 
				-               <div class="list-group-item">
			
 
				-                                                  
			
 
				-                   <h3 class="list-group-item-heading">排序：越大越靠前</h3>
			
 
				-                                                   
			
 
				-                   <p class="list-group-item-text"> {{ $data['sort'] or ''}}</p>
			
 
				-                                                 
			
 
				-               </div>                     
			
 
				-
			
 
				-               <div class="list-group-item">
			
 
				-                                                  
			
 
				-                   <h3 class="list-group-item-heading">创建时间</h3>
			
 
				-                                                   
			
 
				-                   <p class="list-group-item-text"> {{ $data['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
			
--- a/resources/views/admin/payment/info/check.blade.php
+++ b/resources/views/admin/payment/info/check.blade.php
@@ -1,90 +0,0 @@
 
				-@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('Payment/Info/create'))
			
 
				-								<div class="col-sm-3 pull-right">
			
 
				-									<a href="{{ U('Payment/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 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="site_id"> 站点ID </th>
			
 
				-            <th class="sorting" data-sort="user_id"> 用户ID </th>
			
 
				-            <th class="sorting" data-sort="openid"> 用户openid </th>
			
 
				-            <th class="sorting" data-sort="out_trade_no"> 支付订单 </th>
			
 
				-            <th class="sorting" data-sort="price"> 支付金额 </th>
			
 
				-            <th class="sorting" data-sort="created_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->site_id }}</td>
			
 
				-            <td>{{ $item->user_id }}</td>
			
 
				-            <td>{{ $item->openid }}</td>
			
 
				-            <td>{{ $item->out_trade_no }}</td>
			
 
				-            <td>{{ $item->price }}</td>
			
 
				-            <td>{{ $item->created_at }}</td>
			
 
				-									<td>
			
 
				-										@if(role('Payment/Info/view'))
			
 
				-											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Payment/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
			
 
				-										@endif
			
 
				-									</td>
			
 
				-								</tr>
			
 
				-								@endforeach
			
 
				-							@endif
			
 
				-
			
 
				-							</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
			
--- a/resources/views/admin/payment/info/edit.blade.php
+++ b/resources/views/admin/payment/info/edit.blade.php
@@ -1,104 +0,0 @@
 
				-@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('Payment/Info/index'))
			
 
				-				    <div class="row">
			
 
				-    					<div class="col-sm-3 pull-right">
			
 
				-    					   <a href="{{ U('Payment/Info/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_site_id" name="data[site_id]" class="form-control" value="{{ $data['site_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_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">用户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_out_trade_no" name="data[out_trade_no]" class="form-control" value="{{ $data['out_trade_no'] 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_price" name="data[price]" class="form-control" value="{{ $data['price'] 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
			
--- a/resources/views/admin/payment/info/index.blade.php
+++ b/resources/views/admin/payment/info/index.blade.php
@@ -1,96 +0,0 @@
 
				-@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="ID/订单号"
			
 
				-                                           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>
			
 
				-
			
 
				-                    <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"> 来源用户</th>
			
 
				-                            <th class="sorting" data-sort="user_id"> 去向用户</th>
			
 
				-                            <th class="sorting" data-sort="openid"> 用户openid</th>
			
 
				-                            <th class="sorting" data-sort="out_trade_no"> 支付订单号</th>
			
 
				-                            <th class="sorting" data-sort="price"> 支付金额</th>
			
 
				-                            <th class="sorting" data-sort="type"> 支付类型</th>
			
 
				-                            <th class="sorting" data-sort="state"> 状态</th>
			
 
				-                            <th class="sorting" data-sort="created_at"> 创建时间</th>
			
 
				-                            <th width="15%">相关操作</th>
			
 
				-                        </tr>
			
 
				-                        </thead>
			
 
				-                        <tbody>
			
 
				-                        @if(isset($list))
			
 
				-                            @foreach($list as $key => $item)
			
 
				-                                <tr>
			
 
				-                                    <td>{{ $item->id }}</td>
			
 
				-                                    <td>{{ $item->user }}</td>
			
 
				-                                    <td>{{ $item->to_user_name }}</td>
			
 
				-                                    <td>{{ $item->openid }}</td>
			
 
				-                                    <td>{{ $item->out_trade_no }}</td>
			
 
				-                                    <td>{{ $item->price }}</td>
			
 
				-                                    <td>{{ $item->payment }}</td>
			
 
				-                                    <td>{{ $item->state }}</td>
			
 
				-                                    <td>{{ $item->created_at }}</td>
			
 
				-                                    <td>
			
 
				-                                        <div class="btn-group">
			
 
				-                                            @if($item->status == 0 && $item->type == 1)
			
 
				-                                                <div class="btn btn-sm btn-success btn-store"
			
 
				-                                                     onclick="window.open('/admin/Payment/Info/status?id={{$item->id}}&status=1','_self')">
			
 
				-                                                    通过
			
 
				-                                                </div>
			
 
				-                                                <div class="btn btn-sm btn-danger btn-store"
			
 
				-                                                     onclick="window.open('/admin/Payment/Info/status?id={{$item->id}}&status=2','_self')">
			
 
				-                                                    不通过
			
 
				-                                                </div>
			
 
				-                                            @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>
			
 
				-@endsection
			
--- a/resources/views/admin/payment/info/view.blade.php
+++ b/resources/views/admin/payment/info/view.blade.php
@@ -1,74 +0,0 @@
 
				-@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['site_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">用户openid</h3>
			
 
				-                                                   
			
 
				-                   <p class="list-group-item-text"> {{ $data['openid'] or ''}}</p>
			
 
				-                                                 
			
 
				-               </div>                     
			
 
				-               <div class="list-group-item">
			
 
				-                                                  
			
 
				-                   <h3 class="list-group-item-heading">支付订单</h3>
			
 
				-                                                   
			
 
				-                   <p class="list-group-item-text"> {{ $data['out_trade_no'] or ''}}</p>
			
 
				-                                                 
			
 
				-               </div>                     
			
 
				-               <div class="list-group-item">
			
 
				-                                                  
			
 
				-                   <h3 class="list-group-item-heading">支付金额</h3>
			
 
				-                                                   
			
 
				-                   <p class="list-group-item-text"> {{ $data['price'] or ''}}</p>
			
 
				-                                                 
			
 
				-               </div>                     
			
 
				-               <div class="list-group-item">
			
 
				-                                                  
			
 
				-                   <h3 class="list-group-item-heading"></h3>
			
 
				-                                                   
			
 
				-                   <p class="list-group-item-text"> {{ $data['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
			
--- a/resources/views/admin/user/info/index.blade.php
+++ b/resources/views/admin/user/info/index.blade.php
@@ -24,11 +24,6 @@
 
				     						</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">
			
@@ -38,11 +33,7 @@
 
				             <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>
			
@@ -52,35 +43,8 @@
 
				             <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">
			
 
				+            <td><img width="80" src="{{ $item->avatar }}"/></td>
			
 
				 
			
 
				-
			
 
				-											@if(role('User/Info/update'))
			
 
				-											<li><a href="{{ U('User/Info/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
			
 
				-											@endif
			
 
				-
			
 
				-											@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
			
 
				-
			
 
				-										</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
			
--- a/routes/api.php
+++ b/routes/api.php
@@ -29,6 +29,8 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
 
				     $api->get('/land-mark/get-detail', 'LandMarkController@getDetail');
			
 
				     $api->get('/land-mark/do-like', 'LandMarkController@doLike');
			
 
				     $api->post('/login', 'LoginController@login');
			
 
				+    $api->post('/attachment/upload', 'AttachmentController@upload');
			
 
				+    $api->post('/land-mark/do-comment', 'LandMarkController@doComment');