Merge branch 'master' into development

resources/views/returnDetails/content.blade.php

@@ -62,7 +62,7 @@
 
 
                         <div class="layui-col-xs6 layui-col-sm6 layui-col-md6">
                         <div class="layui-col-xs6 layui-col-sm6 layui-col-md6">
                            <label class="layui-form-label">支付方式：</label>
                            <label class="layui-form-label">支付方式：</label>
-                            <span class="layui-text">{{ $return['mobile'] }}</span>
+                            <span class="layui-text">{{ App\Http\Controllers\getPayName($return['order_id']) }}</span>
                         </div>
                         </div>
                     </div>
                     </div>