Merge branch 'test'

application/api/controller/TransferHouseInfo.php

@@ -39,9 +39,9 @@ class TransferHouseInfo extends Controller
 
             $g_house_data['id'] = $house_info_data['id'];
             $g_house_data['internal_title'] = $house_info_data['title'];
-            $g_house_data['external_title'] = $house_info_data_ext['foreign_name'];
+            $g_house_data['external_title'] = empty($house_info_data_ext['foreign_name']) ? "" : $house_info_data_ext['foreign_name'];
             $g_house_data['internal_address'] = $house_info_data['address'];
-            $g_house_data['external_address'] = $house_info_data_ext['address_detail_c'];
+            $g_house_data['external_address'] = empty($house_info_data_ext['address_detail_c']) ? "":$house_info_data_ext['address_detail_c'];
             $g_house_data['province'] = '上海';
             $g_house_data['city'] = $house_info_data['city'];
             $g_house_data['disc'] = $house_info_data['disc'];
@@ -53,7 +53,7 @@ class TransferHouseInfo extends Controller
 
             $g_house_data['market_area'] = $house_info_data['business_area'];
 
-            $g_house_data['rent_type'] = $house_info_data['rent_type'];
+            $g_house_data['rent_type'] = empty($house_info_data['rent_type']) ? 0 : $house_info_data['rent_type'];
             $g_house_data['rent_price'] = $house_info_data['price']*100;
             $g_house_data['industry_type'] = $house_info_data['yetai'];
 //            $g_house_data['case_manager_phone'] = $house_info_data['title'];
@@ -91,10 +91,10 @@ class TransferHouseInfo extends Controller
             $g_house_data['is_has_gas'] = $house_info_data['has_gas'];
             $g_house_data['is_carefully_chosen'] = empty($house_info_data['carefully_chosen']) ? 1: 0;
             //是否独家0否1是
-            $g_house_data['is_exclusive_type'] = $house_info_data['exclusienter_numve_type'];
+            $g_house_data['is_exclusive_type'] = empty($house_info_data['exclusive_type']) ? 0 : $house_info_data['exclusive_type'];
             $g_house_data['upload_id'] = $house_info_data['admin_id'];
 //            $g_house_data['operation_id'] = $house_info_data['title'];
-            $g_house_data['file_path'] = $house_info_data['file_path'];
+            $g_house_data['file_path'] = empty($house_info_data['file_path']) ? "" :$house_info_data['file_path'];
             $g_house_data['landmark'] = $house_info_data['landmark'];
             $g_house_data['create_time'] = $house_info_data['created'];
             $g_house_data['update_time'] = $house_info_data['modified'];
@@ -104,9 +104,9 @@ class TransferHouseInfo extends Controller
             $g_house_data_ext['house_id'] = $house_info_data['id'];
             $g_house_data_ext['fee_rule'] = $house_info_data['fee_rule'];
             $g_house_data_ext['internal_item_advantage'] = $house_info_data['sellingpoint'];
-            $g_house_data_ext['external_item_advantage'] = $house_info_data_ext['foreign_advantage'];
+            $g_house_data_ext['external_item_advantage'] = empty($house_info_data_ext['foreign_advantage'])? "":$house_info_data_ext['foreign_advantage'];
             $g_house_data_ext['tiny_brochure_url'] = $house_info_data['weilinks'];
-            $g_house_data_ext['auditorium'] = $house_info_data['auditorium'];
+            $g_house_data_ext['auditorium'] = empty($house_info_data['auditorium']) ? "" : $house_info_data['auditorium'];
             $g_house_data_ext['traffic'] = $house_info_data['traffic'];
             $g_house_data_ext['agent_start_time'] = $house_info_data['exclusive_start'];
             $g_house_data_ext['agent_end_time'] = $house_info_data['exclusive_end'];
@@ -122,7 +122,7 @@ class TransferHouseInfo extends Controller
             Db::table('g_houses_ext')->insert($g_house_data_ext);
 
             if (!empty($house_info_data['agent_id'])) {
-                $agent_id_arr = explode(',',$house_info_data['agent_id']);
+                $agent_id_arr = array_unique(explode(',',$house_info_data['agent_id']));
                 foreach ($agent_id_arr as $k => $v) {
                     Db::table('g_houses_to_agents')->insert([
                         'houses_id' => $house_info_data['id'],

public/app/js/detaila_tl.js

@@ -70,7 +70,7 @@
 					$(".b3_span2").html(response.data.industry_type);
 					$(".b3_spanhao").html(response.data.id);
 					$(".b3_span3").html(response.data.enter_num);
-					$(".b4_font_p1").html(response.item_advantage);
+					$(".b4_font_p1").html(response.data.item_advantage);
 					$(".b5_font_p1").html(response.data.sign_rule);
 					b4_font = '<p  class="b4_font_p">详细信息</p>' +
 						'<p class="b4_font2">营业时间:<span class="b4_span1 gw">' + response.data.do_business_date + '</span></p>' +

public/resource/js/district.js

 define (['doT', 'text!temp/district_template_tpl.html', 'css!style/home.css','pagination','bootstrapJs'], function (doT, template) {
     district = {
         pageNo: 1, /*第几页*/
-        pageSize: 10, /*每页显示多少条*/
+        pageSize: 15, /*每页显示多少条*/
         pageNum:10,
         district : 0,
         agent_id : 0,
@@ -161,15 +161,9 @@ define (['doT', 'text!temp/district_template_tpl.html', 'css!style/home.css','pa
                     var temp = document.getElementById ('district_list_tpl').innerHTML;
                     var doTtmpl = doT.template (temp);
                     $ ("#district_list").html (doTtmpl (data.data.list));
+
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
-                        length: data.data.total,
-                        current: pageNo,
-                        every: district.pageSize,
-                        onClick: function (el) {
-                            district.getList (el.num.current);
-                        }
-                    });
+                    add_page(data.data.total, pageNo, district.pageSize, district.getList);
                 }
             });
         }