Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Admin/Dream/InfoController.php

@@ -1,13 +1,17 @@
 <?php
 /**
- *  dfghfdhfgfghfg
+ *  梦想列表
  *  @author  system
  *  @version    1.0
- *  @date 2017-06-01 05:20:51
+ *  @date 2017-06-28 14:50:22
  *
  */
 namespace App\Http\Controllers\Admin\Dream;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\BaseAttachmentModel;
+use App\Models\BaseSettingsModel;
+use App\Models\DreamImages;
+use App\Models\DreamInfoModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Dream\Criteria\MultiWhere;
@@ -54,7 +58,8 @@ class InfoController extends Controller
         if($reqeust->method() == 'POST') {
             return $this->_createSave();
         }
-        return view('admin.dream.info.edit');
+        $signs = BaseSettingsModel::where('category','sign')->orderBy('id')->get();
+        return view('admin.dream.info.edit',compact('signs'));
     }
 
     /**
@@ -62,8 +67,23 @@ class InfoController extends Controller
      */
     private function _createSave(){
         $data = (array) request('data');
-        $id = $this->repository->create($data);
+        $pics = (array) request('pic');
+        if (empty($pics)) {
+            $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
+            return $this->showWarning('请添加图片',$url);
+        }
+        $id = DreamInfoModel::insertGetId($data);
         if($id) {
+            $arr = [];
+            foreach ($pics['url'] as $pic) {
+                $arr[] = [
+                    'pic'=>$pic,
+                    'dream_id'=>$id,
+                    'created_at'=>date("Y-m-d H:i:s"),
+                    'updated_at'=>date("Y-m-d H:i:s"),
+                ];
+            }
+            DreamImages::insert($arr);
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
             $url[] = array('url'=>U( 'Dream/Info/create'),'title'=>'继续添加');
             $this->showMessage('添加成功',$url);
@@ -81,10 +101,18 @@ class InfoController extends Controller
      */
     public function update(Request $reqeust) {
         if($reqeust->method() == 'POST') {
+//            dd($reqeust->all());
             return $this->_updateSave();
         }
         $data = $this->repository->find($reqeust->get('id'));
-        return view('admin.dream.info.edit',compact('data'));
+        $imgs = $data->imgs;
+        $arr = [];
+        foreach ($imgs as $pic) {
+            $arr[] = $pic['pic'];
+        }
+        $data->imgs = $arr;
+        $signs = BaseSettingsModel::where('category','sign')->orderBy('id')->get();
+        return view('admin.dream.info.edit',compact('data','signs'));
     }
 
     /**
@@ -92,6 +120,37 @@ class InfoController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
+        $pics = (array) request('pic');
+        if (empty($pics)) {
+            $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
+            return $this->showWarning('请添加图片',$url);
+        }
+        $old_data_pics =  $this->repository->find(request('id'))->imgs->toArray();
+        $old_pics = array_column($old_data_pics,'pic');
+        $a = array_diff($pics['url'],$old_pics);
+        $b = array_diff($old_pics,$pics['url']);
+        if (!empty($a) || !empty($b)) {       //有图片变化执行
+            //        删除以前图片 重新插入
+            if (!empty($b)) {
+                foreach ($b as $old_pic){
+                    if (is_file('.'.$old_pic)) {
+                        unlink('.'.$old_pic);
+                    }
+                    BaseAttachmentModel::where('url',$old_pic)->delete();
+                    DreamImages::where('pic',$old_pic)->delete();
+                }
+            }
+            $arr = [];                         //插入新的图片
+            foreach ($a as $pic) {
+                $arr[] = [
+                    'pic'=>$pic,
+                    'dream_id'=>request('id'),
+                    'created_at'=>date('Y-m-d H:i:s'),
+                    'updated_at'=>date('Y-m-d H:i:s'),
+                ];
+            }
+            DreamImages::insert($arr);
+        }
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
@@ -128,6 +187,17 @@ class InfoController extends Controller
     public function destroy(Request $reqeust) {
         $bool = $this->repository->destroy($reqeust->get('id'));
         if($bool) {
+            $old_data_pics =  DreamInfoModel::find($reqeust->get('id'))->imgs->toArray();
+            $old_pics = array_column($old_data_pics,'pic');
+            if (!empty($old_pics)) {
+                foreach ($old_pics as $old_pic){
+                    if (is_file('.'.$old_pic)) {
+                        unlink('.'.$old_pic);
+                    }
+                    BaseAttachmentModel::where('url',$old_pic)->delete();
+                }
+            }
+            DreamImages::where('dream_id',$reqeust->get('id'))->delete();
             return  $this->showMessage('操作成功');
         }else{
             return  $this->showWarning("操作失败");

server/app/Http/Controllers/Admin/Settings/SettingsController.php

@@ -164,4 +164,83 @@ class SettingsController extends Controller
         $data = BaseSettingsModel::where('category','score')->first();
         return view('admin.settings.score.edit',compact('data'));
     }
+
+    public function sign(Request $request)
+    {
+        $search['keyword'] = $request->input('keyword');
+        $query = $this->repository->pushCriteria(new MultiWhere($search));
+        $request = $request->all();
+        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']));
+        }
+        $list = $query->paginate();
+        return view('admin.settings.sign.index',compact('list'));
+    }
+
+    public function signCreate(Request $reqeust)
+    {
+        if ($reqeust->method() == 'POST') {
+            return $this->sign_createSave();
+        }
+        return view('admin.settings.sign.edit');
+    }
+
+    /**
+     * 保存修改
+     */
+    private function sign_createSave(){
+        $data = (array) request('data');
+        $data['category'] = 'sign';
+        $data['key'] = '0';
+        $data['pid'] = '0';
+        $data['sort'] = 0;
+        $id = $this->repository->create($data);
+        if($id) {
+            $url[] = array('url'=>U( 'setting/sign/index'),'title'=>'返回列表');
+            $url[] = array('url'=>U( 'setting/sign/create'),'title'=>'继续添加');
+            $this->showMessage('添加成功',$url);
+        }else{
+            $url[] = array('url'=>U( 'setting/sign/index'),'title'=>'返回列表');
+            return $this->showWarning('添加失败',$url);
+        }
+    }
+
+    /**
+     *
+     * 修改
+     *
+     *
+     */
+    public function signUpdate(Request $reqeust) {
+        if($reqeust->method() == 'POST') {
+            return $this->sign_updateSave();
+        }
+        $data = $this->repository->find($reqeust->get('id'));
+        return view('admin.settings.sign.edit',compact('data'));
+    }
+
+    /**
+     * 保存修改
+     */
+    private function sign_updateSave() {
+        $data = (array) request('data');
+        $ok = $this->repository->update(request('id'),$data);
+        if($ok) {
+            $url[] = array('url'=>U( 'setting/sign/index'),'title'=>'返回列表');
+            return $this->showMessage('操作成功',urldecode(request('_referer')));
+        }else{
+            $url[] = array('url'=>U( 'setting/sign/index'),'title'=>'返回列表');
+            return $this->showWarning('操作失败',$url);
+        }
+    }
+
+    public function signDestroy(Request $request)
+    {
+        $bool = $this->repository->destroy($request->id);
+        if($bool) {
+            return  $this->showMessage('操作成功');
+        }else {
+            return $this->showWarning("操作失败");
+        }
+    }
 }

server/app/Http/Controllers/Api/V1/DreamController.php

@@ -419,24 +419,31 @@ class DreamController extends Controller
      * @apiParam {string}  keyword   关键字
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": {
-     *       "data": [
-     *           {
-     *              "dream": "haha",  梦想名
-     *               "user_pic": [
-     *               {
-     *                  "pic": "",   用户头像
-     *               }
-     *               ],
-     *              "dream_img": "",  梦想图片
-     *          }
-     *       ]
-     *   }
-     *}
+    {
+        "status": true,
+        "status_code": 0,
+        "message": "",
+        "data": [
+            {
+                "id": 5,
+                "user_id": 1,
+                "name": "梦想标题1",
+                "about": "梦想介绍",
+                "coin": 2500,
+                "time": 72000,
+                "get_coin": 0,
+                "mark": 0,
+                "status": 0,
+                "video": "url",
+                "score": 100079365,
+                "sign": "梦想达人",
+                "created_at": "2017-06-25 12:45:22",
+                "updated_at": "2017-06-28 15:50:41",
+                "user": {},
+                "imgs": []
+            },
+        ]
+    }
      * @apiErrorExample {json} Error-Response:
      * HTTP/1.1 400 Bad Request
      */
@@ -447,14 +454,10 @@ class DreamController extends Controller
             return $this->api('');
         }
         $keyword ='%'.$request->keyword.'%';
-        $data = DreamInfoModel::where('dream','like',$keyword)->
-        orWhere('sign','like',$keyword)->get();
-        foreach ($data as $k => $value) {
-            $value->user_pic = $value->dreamFindUser;
-            $value->dream_img = $value->dreamImgsFirst->pic;
-        }
+        $data = DreamInfoModel::where('name','like',$keyword)->
+        orWhere('sign','like',$keyword)->with('user','imgs')->get();
         $this->insertSearchTable($user->id,$request->keyword);
-        return $this->api(compact('data'));
+        return $this->api($data);
     }
 
     public function insertSearchTable($id,$keyword)

server/app/Http/Controllers/Api/V1/MyController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Models\BaseDictionaryOptionModel;
 use App\Models\BaseSettingsModel;
+use App\Models\DreamInfoModel;
+use App\Models\SearchInfoModel;
 use App\Models\SystemInfoModel;
 use App\Models\UserCareDream;
 use App\Models\UserInfoModel;
@@ -407,4 +409,67 @@ class MyController extends Controller
         return $this->api($data);
     }
 
+    /**
+     * @api {get}  /api/dream/search_collection 梦想搜索
+     * @apiDescription 梦想搜索
+     * @apiGroup My
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {string}  keyword   关键字
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+    {
+        "status": true,
+        "status_code": 0,
+        "message": "",
+        "data": [
+            {
+                "id": 5,
+                "user_id": 1,
+                "name": "梦想标题1",
+                "about": "梦想介绍",
+                "coin": 2500,
+                "time": 72000,
+                "get_coin": 0,
+                "mark": 0,
+                "status": 0,
+                "video": "url",
+                "score": 100079365,
+                "sign": "梦想达人",
+                "created_at": "2017-06-25 12:45:22",
+                "updated_at": "2017-06-28 15:50:41",
+                "user": {},
+                "imgs": []
+            },
+        ]
+    }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     */
+    public function searchCollection(Request $request)
+    {
+        $user = $this->getUser();
+        if (empty($request->keyword)) {
+            return $this->api('');
+        }
+        $keyword ='%'.$request->keyword.'%';
+        $data = DreamInfoModel::where('name','like',$keyword)->
+        orWhere('sign','like',$keyword)->with('user','imgs')->get();
+        $this->insertSearchTable($user->id,$request->keyword);
+        return $this->api(compact('data'));
+    }
+
+    public function insertSearchTable($id,$keyword)
+    {
+        $info = SearchInfoModel::where('user_id',$id)->
+        where('search',trim($keyword))->first();
+        if (count($info) == 0) {
+            SearchInfoModel::create(['user_id'=>$id,'search'=>trim($keyword),'times'=>1]);
+        }else{
+            $info->times += 1;
+            $info->save();
+        }
+
+    }
+
 }

server/app/Repositories/Dream/Criteria/MultiWhere.php

@@ -35,9 +35,15 @@ 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']) && ! empty($this->search['keyword'])) {
+            $keywords = '%' . $this->search['keyword'] . '%';
+            $model = $model->where(function ($query) use ($keywords) {
+                $query->where('id'  , 'like', $keywords)
+                    ->orwhere('user_id', 'like', $keywords)
+                    ->orwhere('name', 'like', $keywords);
+            });
+        }
 
          return $model;
     }

server/app/Repositories/Dream/InfoRepository.php

@@ -1,9 +1,9 @@
 <?php
 /**
- *   dfghfdhfgfghfg
+ *   梦想列表
  *  @author  system
  *  @version    1.0
- *  @date 2017-06-01 05:20:51
+ *  @date 2017-06-28 14:50:22
  *
  */
 namespace App\Repositories\Dream;

server/app/Repositories/Settings/Banner/Criteria/MultiWhere.php

@@ -33,15 +33,30 @@ class MultiWhere extends Criteria {
     */
     public function apply($model, Repository $repository)
     {
-        if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
-            $keywords = '%' . $this->search['keyword'] . '%';
-            $model = $model->where(function ($query) use ($keywords) {
-                $query->where('id'  , 'like', $keywords)
-                    ->where('category','banner')
-                    ->orwhere('sort', 'like', $keywords);
-            });
-        }else{
-            $model = $model->where('category','banner');
+        //有返回/banner/首次出现的位置 无返回false
+        $url =  strpos(url()->current(), '/banner/');
+        if ($url !== false) {
+            if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
+                $keywords = '%' . $this->search['keyword'] . '%';
+                $model = $model->where(function ($query) use ($keywords) {
+                    $query->where('id'  , 'like', $keywords)
+                        ->where('category','banner')
+                        ->orwhere('sort', 'like', $keywords);
+                });
+            }else{
+                $model = $model->where('category','banner');
+            }
+        }else{          //sign标签
+            if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
+                $keywords = '%' . $this->search['keyword'] . '%';
+                $model = $model->where(function ($query) use ($keywords) {
+                    $query->where('id'  , 'like', $keywords)
+                        ->where('category','sign')
+                        ->orwhere('value', 'like', $keywords);
+                });
+            }else{
+                $model = $model->where('category','sign');
+            }
         }
         return $model;
     }

server/resources/views/admin/dream/info/check.blade.php

@@ -6,7 +6,7 @@
 			<div class="col-sm-12">
 				<div class="ibox float-e-margins">
 					<div class="ibox-title">
-						<h5>dfghfdhfgfghfg</h5>
+						<h5>梦想列表</h5>
 						<div class="ibox-tools">
 							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 							</a>
@@ -38,12 +38,12 @@
 								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
 								
             <th class="sorting" data-sort="id"> id </th>
-            <th class="sorting" data-sort="dream"> 梦想名称 </th>
-            <th class="sorting" data-sort="money"> 所需梦想币 </th>
+            <th class="sorting" data-sort="user_id"> 用户ID </th>
+            <th class="sorting" data-sort="name"> 梦想名称 </th>
+            <th class="sorting" data-sort="coin"> 所需梦想币 </th>
             <th class="sorting" data-sort="time"> 梦想倒计时 </th>
-            <th class="sorting" data-sort="get_money"> 获得梦想币 </th>
+            <th class="sorting" data-sort="get_coin"> 获得梦想币 </th>
             <th class="sorting" data-sort="mark"> 梦想分 </th>
-            <th class="sorting" data-sort="status"> 梦想状态 </th>
 								<th width="22%">相关操作</th>
 							</tr>
 							</thead>
@@ -54,12 +54,12 @@
 									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
 									
             <td>{{ $item->id }}</td>
-            <td>{{ $item->dream }}</td>
-            <td>{{ $item->money }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->name }}</td>
+            <td>{{ $item->coin }}</td>
             <td>{{ $item->time }}</td>
-            <td>{{ $item->get_money }}</td>
+            <td>{{ $item->get_coin }}</td>
             <td>{{ $item->mark }}</td>
-            <td>{{ $item->status }}</td>
 									<td>
 										@if(role('Dream/Info/view'))
 											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Dream/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>

server/resources/views/admin/dream/info/edit.blade.php

@@ -16,7 +16,7 @@
 		<div class="col-sm-12">
 			<div class="ibox float-e-margins">
 				<div class="ibox-title">
-					<h5>dfghfdhfgfghfg</h5>
+					<h5>梦想列表</h5>
 					<div class="ibox-tools">
 						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 						</a>
@@ -36,12 +36,21 @@
                             <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_dream" name="data[dream]" class="form-control" value="{{ $data['dream'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_name" name="data[name]" class="form-control" value="{{ $data['name'] or ''}}" required="" aria-required="true"  placeholder=""> 
                     </div>
                                 
                 </div>    
@@ -56,13 +65,22 @@
                                             
                     </div>
                                 
-                </div>    
+                </div>
+                <div class="form-group">
+
+                    <label class="control-label col-sm-3">梦想图片</label>
+
+                    <div class="col-sm-9">
+                        {!!  widget('Tools.ImgUpload')->multi2('/upload/dream','pic',"pic", isset($data->imgs) ? $data->imgs : "") !!}
+                    </div>
+
+                </div>
                 <div class="form-group">
                                     
                  <label class="control-label col-sm-3">所需梦想币</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_money" name="data[money]" class="form-control" value="{{ $data['money'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_coin" name="data[coin]" class="form-control" value="{{ $data['coin'] or ''}}" required="" aria-required="true"  placeholder=""> 
                     </div>
                                 
                 </div>    
@@ -80,7 +98,7 @@
                  <label class="control-label col-sm-3">获得梦想币</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_get_money" name="data[get_money]" class="form-control" value="{{ $data['get_money'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_get_coin" name="data[get_coin]" class="form-control" value="{{ $data['get_coin'] or ''}}" required="" aria-required="true"  placeholder=""> 
                     </div>
                                 
                 </div>    
@@ -101,6 +119,37 @@
                      <input id="data_status" name="data[status]" class="form-control" value="{{ $data['status'] 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_video" name="data[video]" class="form-control" value="{{ $data['video'] 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_score" name="data[score]" class="form-control" value="{{ $data['score'] 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">
+                       <select name="data[sign]" id="data_sign" class="form-control">
+                           @foreach($signs as $sign)
+                               <option value="{{$sign->value}}" @if(isset($data['sign']) && $sign->value == $data['sign']) selected  @endif>{{$sign->value}}</option>
+                           @endforeach
+                       </select>
+                    </div>
+                                
                 </div>
                                 
                                 <div class="form-group">

server/resources/views/admin/dream/info/index.blade.php

@@ -6,7 +6,7 @@
 		<div class="col-sm-12">
 			<div class="ibox float-e-margins">
 				<div class="ibox-title">
-					<h5>dfghfdhfgfghfg</h5>
+					<h5>梦想列表</h5>
 					<div class="ibox-tools">
 						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 						</a>
@@ -18,7 +18,7 @@
 
 				        <div class="col-sm-4">
 				            <div class="input-group">
-								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="id/用户id/梦想名称" name="keyword"class="input-sm form-control">
 								<span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
 								</span>
@@ -37,12 +37,13 @@
     						<tr>
 								
             <th class="sorting" data-sort="id"> id </th>
-            <th class="sorting" data-sort="dream"> 梦想名称 </th>
-            <th class="sorting" data-sort="money"> 所需梦想币 </th>
+            <th class="sorting" data-sort="user_id"> 用户ID </th>
+            <th class="sorting" data-sort="name"> 梦想名称 </th>
+            <th class="sorting" data-sort="coin"> 所需梦想币 </th>
             <th class="sorting" data-sort="time"> 梦想倒计时 </th>
-            <th class="sorting" data-sort="get_money"> 获得梦想币 </th>
+            <th class="sorting" data-sort="get_coin"> 获得梦想币 </th>
             <th class="sorting" data-sort="mark"> 梦想分 </th>
-            <th class="sorting" data-sort="status"> 梦想状态 </th>
+            <th class="sorting" data-sort="sign"> 梦想标签 </th>
         						<th width="22%">相关操作</th>
         					</tr>
 						</thead>
@@ -51,12 +52,13 @@
 							@foreach($list as $key => $item)							<tr>
 								
             <td>{{ $item->id }}</td>
-            <td>{{ $item->dream }}</td>
-            <td>{{ $item->money }}</td>
+            <td>{{ $item->user_id }}</td>
+            <td>{{ $item->name }}</td>
+            <td>{{ $item->coin }}</td>
             <td>{{ $item->time }}</td>
-            <td>{{ $item->get_money }}</td>
+            <td>{{ $item->get_coin }}</td>
             <td>{{ $item->mark }}</td>
-            <td>{{ $item->status }}</td>
+            <td>{{ $item->sign }}</td>
 								<td>
 									<div class="btn-group">
 										<button data-toggle="dropdown"
@@ -79,8 +81,9 @@
 										</ul>
 									</div>
 								@if(role('Dream/Info/view'))
-										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Dream/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Dream/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看更多</button>
 									@endif
+									<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Dream/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看动态</button>
 								</td>
 							</tr>
 							@endforeach

server/resources/views/admin/dream/info/view.blade.php

@@ -11,12 +11,19 @@
                                                    
                    <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['dream'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['name'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
@@ -30,7 +37,7 @@
                                                   
                    <h3 class="list-group-item-heading">所需梦想币</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['money'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['coin'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
@@ -44,7 +51,7 @@
                                                   
                    <h3 class="list-group-item-heading">获得梦想币</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['get_money'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['get_coin'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
@@ -60,6 +67,27 @@
                                                    
                    <p class="list-group-item-text"> {{ $data['status'] or ''}}</p>
                                                  
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">梦想视频地址</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['video'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">梦想排行分数</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['score'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">梦想标签</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['sign'] or ''}}</p>
+                                                 
                </div>                     
                <div class="list-group-item">
                                                   

server/resources/views/admin/settings/sign/check.blade.php

@@ -0,0 +1,92 @@
+@extends('admin.layout')
+
+@section('content')
+	<div class="wrapper wrapper-content animated fadeInRight">
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>配置列表</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="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('Base/Settings/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('Base/Settings/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">  </th>
+            <th class="sorting" data-sort="key"> 配置代码 </th>
+            <th class="sorting" data-sort="value"> 配置名称 </th>
+            <th class="sorting" data-sort="sort"> 排序 </th>
+            <th class="sorting" data-sort="category"> 配置类型 </th>
+            <th class="sorting" data-sort="pid"> 父id </th>
+            <th class="sorting" data-sort="status"> 图片状态 </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->key }}</td>
+            <td>{{ $item->value }}</td>
+            <td>{{ $item->sort }}</td>
+            <td>{{ $item->category }}</td>
+            <td>{{ $item->pid }}</td>
+            <td>{{ $item->status }}</td>
+									<td>
+										@if(role('Base/Settings/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Base/Settings/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>
+	</div>
+	@include('admin.tools.check_script');
+
+@endsection

server/resources/views/admin/settings/sign/edit.blade.php

@@ -0,0 +1,78 @@
+@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="wrapper wrapper-content animated fadeInRight">
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>配置列表</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('setting/sign/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+
+		            <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_value" name="data[value]" class="form-control" value="{{ $data['value'] 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 type="radio" name="data[status]" value="1" @if(!isset($data['status']) || $data['status'] == "1")checked="checked" @endif>启用
+                           &nbsp; &nbsp; &nbsp;
+                           <input type="radio" name="data[status]" value="0" @if(isset($data['status']) && $data['status'] == "0")checked="checked" @endif>禁用
+                    </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>
+</div>
+
+@endsection

server/resources/views/admin/settings/sign/index.blade.php

@@ -0,0 +1,89 @@
+@extends('admin.layout') 
+
+@section('content')
+<div class="wrapper wrapper-content animated fadeInRight">
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>标签列表</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="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 class="col-sm-3 pull-right">
+    					   <a href="{{ U('setting/sign/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+					</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="value"> 标签名 </th>
+            <th class="sorting" data-sort="status"> 状态 </th>
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)							<tr>
+								
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->value }}</td>
+			<td>{{ $item->status == '0' ? '禁用':'启用' }}</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">
+
+
+											<li><a href="{{ U('setting/sign/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+
+											<li class="divider"></li>
+											<li><a href="{{ U('setting/sign/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+
+										</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>
+</div>
+@endsection

server/routes/admin.php

@@ -25,6 +25,11 @@ Route::group(['middleware' => ['auth.admin']], function() {
     Route::any('setting/banner/update', 'Settings\SettingsController@bannerUpdate');
     Route::get('setting/banner/destroy', 'Settings\SettingsController@bannerDestroy');
     Route::get('setting/banner/view', 'Settings\SettingsController@bannerView');
+    Route::get('setting/sign/index', 'Settings\SettingsController@sign');
+    Route::any('setting/sign/create', 'Settings\SettingsController@signCreate');
+    Route::any('setting/sign/update', 'Settings\SettingsController@signUpdate');
+    Route::get('setting/sign/destroy', 'Settings\SettingsController@signDestroy');
+    Route::get('setting/sign/view', 'Settings\SettingsController@signView');
     Route::any('setting/paihang/edit', 'Settings\SettingsController@paihangEdit');
     Route::any('setting/score/edit', 'Settings\SettingsController@scoreEdit');
 

server/routes/api.php

@@ -141,6 +141,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'my.collection',
         'uses' => 'MyController@collection',
     ]);
+    $api->get('my/search_collection', [
+        'as' => 'my.search_collection',
+        'uses' => 'MyController@searchCollection',
+    ]);
     $api->get('my/setting', [
         'as' => 'my.setting',
         'uses' => 'MyController@setting',