add

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

@@ -70,6 +70,9 @@ class InfoController extends Controller
      */
     private function _createSave(){
         $data = (array) request('data');
+        if (is_array($data['sign'])) {
+            $data['sign'] = join(',',$data['sign']);
+        }
         $pics = (array) request('pic');
         if (empty($pics)) {
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');

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

@@ -79,6 +79,7 @@ class InfoController extends Controller
                     'data.phone'  => 'required|unique:user_info,phone',
                     'data.sex'  => 'required',
                     'data.emotion'  => 'required',
+//                    'avatar' => 'dimensions:width=100,height=100'
                 ],
                 [
                     'data.address.required'  => '请选择省市区地址',

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

@@ -370,11 +370,11 @@ class DreamController extends Controller
         $dream = DreamInfoModel::find($dream_id);
         $user_id = $dream->user_id;
         $coin = $request->coin;
-        if ($dream->get_coin >= $dream->coin) {
+     /*   if ($dream->get_coin >= $dream->coin) {
             return $this->error(ErrorCode::SUP_TOP);
         } elseif($coin + $dream->get_coin > $dream->coin){
             $coin = $dream->coin - $dream->get_coin;
-        }
+        }*/
         $user_care_dream = UserCareDream::where('user_id', $user->id)->where('dream_id', $dream_id)->first();
         $is_collection = empty($user_care_dream) ? 0 :1 ;
         $setting = BaseSettingsModel::where('category','score')->select('key','value')->first();
@@ -395,7 +395,7 @@ class DreamController extends Controller
             $dream->mark += $coin*$number;
             $dream->save();
             //            梦想实现创建二维码
-            if ($dream->coin == $dream->get_coin) {
+            if ($dream->coin >= $dream->get_coin && empty($dream->code)) {
                 //        生成二维码
                 $info['transaction_id'] = date('YmdHis') . mt_rand(1000, 9999);
                 $info['code'] = 'WECHATPAY_' . $info['transaction_id'];

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

@@ -346,7 +346,7 @@ class IndexController extends Controller
     {
         $sex = $request->sex;
         $age = $request->age;
-        dd($age);
+//        dd($age);
         $area = $request->area;
         $login_user = $this->getUser();
         $id = $login_user->id;
@@ -362,7 +362,49 @@ class IndexController extends Controller
             });
         }
 
-        if ($age == 7) {
+        if (!empty($age)) {
+            $age_arr = explode(',',$age);
+            foreach ($age_arr as $value) {
+                switch ($value) {
+                    case 1:
+                        $query = $query->orWhereHas('user', function ($select) use ($age) {
+                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-21)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-18)));
+                        });
+                        break;
+                    case 2:
+                        $query = $query->orWhereHas('user', function ($select) use ($age) {
+                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-25)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-22)));
+                        });
+                        break;
+                    case 3:
+                        $query = $query->orWhereHas('user', function ($select) use ($age) {
+                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-29)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-26)));
+                        });
+                        break;
+                    case 4:
+                        $query = $query->orWhereHas('user', function ($select) use ($age) {
+                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-33)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-30)));
+                        });
+                        break;
+                    case 5:
+                        $query = $query->orWhereHas('user', function ($select) use ($age) {
+                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-37)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-34)));
+                        });
+                        break;
+                    case 6:
+                        $query = $query->orWhereHas('user', function ($select) use ($age) {
+                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-38)));
+                        });
+                        break;
+                    case 7:
+                        $query = $query->orWhereHas('user', function ($select) use ($age) {
+                            $select->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-18)));
+                        });
+                        break;
+                }
+            }
+        }
+       /* if ($age == 7) {
             $query = $query->whereHas('user', function ($select) use ($age) {
                 $select->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-18)));
             });
@@ -396,7 +438,7 @@ class IndexController extends Controller
             $query = $query->whereHas('user', function ($select) use ($age) {
                 $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-38)));
             });
-        }
+        }*/
 
         if (!empty($area)) {
             $query = $query->whereHas('user', function ($select) use ($area) {

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

@@ -68,7 +68,7 @@
                 </div>
                 <div class="form-group">
 
-                    <label class="control-label col-sm-3">梦想图片</label>
+                    <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 : "") !!}
@@ -155,7 +155,7 @@
                  <label class="control-label col-sm-3">梦想标签</label>
                                     
                    <div class="col-sm-9">
-                       <select name="data[sign]" id="data_sign" class="form-control">
+                       <select name="data[sign][]" id="data_sign" class="form-control" size=""  multiple="multiple">
                            @foreach($signs as $sign)
                                <option value="{{$sign->value}}" @if(isset($data['sign']) && $sign->value == $data['sign']) selected  @endif>{{$sign->value}}</option>
                            @endforeach

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

@@ -45,7 +45,7 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-sm-3">用户头像</label>
+                                    <label class="control-label col-sm-3">用户头像(200*200)</label>
                                     <div class="col-sm-9">
                                         {!!  widget('Tools.ImgUpload')->single2('/upload/user','avatar',"avatar", isset($data['avatar'])? $data['avatar'] : "") !!}
                                     </div>