修改

application/index/view/marchin/marchin_list.html

@@ -24,9 +24,14 @@
     #search{
         float: left;
     }
-   #reset{
+    #reset{
         float: left;
     }
+    .J_preview {
+		width: 30px;
+		height: 30px;
+		/*border-radius: 15px;*/
+	}
 </style>
 <div id="page-content-wrapper">
     <div class="container">

public/resource/js/marchinList.js

@@ -169,6 +169,8 @@
 						    
 							/*分页代码*/
 							add_page(data.data.total,pageNo,follow.pageSize,follow.getList);
+					        $('.J_preview').preview();
+							
 							
 			            }else {
 			                alert(data['msg']);

public/resource/js/public.js

@@ -272,7 +272,26 @@ function hideStr(str){
 	            return str;
 		}
       }
+//进场的经纬度 和 进场地址
+function adressDeal(str1,str2,address,addressA) {
+                  if (address != undefined && address != '') {
+                      var url = 'http://api.map.baidu.com/geocoder/v2/?ak=eIxDStjzbtH0WtU50gqdXYCz&output=json&address=' + address;
+                     //根据地点名称获取经纬度信息
+                    $.ajax({
+                        type: "POST",
+                        url: url,
+                        dataType: "JSONP",
+                        success: function (data) {
+                             if (parseInt(data.status) == 0) {
+                             	        addressA = data.result.location.lng;
+                                        console.log(addressA)
+                             	        return addressA//怎么从ajax 返回值
+                             	       }
+                         }
+                     });
+                }
 
+}
 //判断数组里有没有 某个字段 返回类名 客户列表
     function getLoaclId(id){
 	var tempArr = JSON.parse(localStorage.getItem('id_details_str'));
@@ -316,4 +335,5 @@ function dealPunctuation(str) {
 //	    $('.mark').hide();
 //	    $('.mark').remove();
 //	  }, 2000)
-//}
+//}
\ No newline at end of file
+

public/resource/template/marchin_list_template_tpl.html

@@ -6,8 +6,11 @@
         <td>[%= hideTel(it[item]['user_phone']) %]</td>
         <td>[%= it[item]['create_time'] %]</td>
         <td>[%= it[item]['report_agent_name'] %]</td>
-        <td>[%= it[item]['house_title'] %]</td>
-        <td>[%= it[item]['house_title'] %]</td>
+        <td>[%= adressDeal(it[item]['latitude'],it[item]['longitude'],it[item]['march_in_area']) %]</td>
+        <td>
+        	 <img src='[%=location.href+"/static/chat_image/"+it[item]["march_in_img"] %]' class="diagram-image J_preview"
+                 data-bimg='[%=location.href+"/static/chat_image/"+it[item]["march_in_img"] %]'>
+        </td>
         <td>
             <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
         </td>

public/resource/template/real_time_performance_template_tpl.html

@@ -527,15 +527,7 @@
         </td>
         <td class="text-left">[%= it[item]['industry_type'] %]</td>
         <td class="text-center">[%= it[item]['area_demand'] %]</td>
-        <td class="text-center">
-        	[% if(it[item]["source"] == 10) { %]
-				APP注册
-			[% }else if(it[item]["source"] == 20 ) { %]
-				经纪人新增
-			[% }else{ %]
-				老数据客户
-			[% } %]
-        </td>
+        <td class="text-center">[%= it[item]['name'] %]</td>
     </tr>
     [% } %]
     [% }else{ %]