Merge branch 'test'

application/api_broker/service/OrderLogService.php

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

application/index/controller/UploadImg.php

@@ -56,10 +56,10 @@ class UploadImg extends Basic
         $type         = request()->param('type');
         $uploadResult = $this->uFService->upload($file, $type);
 
-        if (CURRENT_URL == 'https://images.tonglianjituan.com/') {
-            $path = IMAGES_URL;
-        } else {
+        if (CURRENT_URL == 'https://pre2.tonglianjituan.com/') {
             $path = 'https://pre2.tonglianjituan.com/';
+        } else {
+            $path = IMAGES_URL;
         }
 
         switch ($type) {

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=2019066688' charset='utf-8'></script>
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=2019066682' charset='utf-8'></script>

public/resource/js/getCollection.js

@@ -1298,6 +1298,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				$('.hangzhou').hide();
 				$('.shenzheng').show();
 			}
+			var persent = 0.7;
 			$('.zhzd').show();
 			$('.zjcon').hide();
 			var doc = $('#modal-addPic');