编辑等修改

application/app_broker/view/index/shop_detail_pc.html

@@ -49,7 +49,7 @@
 								<td colspan="2">商务条款：{{signRule()}}</td>
 							</tr>
 							<tr>
-								<td colspan="2">对内项目优势：{{d.internal_item_advantage}}</td>
+								<!--<td colspan="2">对内项目优势：{{d.internal_item_advantage}}</td>-->
 								<td colspan="2">标签：{{d.shop_sign}}</td>
 							</tr>
 							<tr>
@@ -60,6 +60,18 @@
 							<tr>
 							    <td colspan="4">经纪人对本铺的评价：{{d.external_item_advantage}}</td>
 							</tr>
+							<tr>
+							    <td colspan="4">周边配套：{{d.rim_mating}}</td>
+							</tr>
+							<tr>
+							    <td colspan="4">所处地段：{{d.section}}</td>
+							</tr>
+							<tr>
+							    <td colspan="4">附近人流：{{d.crowd}}</td>
+							</tr>
+							<tr>
+							    <td colspan="4">其他补充：{{d.other}}</td>
+							</tr>
 							<tr>
 								<td>面宽：{{d.area_width}}米</td>
 								<td>进深：{{d.depth}}米</td>

application/index/view/houses/edit.html

@@ -199,9 +199,9 @@
 											<label class="">电&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;压 :</label>
 											<select class="form-control half" name="dianya" id="dianya" data-alert="请选择电压">
 												<option value="">请选择</option>
-												<option value="220">220</option>
-												<option value="380">380</option>
-											</select>&nbsp;&nbsp;伏
+												<option value="220">220v</option>
+												<option value="380">380v</option>
+											</select>
 										</div>
 										<div class="col-xs-3 p-t-10">
 											<label class="">燃&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;气: </label>
@@ -308,7 +308,7 @@
 										<label for="">签约年限</label>
 										<div class="input-group">
 											<input type="number" class="form-control input-100-width" id="qianyueNianxian" placeholder="请填写" data-alert="请填写签约年限上限！">
-											<div class="input-group-addon shangchang-show-part">至</div>
+											<div class="input-group-addon">至</div>
 											<input type="number" class="form-control input-100-width" id="qianyueNianxian2" placeholder="请输入" data-alert="请填写签约年限下限！">
 											<div class="input-group-addon">年</div>
 										</div>

public/resource/js/shop_edit.js

@@ -79,7 +79,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 				_exclusiveDate2Obj = $('#exclusiveDate2'), //独家代理有效期结束时间
 				_exclusiveTelObj = $('#exclusiveTel'), //独家方电话
 				_imgUploadDujia = $('#dujia_pic_ul'), //独家合同ul
-				_imgMaskObj = $('#img_mask_area'); //预览大图的mask
+				_imgMaskObj = $('#img_mask_area'), //预览大图的mask
 				_laiyuanObj = $('#laiyuan'); // 来源
 			
 			//对商户显示的装让费默认隐藏
@@ -170,8 +170,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 								if(data.code == 200) {
 									_foreignYoushiObj.val(_data['rim_mating']); //对外项目优势
 									_suoshudiduanObj.val(_data['section']); //所属地段
-									_fujinrenliuObj.val(_data['section']); //附近人流
-									_qitabuchongObj.val(_data['section']); //其他补充
+									_fujinrenliuObj.val(_data['crowd']); //附近人流
+									_qitabuchongObj.val(_data['other']); //其他补充
 									_objThis.upload_id = _data['upload_id'];
 									if(_data['shop_type'] !== undefined) {
 										//.change()之后，自动执行相关显示隐藏操作
@@ -795,7 +795,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 					$('.has-housed').html('当前商铺业态');//
 					_jinchangPriceObj.attr('data-alert','请填写对内转让费！').parent().prev().html('对内转让费');
 					_roomArea1Obj.attr('data-alert','请填写建筑面积！').parent().prev().html('建筑面积');
-					_businessAreaObj.attr('data-alert','请填写建筑面积！').parent().prev().html('建筑面积');
+					_businessAreaObj.attr('data-alert','请填写使用面积！').parent().prev().html('使用面积');
 					$('.shangchang-show-part').hide();
 					$.trim(_roomAllNumObj.val()) == '' && _roomAllNumObj.val(1);
 					$.trim(_roomShengyuNumObj.val()) == '' && _roomShengyuNumObj.val(1);

public/resource/template/reportList_template_tpl.html

@@ -2,13 +2,14 @@
     [% if(it["list"] && it["list"].length && it["list"].length>0) { %]
     [% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
     [% var sw2=function(s){switch(Number(s)){case 0:return"一级";case 1:return"二级";case 2:return"三级";case 3:return"已结单";default:return s}}; %]
+    [% var sw3=function(s){switch(Number(s)){case 0:return"btn-success";default:return "btn-warning"}}; %]
     [% for(var item in it["list"]){ %]
     <tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]">
     	<td class="text-center" >行号 </td>
     	<td class="text-center" >
     		[%= it["list"][item]['id'] %]
     		[% if(it["step"]==10) { %]
-    			&nbsp;<span class="btn1 btn-success btn-xs">[%= sw2(it["list"][item]['audit_level']) %]</span>
+    			&nbsp;<span class="btn1 [%= sw3(it['list'][item]['audit_level']) %] btn-xs">[%= sw2(it["list"][item]['audit_level']) %]</span>
 			[% } %]
     	</td>
         <td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td>