Merge branch 'test'

application/api_broker/controller/Shop.php

@@ -85,7 +85,7 @@ class Shop extends Basic
         } else {
             $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
             ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price";
-
+            $conditions["city"] = "上海市";
         }
 
         $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];

application/app_broker/view/index/shop_detail_pc.html

@@ -18,19 +18,19 @@
 						<tbody>
 							<tr>
 								<td>商铺编号：{{d.id}}</td>
-								<td>商铺类型：{{d.shop_type?'街铺':'商场'}}</td>
+								<td>商铺类型：{{(d.shop_type==1)?'街铺':'商场'}}</td>
 								<td>是否对客户展示：{{d.is_show?'否':'是'}}</td>
 								<td>是否独家：{{d.is_exclusive_type?'是':'否'}}</td>
 							</tr>
 							<tr>
 								<td>{{dealPrice}}</td>
-								<td>{{d.shop_type?'对内转让费':'进场费'}}：{{d.slotting_fee}}元</td>
+								<td>{{(d.shop_type==1)?'对内转让费':'进场费'}}：{{d.slotting_fee}}元</td>
 								<td>物业管理费：{{d.management_fee}}元/月</td>
 								<td></td>
 							</tr>
 							<tr>
-								<td>{{d.shop_type?'使用面积':'商铺面积'}}：{{dealArea}}</td>
-								<td>{{d.shop_type?'建筑面积':'项目总面积'}}：{{d.market_area}}m²</td>
+								<td>{{(d.shop_type==1)?'使用面积':'商铺面积'}}：{{dealArea}}</td>
+								<td>{{(d.shop_type==1)?'建筑面积':'项目总面积'}}：{{d.market_area}}m²</td>
 								<td>剩余铺数：{{d.residue_num}}</td>
 								<td>总铺数：{{d.total}}</td>
 							</tr>

application/index/controller/Houses.php

@@ -260,6 +260,7 @@ class Houses extends Basic
                         $where['a.shop_area_start'] = ['>', 0];
                 }
             }
+            $where['a.city'] = '上海市';
 
             $data['data']['list']  = $this->house->getHouseListDish($pageNo, $pageSize, 'a.id DESC', $fields, $where, $this->userId);
             $data['data']['total'] = $this->house->getHouseListDishTotal($where);