Merge branch 'test'

application/api_broker/service/OrderLogService.php

@@ -942,14 +942,27 @@ class OrderLogService
         $appointWatchShopModel = new AppointWatchShop();
 
 
+        //客户c端提交预约看铺
+        $field_appoint = "a.id,a.create_time,b.user_name as name";
+        $appointData = $appointWatchShopModel->getAppointWatchOur(1,15,"a.id desc",$field_appoint,["a.user_id"=>$user_id]);
+        if (count($appointData) > 0) {
+            foreach ($appointData as $k => $v) {
+                $v["step_name"] = "appoint";
+                $v["step"] = "提交预约看铺";
+                $result[$sort++] = $v;
+            }
+        }
 
         $field_report = "a.id,a.create_time,a.predict_see_time,a.intro,b.id as order_id,b.house_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name";
 
         $reportData = $oReportModel->selectReportByUserId($field_report, ["user_id" => $user_id]);
-        if (count($result) <= 0 && count($reportData) <= 0) {
+        if (count($appointData) > 0 && count($reportData) <= 0) {
+            return $this->sortByTime($result);
+        }elseif(count($appointData) <= 0 && count($reportData) <= 0){
             return [];
         }
 
+
         $order_ids = $report_ids = "";
         //报备
         foreach ($reportData as $k => $v) {
@@ -970,16 +983,6 @@ class OrderLogService
 
         $reportParams["report_id"] = array("in", $report_ids);
 
-        //客户c端提交预约看铺
-        $field_appoint = "a.id,a.create_time,b.user_name as name";
-        $appointData = $appointWatchShopModel->getAppointWatchOur(1,15,"a.id desc",$field_appoint,["a.user_id"=>$user_id]);
-        if (count($appointData) > 0) {
-            foreach ($appointData as $k => $v) {
-                $v["step_name"] = "appoint";
-                $v["step"] = "提交预约看铺";
-                $result[$sort++] = $v;
-            }
-        }
 
         //进场  march in
         $field_march_in = "a.id,a.reception_id,a.create_time,b.id as order_id,b.house_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name";

application/index/view/remark/remark_follow_index.html

@@ -388,7 +388,7 @@
 												<!--<select class="form-control btn2 ld-Marheight" id="user_area_choose">
                                                   <option value="" selected="selected">区域筛选</option>
                                                 </select>-->
-												<span class="btn btn-default btn3 ld-Marheight" id="is_taday" style="float: left;">今天</span>
+												<span class="btn btn-info btn3 ld-Marheight" id="is_taday" style="float: left;">今天</span>
 												<span class="fore-span ld-Marheight">跟进时间:</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
 												<span class="fore-span ld-Marheight">-</span>

public/resource/js/RemarkFollowIndex.js

@@ -57,8 +57,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 			var m = myDate.getMonth() + 1;
 			var d = myDate.getDate();
 			var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
-			$('#start_date').val(day_end);
-			$('#end_date').val(day_end);//客户跟进 添加 默认时间一天
+//			$('#start_date').val(day_end);
+//			$('#end_date').val(day_end);//客户跟进 添加 默认时间一天
 			//初始化城市 区域筛选
 			user.initializationCityFunction();
 			user.event();