Merge branch 'zjl_self_refund_20190605' into development

resources/views/detail/return.blade.php

@@ -15,7 +15,7 @@
             <input type="hidden" name="return_info[currency]" value="{{$order_info['currency']}}">
             <input type="hidden" name="return_info[mobile]" value="{{$user_info['mobile'] ? $user_info['mobile'] : $user_mobile}}">
             <input type="hidden" name="return_info[email]" value="{{$user_info['email']}}">
-            <input type="hidden" name="return_info[company_name]" value="{{ $company_info ? $company_info['com_name'] : '' }}">
+            <input type="hidden" name="return_info[company_name]" value="{{ isset($company_info['com_name']) ? $company_info['com_name'] : '' }}">
             <input type="hidden" name="return_info[pay_amount]" value="{{ $order_info['order_amount'] + $order_price_info['pay_preferential'] }}">
             <input type="hidden" name="pay_id" value="{{$order_pay_log[0]['pay_id']}}">