gq 7 년 전
부모
커밋
3d422d1058

+ 5 - 3
server/app/Http/Controllers/Api/V1/DreamController.php

xqd
@@ -222,9 +222,11 @@ class DreamController extends Controller
         arsort($top);
         foreach ($top as $user_id => $score){
             $user = UserInfoModel::find($user_id);
-            $user->score = $score;
-            $topuser[] = $user;
-            if(count($top3user) <= 2) $top3user[] = $user ;
+            if (!empty($user)) {
+                $user->score = $score;
+                $topuser[] = $user;
+                if(count($top3user) <= 2) $top3user[] = $user ;
+            }
         }
         if ($type == 'paihang') return $this->api($topuser);
         $interactions = InteractionInfo::where('dream_id',$id)->with(['comments' => function ($query) {

+ 2 - 0
server/app/Http/Controllers/Api/V1/MyController.php

xqd xqd
@@ -20,6 +20,7 @@ use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
 use App\Helper\JpushHelper;
+use Illuminate\Support\Facades\Log;
 
 class MyController extends Controller
 {
@@ -1404,6 +1405,7 @@ class MyController extends Controller
             $message = "你支持的梦想者拒绝了本次见面,你支持的梦想资金将会退还给您";
 //            退款逻辑
         }
+        Log::inf('is_max:'.$top_user);
         if (empty($top)) {
 //                给最大支持者发送消息
             $arr = [

+ 25 - 10
server/resources/views/admin/dream/info/edit.blade.php

xqd xqd
@@ -33,7 +33,7 @@
 
 		            <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">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" enctype="multipart/form-data" accept-charset="UTF-8" method="post">
 
                                     
                 <div class="form-group">
@@ -123,15 +123,30 @@
                     </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 ''}}" aria-required="true"  placeholder="">
-                    </div>
-                                
-                </div>    
+                <div  id="is_video" style="display: none">
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3" >视频(mp4格式,200MB内)</label>
+                                        <input type="file" name="file" >
+                                    </div>
+                                    <div class="form-group" @if(is_numeric($data))
+                                    style="display: none"
+                                            @endif>
+                                        <label class="control-label col-sm-3" >&nbsp;</label>
+                                        <div class="col-sm-9" style="width: 50%;height: 50%">
+                                            <video style="width: 300px" src="{{ $data['video'] or ''}}" controls >
+                                            </video>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">视频封面图</label>
+                                        <div class="col-sm-9">
+                                            {!! widget('Tools.ImgUpload')->single2('/upload/article/poster',"poster","poster",isset($data['poster']) && $data['is_video'] == 1 ? $data['poster']:'')!!}
+                                            @if(isset($data['poster']))
+                                                <input id="" name="data[poster]" class="form-control" value="{{ $data['poster'] or ''}}" required="" aria-required="true"  placeholder="">
+                                            @endif
+                                        </div>
+                                    </div>
+                        </div>
                 <div class="form-group">
                                     
                  <label class="control-label col-sm-3">排行参数</label>