Merge remote-tracking branch 'origin/wx0604' into wx0604

application/model/OMarchInModel.php

@@ -93,12 +93,12 @@ class OMarchInModel extends Model
     }
 
     /**
-     * 查询经纪人进场数据
+     * 查询经纪人进场数据 todo 产品定义同一天带看同一个客户去多个铺子算一个带看,下个方法同样
      * @param $params
      * @return false|\PDOStatement|string|\think\Collection
      */
     public function getAddMarchInNumGroupTime($params){
-        $field = "count(1) as num,DATE(create_time) as day";
+        $field = "count(DISTINCT report_id) as num,DATE(create_time) as day";
         $where_ = [];
         if(isset($params["agent_id"])){
             $where_["reception_id"] = $params["agent_id"];
@@ -114,7 +114,7 @@ class OMarchInModel extends Model
     }
 
     public function getAddMarchInNum($params){
-        $field = "count(1) as num";
+        $field = "count(DISTINCT report_id) as num";
         $where_ = [];
         if(isset($params["agent_id"])){
             $where_["a.reception_id"] = $params["agent_id"];

public/resource/template/evaluation_list_template_tpl.html

@@ -8,12 +8,9 @@
         <td>[% if(it[item]["name"] != null) { %]
                 [%= it[item]['name'] %]
             [% } %]</td>
-        <!--<td>[%= it[item]['name'] %]</td>-->
         <td>[% if(it[item]["phone"] != null) { %]
                 [%= it[item]['phone'] %]
             [% } %]</td>
-        <!--<td>[%= it[item]['phone'] %]</td>-->
-        
         <td class="pay_type">[%= it[item]['evaluate_grade'] %]</td>
         <td>[%= it[item]['evaluate_content'] %]</td>
         <td>

public/resource/template/visit_shop_template_tpl.html

@@ -3,6 +3,7 @@
     [% for(var item in it){ %]
     <tr class="text-center">
          <td>[%= it[item]['created'] %]</td>
+         <!--<td>[%= it[item]['created'] %]</td>-->
          <td>[%= it[item]['visitor_name'] %]</td>
         <td>[%= it[item]['agentshopname'] %]</td>
         <td>[%= it[item]['shop_address'] %]</td>