Merge branch 'master' of http://git.9026.com/richod/dcj

app/Http/Controllers/Admin/Medical/OrderController.php

@@ -196,7 +196,7 @@ class OrderController extends Controller
         $msg = '【精准医疗】您的资料已处理';
 
         $result = $this->sendSms($msg, $phone);
-        dd($result);
+      //  dd($result);
 //        \Log::info($msg . " res:" . $result);
     }
     public function sendSms($msg, $mobile) {

resources/views/admin/medical/order/view.blade.php

@@ -16,10 +16,12 @@
                    <h3 class="list-group-item-heading">套餐</h3>
                                                    
                    {{--<p class="list-group-item-text"> {{ $data['combo'] or ''}}</p>--}}
+                   @if(!empty($data['combo'])&&isset($data['combo']))
                    @foreach($data['combo'] as $combo)
                        <h4>{{$combo->name}}</h4>
                        <div>{{htmlspecialchars_decode($combo->content)}}</div>
                    @endforeach
+                   @endif
                </div>                     
                <div class="list-group-item">