Merge branch 'test'

application/chat/controller/AppChat.php

@@ -613,20 +613,10 @@ class AppChat extends Basic
         }
         //todo 先获取是否有店铺或客户修改消息是否为0，大于0返回true，否则查询聊天消息是否有未读
         $param["addressee_id"] = $params["agent_id"];
-        $param["type"] = 2;
         $param["is_read"] = 0;
         //TODO 获取未读个数
         $msgModel = new MPushMessage();
-        $user_count = $msgModel->getListCountByWhere($param);
-        if ($user_count > 0) {
-            return $this->response("200", "success", ["is_show_red" => true]);
-        }
-        $param["type"] = array("in", "1,3,7");
-        $shop_count = $msgModel->getListCountByWhere($param);
-        if ($shop_count > 0) {
-            return $this->response("200", "success", ["is_show_red" => true]);
-        }
-        $param["type"] = 8;
+        $param["type"] = array("in", "1,2,3,7");
         $shop_count = $msgModel->getListCountByWhere($param);
         if ($shop_count > 0) {
             return $this->response("200", "success", ["is_show_red" => true]);

application/index/view/cell_phone/agentIndex.html

-{layout name="global/frame_tpl" /}
+{layout name="global/frame_two_tpl" /}
 <input type="hidden" class="page-load" id="agentIndex" />
 <div id="page-content-wrapper">
     <div class="container">

public/resource/js/agentIndex.js

@@ -24,10 +24,10 @@ define (['doT', 'text!temp/agentIndex_template_tpl.html', 'css!style/home.css','
 			var n = myDate.getMonth()
 			var day_start = y + '-' + (n < 10 ? ('0' + n) : n) + '-' + (d < 10 ? ('0' + d) : d);
 			var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
-			$('#start_date').val(day_start);
+			$('#start_date').val(getBeforeDate(30));
 			$('#end_date').val(day_end);//客户跟进 添加 默认时间一天
             agentIndex.getList ();
-            agentIndex.event ();
+            agentIndex.event ($('#start_date').val());
         },
         event: function () {
             $("#search").click(function () {