支付

app/Http/Controllers/Admin/OrderController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\FormData;
 use App\Models\Order;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
@@ -70,7 +71,8 @@ class OrderController extends Controller
             return $this->showWarning('找不到订单');
         }
         list($pre_uri, $model, $model_name) = array($this->pre_uri, $this->model, $this->model_name);
-        return view($this->view_path . 'show', compact('item','pre_uri', 'model', 'model_name'));
+        $form_data = FormData::find($item->form_data_id);
+        return view($this->view_path . 'show', compact('item','pre_uri', 'model', 'model_name', 'form_data'));
     }
 
     public function showRemarkForm(Request $request)

app/Models/Order.php

@@ -72,4 +72,9 @@ class Order extends Model
     {
         return date('YmdHis') . rand(10, 99);
     }
+
+    public function getPayMoney()
+    {
+        return round($this['money'], 2);
+    }
 }

resources/views/admin/orders/index.blade.php

@@ -71,12 +71,12 @@
                                     @foreach($list as $item)
                                         <tr>
                                             <td colspan="4" style="text-align: left">
-                                                {{ $item->created_at . ' 订单号：' . $item->out_trade_no . ' 学员：' . $item->getStudentName() . ' 电话：' . $item->phone }}
+                                                {{ $item->created_at . ' 订单号：' . $item->out_trade_no }}
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>{{ $item->getPayPosition() }}</td>
-                                            <td>{{ $item->money }}</td>
+                                            <td>{{ $item->getPayMoney() }}</td>
                                             <td>
                                                 <div>付款状态：{!! $item->getPayStatusLabel() !!}</div>
                                                 <div>支付方式：{!! $item->getPayMethodLabel() !!}</div>

resources/views/admin/orders/show.blade.php

@@ -35,21 +35,21 @@
                             <div class="col-sm-3 col-sm-offset-1 sg-show-label">订单号</div>
                             <div class="col-sm-7 sg-show-value">{{ $item->out_trade_no }}</div>
                         </div>
-                        <div class="row sg-show-item">
-                            <div class="col-sm-3 col-sm-offset-1 sg-show-label">学员</div>
-                            <div class="col-sm-7 sg-show-value">{{ $item->getStudentName() }}</div>
-                        </div>
-                        <div class="row sg-show-item">
-                            <div class="col-sm-3 col-sm-offset-1 sg-show-label">电话</div>
-                            <div class="col-sm-7 sg-show-value">{{ $item->phone }}</div>
-                        </div>
+                        {{--<div class="row sg-show-item">--}}
+                            {{--<div class="col-sm-3 col-sm-offset-1 sg-show-label">学员</div>--}}
+                            {{--<div class="col-sm-7 sg-show-value">{{ $item->getStudentName() }}</div>--}}
+                        {{--</div>--}}
+                        {{--<div class="row sg-show-item">--}}
+                            {{--<div class="col-sm-3 col-sm-offset-1 sg-show-label">电话</div>--}}
+                            {{--<div class="col-sm-7 sg-show-value">{{ $item->phone }}</div>--}}
+                        {{--</div>--}}
                         <div class="row sg-show-item">
                             <div class="col-sm-3 col-sm-offset-1 sg-show-label">付款落地页</div>
                             <div class="col-sm-7 sg-show-value">{{ $item->getPayPosition() }}</div>
                         </div>
                         <div class="row sg-show-item">
                             <div class="col-sm-3 col-sm-offset-1 sg-show-label">订单金额</div>
-                            <div class="col-sm-7 sg-show-value">{{ $item->money }}</div>
+                            <div class="col-sm-7 sg-show-value">{{ $item->getPayMoney() }}</div>
                         </div>
                         <div class="row sg-show-item">
                             <div class="col-sm-3 col-sm-offset-1 sg-show-label">付款状态</div>
@@ -63,6 +63,29 @@
                             <div class="col-sm-3 col-sm-offset-1 sg-show-label">备注</div>
                             <div class="col-sm-7 sg-show-value">{{ $item->remark }}</div>
                         </div>
+                        @if(!empty($form_data))
+                            @if(!empty($form_data->text_1))
+                                <div class="row sg-item">{{ $form_data->text_1 }}</div>
+                            @endif
+                            @if(!empty($form_data->text_2))
+                                <div class="row sg-item">{{ $form_data->text_2 }}</div>
+                            @endif
+                            @if(!empty($form_data->text_3))
+                                <div class="row sg-item">{{ $form_data->text_3 }}</div>
+                            @endif
+                            @if(!empty($form_data->text_4))
+                                <div class="row sg-item">{{ $form_data->text_4 }}</div>
+                            @endif
+                            @if(!empty($form_data->multi_text))
+                                <div class="row sg-item">{{ $form_data->multi_text }}</div>
+                            @endif
+                            @if(!empty($form_data->radio))
+                                <div class="row sg-item">{{ $form_data->radio }}</div>
+                            @endif
+                            @if(!empty($form_data->checkbox))
+                                <div class="row sg-item">{{ $form_data->checkbox }}</div>
+                            @endif
+                        @endif
                     </div>
                 </div>
             </div>