Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/merchant.php

@@ -811,7 +811,7 @@ class merchantControl extends SystemControl
     public function refill_orderOp()
     {
         $model_refill_order = Model('refill_order');
-        $condition = [];
+        $condition['inner_status'] = 0;
         if (!empty($_GET['order_sn'])) {
             $condition['refill_order.order_sn'] = $_GET['order_sn'];
         }

upfile.php

@@ -26,11 +26,11 @@ function errmsg($err)
             return "上传文件失败";
     }
 }
-function upfile_joutput_error($err=0)
+function upfile_joutput_error($err=0 , $data = [])
 {
     $data['code'] = 15000;
     $data['message'] = errmsg($err);
-    $data['datas'] = null;
+    $data['datas'] = $data;
 
     ob_clean();
     echo(json_encode($data));
@@ -67,7 +67,7 @@ if ($_FILES)
             $ret['file_site_path'] = $base_site_path .'/' . $filename;
             upfile_joutput_data($ret);
         } else {
-            upfile_joutput_error();
+            upfile_joutput_error(7,[$dest_file]);
         }
     }
 }