edit

tool/clue/assets/pc/html/index.html

@@ -115,7 +115,7 @@ body{
   }
 
 .onebor{
-    width: 700px;
+    /*width: 700px;*/
     padding-left: 25px;
     padding-bottom: 10px;
     border: 1px solid #ddd;
@@ -136,10 +136,11 @@ body{
 .desc{
 	margin-top: 10px;
 	margin-bottom:5px;
+    margin-right: 10px;
 }
 
 .gengzong{
-    width: 700px;
+    /*width: 700px;*/
     padding-left: 25px;
     padding-bottom: 10px;
     border: 1px solid #ddd;
@@ -223,8 +224,10 @@ body{
     box-shadow: 2px 10px 7px -12px;
     border-radius: 160px;
     background: #efefef;
-    padding-top: 10px;
-    padding-bottom: 10px;
+    /*padding-top: 10px;*/
+    /*padding-bottom: 10px;*/
+    padding-bottom: 16px;
+    padding-top: 17px;
 }
 </style>
 </head>
@@ -286,7 +289,7 @@ body{
 			<{if(isset($follow) && $follow):}>
 			<{foreach($follow as $k => $v):}>
 			<div class="layui-row gengzong">
-				<div class="tine"><span>跟进时间：<{$v['cdate']}></span><span style="margin-left: 10px;">跟进人：<{$v['group_name']}></span><span style="margin-left: 10px;">跟进方式：<{$v['type_name']}></span><span style="margin-left: 10px;">计划下次跟进：<{$v['xdate']}></span></div>
+				<div class="tine"><span>跟进时间：<{$v['cdate']}></span><span style="margin-left: 10px;">跟进人：<{$v['group_name']}></span><span style="margin-left: 10px;">跟进方式：<{$v['type_name']}></span><span style="margin-left: 10px;">下次跟进：<{$v['xdate']}></span></div>
 				<div class="gou">沟通结果：<{$v['desc']}></div>
                 <{if($v['pic']):}>
 				<div id="layer-photos_log-<{$v['id']}>" class="layer-photos-demo layui-col-xs12" id="tk">

tool/clue/lib/Info.php

@@ -312,7 +312,7 @@ Class Info
 				$data['follow'][$k]['group_name'] = $data['follow'][$k]['group_name'].' / '.$data['follow'][$k]['admin_name'];
 			}
 			$data['follow'][$k]['type_name'] = Dever::status($config_type,$v['type']);
-			$data['follow'][$k]['cdate'] = date('Y-m-d H:i:s',$v['cdate']);
+			$data['follow'][$k]['cdate'] = date('Y-m-d H:i',$v['cdate']);
 			$data['follow'][$k]['xdate'] = date('Y-m-d H:i',$v['xdate']);
 			if ($v['pic']) {
 				$data['follow'][$k]['pic'] = explode(',',$v['pic']);
@@ -327,7 +327,7 @@ Class Info
 		}
 		$data['info']['people'] = '';
 		$branch = explode(',',$data['info']['follow']);
-		$data['info']['people'] = $this->group_admin($data['info']['company_id'],$branch[0],$branch[1]);
+		$data['info']['people'] = $this->group_admin($data['info']['company_id'],$branch[0],$branch[1],1);
 		
 		$follow = 0;
 		$follow = Dever::db('clue/follow')->getCount(array('info_id'=>$id));
@@ -360,11 +360,16 @@ Class Info
 		return Dever::render('index', $data);
 	}
 
-	public function group_admin($company_id,$group_id,$admin_id)
+	public function group_admin($company_id,$group_id,$admin_id,$type=false)
 	{
 		$group = Dever::db('manage/group')->find(array('company_id'=>$company_id,'id'=>$group_id));
 		$admin = Dever::db('manage/admin')->find($admin_id);
-		return $group['name'].' / '.$admin['username'];
+		if ($type == 1) {
+			return $group['name'].' <br/> '.$admin['username'];
+		} else {
+			return $group['name'].' / '.$admin['username'];
+		}
+		
 	}
 	public function source_Num($id)
 	{