Skip to content

T
tl_estate
Commit 3b62768b authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 73c5c815 6e23d4db
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
application/api_broker/service/OrderLogService.php
View file @ 3b62768b
...@@ -1328,7 +1328,7 @@ class OrderLogService ...@@ -1328,7 +1328,7 @@ class OrderLogService
$orderModel = new OrderModel(); $orderModel = new OrderModel();
$result = $orderModel->searchOrderAll($field, $where_, $pageNo, $pageSize); $result = $orderModel->searchOrderAll($field, $condition, $pageNo, $pageSize);
$reportService = new ReportService(); $reportService = new ReportService();
return $reportService->returnResult($result); return $reportService->returnResult($result);
......
application/index/view/news/new_text.html
View file @ 3b62768b
...@@ -324,12 +324,11 @@ ...@@ -324,12 +324,11 @@
<div class="" style="width: 100%;"> <div class="" style="width: 100%;">
<div class="input-group" style="width: 100%;" id="dajiangtang"> <div class="input-group" style="width: 100%;" id="dajiangtang">
<?php <?php
if (CURRENT_URL == 'https://api.tonglianjituan.com/') { if (CURRENT_URL == 'https://pre2.tonglianjituan.com/') {
$url = IMAGES_URL;
} else {
$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']); create_editor('goods_sup_id','',['filebrowserUploadUrl'=>$url.'index/uploadEditor?type=business_school']);
?> ?>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment