bug修改

application/index/view/houses/edit.html

@@ -565,8 +565,8 @@
 										<input type="text" class="form-control" id="yingyeTime" data-alert="请填写营业时间！">
 									</div>
 									<div class="form-group">
-										<label for="">开盘时间</label>
-										<input type="date" class="form-control" id="kaipanTime" data-alert="请开盘开盘时间！">
+										<label for="">招商时间</label>
+										<input type="date" class="form-control" id="kaipanTime" data-alert="请开盘招商时间！">
 									</div>
 									<div class="form-group">
 										<label for="">开业时间</label>

public/resource/js/edit.js

@@ -95,10 +95,12 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
 				        	var _data = data['data'];
 				            if (data.code == 200) {
 				            	_objThis.upload_id = _data['upload_id'];
+				            	if(_data['shop_type'] !== undefined){
 				            		_shangpuTypeObj.val(_data['shop_type']).change().attr({
 					                	'disabled': 'disabled',
 					                	'title': '商铺类型暂不支持修改'
 					                });
+				            	}
 				                _showCdObj.val(_data['is_show']).change();
 				                _exclusiveTypeObj.val(_data['is_exclusive_type']).change();
 				                if(_data['shop_type'] == '0'){
@@ -174,10 +176,11 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
 				                $.each(_yetaiObj, function(i, item) {
 				                	~_data['industry_type'].indexOf(item.value) && (item.checked = 'checked');
 				                });
-				                $.each(_roomTagObj, function(i, item) {
+				                _data['shop_sign'] && $.each(_roomTagObj, function(i, item) {
 				                	~_data['shop_sign'].indexOf(item.value) && (item.checked = 'checked');
 				                });
 				                
+				                
 				                //房东手机号
 				                var _landlordNum = 0;
 				                $.each(_data['landlord_phone'].split(','), function(i, item) {
@@ -213,8 +216,8 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
 				                _trafficObj.val(_data['traffic']);//交通
 				                _hasMovedObj.val(_data['enter_num']);//已入住
 				                _yingyeTimeObj.val(_data['do_business_date']);//营业时间
-				                _kaipanTimeObj.val(_data['opening_date'].split(' ')[0]);//开盘时间
-				                _kaiyeTimeObj.val(_data['start_business_date'].split(' ')[0]);//开业时间
+				                _data['opening_date'] && _kaipanTimeObj.val(_data['opening_date'].split(' ')[0]);//开盘时间
+				                _data['start_business_date'] && _kaiyeTimeObj.val(_data['start_business_date'].split(' ')[0]);//开业时间
 				                _hasGasObj.val(_data['is_has_gas']);//是否有燃气
 				                _yongjinRuleObj.val(_data['fee_rule']);//佣金规则
 				                _internalYoushiObj.val(_data['internal_item_advantage']);//对内项目优势
@@ -242,7 +245,7 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
 						    	};
 						    	
 						    	//附件
-        						_pdfUploadFujian.html('<li class="pdf-pre-li"><a class="pdf-pre-a" href="{0}" target="_blank" title="点击查看">{1}</a><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
+        						_data['file_path'] && _pdfUploadFujian.html('<li class="pdf-pre-li"><a class="pdf-pre-a" href="{0}" target="_blank" title="点击查看">{1}</a><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
 						    		'0': _urlCut + _data['file_path'],
 						    		'1': dealFileName(decodeURI(_data['file_path'].slice(_data['file_path'].lastIndexOf('/')+1)))
 						    	}));