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

application/api/controller/AppointmentTime.php

@@ -212,7 +212,7 @@ class AppointmentTime extends Basic
     public function getYetListV2($pageNo, $pageSize, $params)
     {
         $field               = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
-        d.external_title as house_title,d.residue_num as room_num_left";
+        d.external_title as house_title,d.residue_num as room_num_left, d.is_show,d.status";
         $where_["a.user_id"] = $params["user_id"];
         // $result              = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
         $result = $this->reportModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);

application/model/OReportModel.php

@@ -539,7 +539,9 @@ class OReportModel extends Model
                     a.predict_see_time AS expect_time,
                     `b`.`house_id`,
                     d.external_title AS house_title,
-                    d.residue_num AS room_num_left
+                    d.residue_num AS room_num_left,
+                    d.is_show,
+                    d.status
                 FROM
                     `o_report` `a`
                 LEFT JOIN `o_order` `b` ON `b`.`f_id` = `a`.`id`
@@ -558,7 +560,9 @@ class OReportModel extends Model
                     a.house_id,
                     a.user_id,
                     b.external_title AS house_title,
-                    b.residue_num AS room_num_left
+                    b.residue_num AS room_num_left,
+                    b.is_show,
+                    b.status
                 FROM
                     u_appoint_watch_shop a
                 LEFT JOIN g_houses b ON a.house_id = b.id

public/app/js/customerinfo_details_new.js

@@ -71,12 +71,18 @@ function loadMain(){
 	        if(typeof data === 'object') {
 	            if (data.code == 200) {
 	                $('#customer_code').html(data['data']['user_info']['user_id']);
-	                $('#customer_name, #name').html(data['data']['user_info']['user_name']+(data['data']['user_info']['user_nick']?('('+data['data']['user_info']['user_nick']+')'):''));
+	                $('#customer_name, #name').html((data['data']['user_info']['user_name'] == null?'':data['data']['user_info']['user_name'])+(data['data']['user_info']['user_nick']?('('+data['data']['user_info']['user_nick']+')'):''));
 	                if(data['data']['user_info']['sex']==2){
 	                	$('.sex-icon').attr('src','/app/images/girl_ic@2x.png');
 	                };
 	                
-	                $('#industry_type').html(data['data']['user_info']['industry_type']);
+	                //如果业态没有则隐藏这个span
+	                if(data['data']['user_info']['industry_type']){
+	                	$('#industry_type').html(data['data']['user_info']['industry_type']);
+	                }else{
+	                	$('#industry_type').hide();
+	                }
+	                
 	                $('#price_demand').html(data['data']['user_info']['price_demand']+'元/月');
 	                $('#area_demand').html(data['data']['user_info']['area_demand']+'㎡');