Merge branch 'zjl_adjust_20181026' into development

app/Http/Controllers/OrderController.php

@@ -1003,7 +1003,7 @@ Class OrderController extends Controller
         }
         }
     }
     }
 
 
-    //取消订单（仅限审核通过，未付款前）
+    // 取消订单（仅限审核通过，未付款前）
     public function cancelPay(Request $request, $id)
     public function cancelPay(Request $request, $id)
     {
     {
        if($request->isMethod('post')){
        if($request->isMethod('post')){
@@ -1034,6 +1034,7 @@ Class OrderController extends Controller
        }
        }
 
 
        $info = $this->orderDetail($request, $id);
        $info = $this->orderDetail($request, $id);
+       $this->pageHeader($request, $info, '取消订单', ["title" => '取消订单', "href" => '#']);
 
 
        return view('detail', $info);
        return view('detail', $info);
     }
     }