Merge branch 'test'

application/api_broker/service/OrderLogService.php

@@ -1328,7 +1328,7 @@ class OrderLogService
 
         $orderModel = new OrderModel();
 
-        $result = $orderModel->searchOrderAll($field, $where_, $pageNo, $pageSize);
+        $result = $orderModel->searchOrderAll($field, $condition, $pageNo, $pageSize);
         $reportService = new ReportService();
         return $reportService->returnResult($result);
 

application/index/view/news/new_text.html

@@ -324,12 +324,11 @@
 														<div class="" style="width: 100%;">
 															<div class="input-group" style="width: 100%;" id="dajiangtang">
 																<?php
-																if (CURRENT_URL == 'https://api.tonglianjituan.com/') {
-																	$url = IMAGES_URL;
-																} else {
+																if (CURRENT_URL == 'https://pre2.tonglianjituan.com/') {
 																	$url = 'https://pre2.tonglianjituan.com/';
+																} else {
+																	$url = IMAGES_URL;
 																}
-
 	 											create_editor('goods_sup_id','',['filebrowserUploadUrl'=>$url.'index/uploadEditor?type=business_school']);
 											?>
 															</div>