pc后台优化

application/index/view/cell_phone/index.html

 {layout name="global/frame_tpl" /}
 <input type="hidden" class="page-load" id="callPhoneIndex" />
+<style>
+	.clear{
+		clear:both ;
+	}
+</style>
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
@@ -26,7 +31,7 @@
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="拨打人手机号" type="phone" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="被拨打人姓名" type="text" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish-phone" placeholder="拨打人手机号" type="phone" value="">
-
+											<div class="clear"></div>
                                             <span class="fore-span ld-Marheight">拨打时间:</span>
                                             <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
                                             <span class="fore-span ld-Marheight">-</span>

application/index/view/houses/houseList.html

@@ -362,7 +362,7 @@
             <div class="modal-body modal-body-one">
             	<div class="followup-modal-list-area">
             		<table class="table table-striped table-bordered table-hover table-condensed">
-						<tbody class="text-center" id="modal_followup_table_list">
+						<tbody class="" id="modal_followup_table_list">
 							<tr>
 								<td>电话跟进：测试测试测试测试测试测试测试测试测试测试测试测试</td>
 								<td>刘丹丹</td>

public/appnew/src/components/announcementDetails/announcementDetails.vue

@@ -36,8 +36,8 @@
 						url: '/broker/getFeedInfo',
 						responseType: 'json',
 						data: {
-//							'id': _this.announce_id,
-							'id': 255,
+							'id': _this.announce_id,
+//							'id': 256,
 							
 						}
 					})
@@ -45,8 +45,8 @@
 						if(response.data.code == 200) {
 							_this.house_title=response.data.data.title;//改成title
 							_this.create_time=response.data.data.create_time;
-//							_this.content=response.data.data.content;
-							_this.content=_this.common.urlDeal(response.data.data.content);
+							_this.content=response.data.data.content;
+//							_this.content=_this.common.urlDeal(response.data.data.content);
 							console.log(response.data.data.content);
 
 						} else {

public/resource/js/user.js

@@ -640,7 +640,12 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 							$.each(data['data']['user_history'], function(i, item) {
 								caozuo_table += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
 							});
-							$("#caozuo_table").html(caozuo_table);
+							if(caozuo_table){
+							    $("#caozuo_table").html(caozuo_table);
+							}else{
+							    $("#caozuo_table").html('暂无数据(*^_^*)');
+							}
+
 						}
 					} else {
 						alert('获取失败！');

public/resource/template/callPhone_template_tpl.html

@@ -2,7 +2,12 @@
     [% if(it) { %]
         [% for(var item in it){ %]
         <tr class="text-center">
-            <td>[%= it[item]['call_time'] %]</td>
+            <!--<td>[%= it[item]['call_time'] %]</td>-->
+            <td>
+                [% if(it[item]['call_time'] != null) { %]
+                    [%= it[item]['call_time'] %]
+                [% } %]
+            </td>
             <td>[%= it[item]['agents_name'] %]</td>
             <td>
                 [% if(it[item]['user_nick'] != null) { %]