js

application/index/service/OfficeService.php

@@ -160,7 +160,7 @@ class OfficeService
 //                    $data['business_name'] = "";
 //                }
 
-                $field_stations = 'a.id,b.line_name,b.line_name_simple,name,distance,b.id as stations_id,b.latitude,b.longitude';
+                $field_stations = 'a.id,b.line_name,b.line_name_simple,name,distance,b.id as stations_id,b.latitude,b.longitude,b.id as stations_id';
                 $data['building_stations'] = $this->m_building_stations->getListAll($field_stations, ['a.building_id'=>$id]);
 
             }

application/model/OfficeGRoom.php

@@ -198,6 +198,11 @@ class OfficeGRoom extends BaseModel
             $save_data['is_carefully_chosen'] = $data['is_carefully_chosen'];
         }
 
+        //状态 1上架 2下架  3回收
+        if (isset($data['status'])) {
+            $save_data['status'] = $data['status'];
+        }
+
         if (empty($data['id'])) {
             $save_data['operation_id'] = $agent_id; //上传人
             $save_data['create_time'] = date('Y-m-d H:i:s');

application/model/OfficeOBargainModel.php

@@ -472,7 +472,7 @@ class OfficeOBargainModel extends Model
             ->join('o_report b', 'a.report_id = b.id', 'left')
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('office_g_room d', 'c.house_id = d.id', 'left')
-            ->join('office_g_room f', 'd.building_id = f.id', 'left')
+            ->join('office_g_building f', 'd.building_id = f.id', 'left')
             ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
             ->where($params)
             ->find();

public/resource/js/buildingDictionary.js

@@ -759,23 +759,23 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
                                         //编辑获取交通详情
                                         $('.detail-modal-bargaininfo-commission-addarea').html('');
                                         business.addStr = _str;
-	                                    if(business.buildingStations.length == 0){
+									if(business.buildingStations.length == 0){
 	                                    	$('.detail-modal-bargaininfo-commission-addarea').append('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="control-label" style="float: left;">距离</label><select class="form-control btn2-city shop_city_choose_site_list_line">'+ business.addStr +'</select><select class="form-control btn2-city shop_area_id_line"><option value="" selected="selected">区域</option></select><input type="number" class="form-control btn2-city" name="user_phone" autocomplete="off" class="" placeholder="请输入"><label class="control-label">米</label><span href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></span></div>');
-	                                    }else{
-	                                    		$.each(business.buildingStations, function(i, v) {
-													$('.detail-modal-bargaininfo-commission-addarea').append('<div data-id="'+ v.id +'" class="form-group detail-modal-bargaininfo-commission-sec"><label class="control-label" style="float: left;">距离</label><select class="form-control btn2-city shop_city_choose_site_list_line">'+  _str +'</select><select class="form-control btn2-city shop_area_id_line"><option value="{3}" selected="selected" data-latitude="{4}" data-longitude="{5}">{1}</option></select><input type="number" class="form-control btn2-city" name="user_phone" autocomplete="off" class="" placeholder="请输入" value="{2}"><label class="control-label">米</label><span href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></span></div>'.stringFormatObj({
-														'0': v.line_name,
-														'1': v.name,
-														'2': v.distance,
-														'3': v.stations_id,
-														'4': v.latitude,
-														'5': v.longitude
-													}));
-													var name_ = v.line_name_simple;
-													$(".shop_city_choose_site_list_line").eq(i).val(name_);
-												});
-	                                    }
-                                       
+	                                    }else {
+										$.each(business.buildingStations, function (i, v) {
+											$('.detail-modal-bargaininfo-commission-addarea').append('<div data-id="' + v.id + '" class="form-group detail-modal-bargaininfo-commission-sec"><label class="control-label" style="float: left;">距离</label><select class="form-control btn2-city shop_city_choose_site_list_line">' + _str + '</select><select class="form-control btn2-city shop_area_id_line"><option value="" selected="selected">区域</option></select><input type="number" class="form-control btn2-city" name="user_phone" autocomplete="off" class="" placeholder="请输入" value="{2}"><label class="control-label">米</label><span href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></span></div>');
+											var name_ = v.line_name_simple;
+											$(".shop_city_choose_site_list_line").eq(i).val(name_);
+
+											var arr_ = JSON.parse($(".shop_city_choose_site_list_line").eq(i).find("option:selected").attr('data-id'));
+											var _str_2 = '<option value="">请选择</option>';
+											for (let j = 0; j < arr_.length; j++) {
+												_str_2 += '<option value="' + arr_[j]['id'] + '" data-latitude="' + arr_[j]['latitude'] + '" data-longitude="' + arr_[j]['longitude'] + '">' + arr_[j]['name'] + '</option>';
+											}
+											$(".shop_city_choose_site_list_line").eq(i).next().html(_str_2)
+											$(".shop_city_choose_site_list_line").eq(i).next().val(v.stations_id);
+										});
+									}
 			                    }
 			                }
 		                });