后台修改

app/Http/Controllers/Admin/Product/CategoryController.php

@@ -30,7 +30,7 @@ class CategoryController extends Controller
         }else{
             $query = $query->pushCriteria(new OrderBy('id','DESC'));
         }
-        $list = $query->paginate();
+        $list = $query->paginate(10);
         return view('admin.product.category.index',compact('list'));
     }
 

app/Models/OrderInfoModel.php

@@ -48,4 +48,8 @@ class OrderInfoModel extends BaseModel
         'comment'
     ];
 
+  public function store(){
+      return (new StoreInfoModel())->find($this->store_id)->name;
+  }
+
 }

app/Models/ProductInfoModel.php

@@ -42,4 +42,8 @@ class ProductInfoModel extends BaseModel
         'current_price'
     ];
 
+    public function catename(){
+        return (new ProductCategoryModel())->find($this->category_id)->name;
+    }
+
 }

app/Models/StoreInfoModel.php

@@ -1,11 +1,14 @@
 <?php
+
 namespace App\Models;
+
 use App\Models\BaseModel;
+
 /**
- *  @description 店铺管理
- *  @author  system;
- *  @version    1.0
- *  @date 2018-07-12 09:43:54
+ * @description 店铺管理
+ * @author  system;
+ * @version    1.0
+ * @date 2018-07-12 09:43:54
  *
  */
 class StoreInfoModel extends BaseModel
@@ -18,7 +21,7 @@ class StoreInfoModel extends BaseModel
      */
     protected $table = 'store_info';
     /**
-    主键
+     * 主键
      */
     protected $primaryKey = 'id';
 
@@ -31,11 +34,12 @@ class StoreInfoModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-                           'name',
-                           'address',
-                           'phone',
-                           'lat',
-                           'lon'
-                          ];
+        'name',
+        'address',
+        'phone',
+        'lat',
+        'lon',
+        'img'
+    ];
 
 }

app/Repositories/Order/Criteria/MultiWhere.php

@@ -35,8 +35,11 @@ class MultiWhere extends Criteria {
     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-                                    $model = $model->where('updated_at',$this->search['updated_at']);
+          if(isset($this->search['keyword']) && $this->search['keyword']) {
+              $model = $model->where('out_trade_no','like','%'. $this->search['keyword'].'%')
+                  ->orWhere('username','like','%'. $this->search['keyword'].'%')
+                  ->orWhere('phone','like','%'. $this->search['keyword'].'%')
+                  ->orWhere('email','like','%'. $this->search['keyword'].'%');
                                  }
 
          return $model;

app/Repositories/Product/Criteria/MultiWhere.php

@@ -9,12 +9,11 @@
 namespace App\Repositories\Product\Criteria;
 
 
-
-
 use App\Repositories\Base\Criteria;
 use App\Repositories\Contracts\RepositoryInterface as Repository;
 
-class MultiWhere extends Criteria {
+class MultiWhere extends Criteria
+{
 
     private $search = [];
 
@@ -29,17 +28,17 @@ class MultiWhere extends Criteria {
     }
 
     /**
-    * @param $model
-    * @param RepositoryInterface $repository
-    * @return mixed
-    */
+     * @param $model
+     * @param RepositoryInterface $repository
+     * @return mixed
+     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-                                    $model = $model->where('updated_at',$this->search['updated_at']);
-                                 }
+        if (isset($this->search['keyword']) && $this->search['keyword']) {
+            $model = $model->where('name','like','%'. $this->search['keyword'] .'%');
+        }
 
-         return $model;
+        return $model;
     }
 
 }

app/Repositories/Store/Criteria/MultiWhere.php

@@ -9,12 +9,11 @@
 namespace App\Repositories\Store\Criteria;
 
 
-
-
 use App\Repositories\Base\Criteria;
 use App\Repositories\Contracts\RepositoryInterface as Repository;
 
-class MultiWhere extends Criteria {
+class MultiWhere extends Criteria
+{
 
     private $search = [];
 
@@ -29,17 +28,19 @@ class MultiWhere extends Criteria {
     }
 
     /**
-    * @param $model
-    * @param RepositoryInterface $repository
-    * @return mixed
-    */
+     * @param $model
+     * @param RepositoryInterface $repository
+     * @return mixed
+     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-                                    $model = $model->where('updated_at',$this->search['updated_at']);
-                                 }
+        if (isset($this->search['keyword']) && $this->search['keyword']) {
+            $model = $model->where('name','like','%'. $this->search['keyword'].'%')
+            ->orWhere('address','like','%'. $this->search['keyword'].'%')
+            ->orWhere('phone','like','%'. $this->search['keyword'].'%');
+        }
 
-         return $model;
+        return $model;
     }
 
 }

app/Widget/Tools/ImgUpload.php

@@ -41,7 +41,7 @@ class ImgUpload
                         </div>
                     </div>
                     <em class=\"close\" onclick=\"$(this).parent().remove()\" >×</em>
-                    <input type=\"hidden\" name=\"data[{$name}]\" value=\"{$img['url']}\">
+                    <input type=\"hidden\" name=\"{$name}\" value=\"{$img['url']}\">
                     </li>";
             }
         }

database/migrations/2018_07_13_024821_add_img_to_store_info_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddImgToStoreInfoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('store_info', function (Blueprint $table) {
+            $table->string('img',255)->after('name')->comment('店铺图片');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('store_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

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

@@ -1,105 +1,90 @@
-@extends('admin.layout') 
+@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="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5>订单列表</h5>
+                    <div class="ibox-tools">
+                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <form method="GET" action="" accept-charset="UTF-8">
 
-				        <div class="col-sm-4">
-				            <div class="input-group">
-								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
-								<span class="input-group-btn">
+                            <div class="col-sm-4">
+                                <div class="input-group">
+                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="请输入关键词"
+                                           name="keyword" class="input-sm form-control">
+                                    <span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
 								</span>
-    						</div>
-				        </div>
-				        </form>
-						@if(role('Order/Info/create'))
-    					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Order/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
-    					</div>
-						@endif
-					</div>
-					
-					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
-						<thead>
-    						<tr>
-								
-            <th class="sorting" data-sort="id"> ID </th>
-            <th class="sorting" data-sort="out_trade_no"> 订单编号 </th>
-            <th class="sorting" data-sort="username"> 用户姓名 </th>
-            <th class="sorting" data-sort="sex"> 性别：0：男；1：女 </th>
-            <th class="sorting" data-sort="phone"> 电话 </th>
-            <th class="sorting" data-sort="email"> 邮箱 </th>
-            <th class="sorting" data-sort="store_id"> 预约店铺 </th>
-        						<th width="22%">相关操作</th>
-        					</tr>
-						</thead>
-						<tbody>
-						@if(isset($list))
-							@foreach($list as $key => $item)							<tr>
-								
-            <td>{{ $item->id }}</td>
-            <td>{{ $item->out_trade_no }}</td>
-            <td>{{ $item->username }}</td>
-            <td>{{ $item->sex }}</td>
-            <td>{{ $item->phone }}</td>
-            <td>{{ $item->email }}</td>
-            <td>{{ $item->store_id }}</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">
+                                </div>
+                            </div>
+                        </form>
+                        @if(role('Order/Info/create'))
+                            <div class="col-sm-3 pull-right">
+                                <a href="{{ U('Order/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+                            </div>
+                        @endif
+                    </div>
 
+                    <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+                        <thead>
+                        <tr>
+                            <th class="sorting" data-sort="out_trade_no"> 订单编号</th>
+                            <th class="sorting" data-sort="username"> 用户姓名</th>
+                            <th class="sorting" data-sort="sex"> 性别 </th>
+                            <th class="sorting" data-sort="phone"> 电话</th>
+                            <th class="sorting" data-sort="email"> 邮箱</th>
+                            <th class="sorting" data-sort="store_id"> 预约店铺</th>
+                            <th class="sorting" data-sort="schedule_time"> 预约时间</th>
+                            <th width="22%">相关操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @if(isset($list))
+                            @foreach($list as $key => $item)
+                                <tr>
+                                    <td>{{ $item->out_trade_no }}</td>
+                                    <td>{{ $item->username }}</td>
+                                    <td>@if($item->sex == 1)女@else男@endif</td>
+                                    <td>{{ $item->phone }}</td>
+                                    <td>{{ $item->email }}</td>
+                                    <td>{{ $item->store() }}</td>
+                                    <td>{{ $item->schedule_time }}</td>
+                                    <td>
+                                        
+                                        @if(role('Order/Info/view'))
+                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Order/Info/view',['id'=>$item->id])}}'});"
+                                                    class="btn btn-primary ">查看
+                                            </button>
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endforeach
+                        @endif
 
-											@if(role('Order/Info/update'))
-											<li><a href="{{ U('Order/Info/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
-											@endif
-
-											@if(role('Order/Info/destroy'))
-											<li class="divider"></li>
-											<li><a href="{{ U('Order/Info/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
-											@endif
-
-										</ul>
-									</div>
-								@if(role('Order/Info/view'))
-										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Order/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>
+                        </tbody>
+                    </table>
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <div class="dataTables_info" id="DataTables_Table_0_info"
+                                 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}
+                                条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+                                {!! $list->setPath('')->appends(Request::all())->render() !!}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 @endsection

resources/views/admin/product/category/view.blade.php

@@ -23,23 +23,17 @@
                                                   
                    <h3 class="list-group-item-heading">封面图</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['img'] or ''}}</p>
+                   <p class="list-group-item-text"><img src="{{ $data['img'] or ''}}" style="height: 50px"> </p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
                    <h3 class="list-group-item-heading">产品详情</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['detail'] 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>
+                   <p class="list-group-item-text"> {!! $data['detail'] or '' !!} </p>
                                                  
                </div>                     
+
                <div class="list-group-item">
                                                   
                    <h3 class="list-group-item-heading">创建时间</h3>

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

@@ -81,8 +81,7 @@
 
                                     <div class="col-sm-9">
                                         <input id="data_current_price" name="data[current_price]" class="form-control"
-                                               value="{{ $data['current_price'] or ''}}" required=""
-                                               aria-required="true" placeholder="">
+                                               value="{{ $data['current_price'] or ''}}"  placeholder="">
                                     </div>
 
                                 </div>

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

@@ -52,7 +52,7 @@
 
                                     <td>{{ $item->id }}</td>
                                     <td>{{ $item->name }}</td>
-                                    <td>{{ $item->category_id }}</td>
+                                    <td>{{ $item->catename() }}</td>
                                     <td>{{ $item->origin_price }}</td>
                                     <td>{{ $item->current_price }}</td>
                                     <td>{{ $item->created_at }}</td>

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

@@ -24,12 +24,12 @@
                                                   
                    <h3 class="list-group-item-heading">所属产品</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['category_id'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data->catename() }}</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['origin_price'] or ''}}</p>
                                                  
@@ -41,13 +41,7 @@
                    <p class="list-group-item-text"> {{ $data['current_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>

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

@@ -2,103 +2,222 @@
 
 @section('content')
 
-<?php
-    if(!isset($data)) $data = array();
-    if(!$data && session("data")){
+    <?php
+    if (!isset($data)) $data = array();
+    if (!$data && session("data")) {
         $data = session("data");
     }
-    if(!$data && session('_old_input')){
+    if (!$data && session('_old_input')) {
         $data = session("_old_input");
     }
-?>
-	<div class="row">
-		<div class="col-sm-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<h5>店铺管理</h5>
-					<div class="ibox-tools">
-						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-						</a>
-					</div>
-				</div>
-				<div class="ibox-content">
+    ?>
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5>店铺管理</h5>
+                    <div class="ibox-tools">
+                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="ibox-content">
                     @if(role('Store/Info/index'))
-				    <div class="row">
-    					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Store/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
-    					</div>
-					</div>
+                        <div class="row">
+                            <div class="col-sm-3 pull-right">
+                                <a href="{{ U('Store/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+                            </div>
+                        </div>
                     @endif
 
-		            <div class="row">
+                    <div class="row">
                         <div class="col-lg-10">
-                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
-
-                                    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">店铺名称</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_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_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>
-                                    
-                   <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">
-                     <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_lon" name="data[lon]" class="form-control" value="{{ $data['lon'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>
-                                
+                            <form name="form_product" id="form-validation" action=""
+                                  class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">店铺名称</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="data_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">
+                                        {!!  widget('Tools.ImgUpload')->single('img',"data[img]", isset($data['img'])? $data['img'] : "") !!}
+
+                                    </div>
+
+                                </div>
+
+                                <!--引入高德地图API-->
+                                <script type="text/javascript"
+                                        src="https://webapi.amap.com/maps?v=1.3&key=533117702a063eae1dc26c183a1ac7bb&plugin=AMap.Autocomplete"></script>
+                                <script type="text/javascript"
+                                        src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">地址<span
+                                                style="color: red">*</span></label>
+
+                                    <div class="col-sm-9">
+                                        <input n name="data[address]" readonly="true"
+                                               class="form-control"
+                                               value="{{ $data['address'] or ''}}" id="add" data-toggle="modal"
+                                               data-target="#myModal">
+                                    </div>
+
+                                </div>
+
+                                <input type="hidden" name="lon" id="lon" value="{{$data['lon'] or ''}}">
+                                <input type="hidden" name="lat" id="lat" value="{{$data['lat'] or ''}}">
+
+                                <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">&nbsp;</label>
                                     <div class="col-sm-9">
-                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_referer"
+                                               value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
                                         <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
                                         <input type="submit" class="btn btn-success" style="margin-right:20px;">
-                                        <input type="reset" class="btn btn-default" >
+                                        <input type="reset" class="btn btn-default">
                                     </div>
                                 </div>
-        
+
                             </form>
                         </div>
                         <!-- /.col-lg-10 -->
                     </div>
                     <!-- /.row -->
-				</div>
-			</div>
-		</div>
-	</div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal fade" id="myModal" tabindex="-1" role="dialog"
+         aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog" style="min-width:60%;">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="myModalLabel">
+                        选择坐标
+                    </h4>
+                </div>
+                <div class="modal-body">
+                    <div id="container" style="width: 100%;min-height: 400px;"></div>
+                    <div id="myPageTop">
+                        <table>
+                            <tr>
+                                <td>
+                                    <label>按关键字搜索：</label>
+                                </td>
+                                <td>
+
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input style="margin-right: 10px;min-width:300px"
+                                           value="{{ isset($data['address'])?$data['address'] : "" }}" type="text"
+                                           placeholder="请输入关键字进行搜索" id="tipinput">
+                                </td>
+                                <td>
+                                    <div style="margin-right: 10px;" class="btn btn-sm btn-primary"
+                                         id="confirm">显示搜索点
+                                    </div>
+                                </td>
+                                <td class="column2">
+                                    <input type="hidden" readonly="true" id="lnglat">
+                                </td>
+                            </tr>
+                        </table>
+                        <br>
+                        <button type="button" id="modal-close" class="btn btn-sm btn-primary text-center"
+                                data-dismiss="modal">确认位置信息
+                        </button>
+                    </div>
+                    <div id="panel"></div>
+                </div>
+
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal -->
+    </div>
+    </div>
+
+
+    <script type="text/javascript">
+        var map = new AMap.Map("container", {
+            resizeEnable: true,
+            zoom: 10
+        });
+        $("#confirm").click(function () {
+            var val = $('#tipinput').val();
+            AMap.service(["AMap.PlaceSearch"], function () {
+                var placeSearch = new AMap.PlaceSearch({ //构造地点查询类
+                    pageSize: 5,
+                    pageIndex: 1,
+                    map: map,
+                    panel: "panel"
+                });
+                placeSearch.search(val);
+            });
+        });
+
+        //为地图注册click事件获取鼠标点击出的经纬度坐标
+        var clickEventListener = map.on('click', function (e) {
+            document.getElementById("lnglat").value = e.lnglat.getLng() + ',' + e.lnglat.getLat();
+        });
+
+        AMap.plugin('AMap.Geocoder', function () {
+            var geocoder = new AMap.Geocoder({});
+            var marker = new AMap.Marker({
+                map: map,
+                bubble: true
+            })
+            map.on('click', function (e) {
+                console.log(e);
+                marker.setPosition(e.lnglat);
+                $('#lon').val(e.lnglat.getLng());
+                $('#lat').val(e.lnglat.getLat());
+                geocoder.getAddress(e.lnglat, function (status, result) {
+                    if (status == 'complete') {
+                        console.log(result);
+                        document.getElementById('tipinput').value = result.regeocode.formattedAddress
+                    }
+                })
+            })
 
+        });
+        $("#modal-close").click(function () {
+            var b = ($('#tipinput').val());
+            console.log(b);
+            $('#map').val(b);
+            $('#add').val(b);
+        });
+        /*  $('.sg-datepicker').datepicker({
+              format: 'yyyy-mm-dd',
+              language: 'zh-CN'
+          });*/
+    </script>
 @endsection

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

@@ -1,105 +1,111 @@
-@extends('admin.layout') 
+@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="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5>店铺管理</h5>
+                    <div class="ibox-tools">
+                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <form method="GET" action="" accept-charset="UTF-8">
 
-				        <div class="col-sm-4">
-				            <div class="input-group">
-								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
-								<span class="input-group-btn">
+                            <div class="col-sm-4">
+                                <div class="input-group">
+                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="请输入关键词"
+                                           name="keyword" class="input-sm form-control">
+                                    <span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
 								</span>
-    						</div>
-				        </div>
-				        </form>
-						@if(role('Store/Info/create'))
-    					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Store/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
-    					</div>
-						@endif
-					</div>
-					
-					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
-						<thead>
-    						<tr>
-								
-            <th class="sorting" data-sort="id"> ID </th>
-            <th class="sorting" data-sort="name"> 店铺名称 </th>
-            <th class="sorting" data-sort="address"> 地址 </th>
-            <th class="sorting" data-sort="phone"> 电话 </th>
-            <th class="sorting" data-sort="lat"> 纬度 </th>
-            <th class="sorting" data-sort="lon"> 经度 </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>{{ $item->id }}</td>
-            <td>{{ $item->name }}</td>
-            <td>{{ $item->address }}</td>
-            <td>{{ $item->phone }}</td>
-            <td>{{ $item->lat }}</td>
-            <td>{{ $item->lon }}</td>
-            <td>{{ $item->created_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">
+                                </div>
+                            </div>
+                        </form>
+                        @if(role('Store/Info/create'))
+                            <div class="col-sm-3 pull-right">
+                                <a href="{{ U('Store/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+                            </div>
+                        @endif
+                    </div>
 
+                    <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+                        <thead>
+                        <tr>
 
-											@if(role('Store/Info/update'))
-											<li><a href="{{ U('Store/Info/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
-											@endif
+                            <th class="sorting" data-sort="id"> ID</th>
+                            <th class="sorting" data-sort="name"> 店铺名称</th>
+                            <th class="sorting" data-sort="name"> 店铺照片</th>
+                            <th class="sorting" data-sort="address"> 地址</th>
+                            <th class="sorting" data-sort="phone"> 电话</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>
 
-											@if(role('Store/Info/destroy'))
-											<li class="divider"></li>
-											<li><a href="{{ U('Store/Info/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
-											@endif
+                                    <td>{{ $item->id }}</td>
+                                    <td>{{ $item->name }}</td>
+                                    <td><img src="{{ $item->img }}" style="height: 50px"></td>
+                                    <td>{{ $item->address }}</td>
+                                    <td>{{ $item->phone }}</td>
+                                    <td>{{ $item->created_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">
 
-										</ul>
-									</div>
-								@if(role('Store/Info/view'))
-										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Store/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>
+                                                @if(role('Store/Info/update'))
+                                                    <li><a href="{{ U('Store/Info/update',['id'=>$item->id])}}"
+                                                           class="font-bold">修改</a></li>
+                                                @endif
+
+                                                @if(role('Store/Info/destroy'))
+                                                    <li class="divider"></li>
+                                                    <li><a href="{{ U('Store/Info/destroy',['id'=>$item->id])}}"
+                                                           onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+                                                @endif
+
+                                            </ul>
+                                        </div>
+                                        @if(role('Store/Info/view'))
+                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Store/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

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

@@ -1,74 +1,62 @@
 @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['address'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">电话</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['phone'] or ''}}</p>
-                                                 
-               </div>                     
-               <div 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['lon'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading"></h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">创建时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">更新时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
-                                                 
-               </div>
+    <div class="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"><img src="{{ $data['img'] or ''}}" style="height: 50px"></p>
+
+                </div>
+
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">地址</h3>
+
+                    <p class="list-group-item-text"> {{ $data['address'] or ''}}</p>
+
+                </div>
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">电话</h3>
+
+                    <p class="list-group-item-text"> {{ $data['phone'] 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>
-</div>
 @endsection