gq 7 years ago
parent
commit
6f03f8eb62

+ 3 - 3
server/app/Console/Commands/DreamDJS.php

xqd xqd
@@ -49,7 +49,7 @@ class DreamDJS extends Command
     public function handle()
     {
         //执行逻辑
-        Log::info('------------通知消息begin-----------');
+        Log::info('------------定时任务begin-----------');
         $end_dream_info = DreamInfoModel::with('user')->where('end_time','<',date('Y-m-d H:i:s'))->get();
         if (count($end_dream_info)>0) {
             foreach ($end_dream_info as $item){
@@ -149,9 +149,9 @@ class DreamDJS extends Command
         if (count($dreams) > 0) {
             foreach ($dreams as $item) {
                 if (date('Y-m-d',strtotime($item->end_time)) == date('Y-m-d',time()+1*24*3600)) {
-                    $message = $item->name.'过1天就要结束啦!';
+                    $message = "《".$item->name.'过1天就要结束啦!';
                 }elseif(date('Y-m-d H:i',strtotime($item->end_time)) == date('Y-m-d H:i',time()+3600)){
-                    $message = $item->name.'过1小时就要结束啦!';
+                    $message = "《".$item->name.'过1小时就要结束啦!';
                 }else{
                     $message = '';
                 }

+ 3 - 1
server/app/Http/Controllers/Api/V1/MyController.php

xqd
@@ -1459,8 +1459,10 @@ class MyController extends Controller
 //            同意见面
             $dream->is_ok = 1;
             $dream->save();
-            $message = "你支持的梦想者已经同意见面啦";
+            $message = "你支持的《".$dream->name."》梦想者已经同意见面啦";
         }else{
+            $dream->is_ok = 0;
+            $dream->save();
             $message = "你支持的梦想者拒绝了本次见面,你支持的梦想资金将会退还给您";
 //            退款逻辑
         }

+ 16 - 0
server/resources/views/admin/dream/info/edit.blade.php

xqd
@@ -149,6 +149,22 @@
                         @endforeach
                     </div>
 
+                </div>
+                <div class="form-group">
+                    <label class="control-label col-sm-3">见面情况</label>
+
+                    <div class="col-sm-9">
+                        <label class="radio-inline">
+                            <input type="radio" name="data[is_ok]" value="" />待定
+                        </label>
+                        <label class="radio-inline">
+                                <input type="radio" name="data[is_ok]" value="1" @if(isset($data['is_ok']) && $data['is_ok'] == 1)checked="checked" @endif/>同意
+                            </label>
+                        <label class="radio-inline">
+                                <input type="radio" name="data[is_ok]" value="0" @if(isset($data['is_ok']) && $data['is_ok'] === 0)checked="checked" @endif/>拒绝
+                            </label>
+                    </div>
+
                 </div>
                 <div class="form-group">
                                     

+ 1 - 1
server/resources/views/admin/share1.blade.php

xqd
@@ -295,7 +295,7 @@
                 <div class="swiper-wrapper">
                     @if($dream['video'])
                         <div class="swiper-slide" style="width: 320px;height: 200px;">
-                            <video style="width: 100%;height:200px;" src="{{$dream['video']}}" controls >
+                            <video style="width: 100%;height:200px;" src="{{(mb_substr( $dream['video'], 0, 4 )=='http') ? $dream['video']:env('APP_URL').'/attachment/'.$dream['video']}}" controls >
                             </video>
                         </div>
                     @endif