Skip to content

T
tl_estate
Commit 89e173ce authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents e882005d c42bab48
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 46 deletions
application/index/view/houses/edit.html
View file @ 89e173ce
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
</div> </div>
</li> </li>
<!-- 案场人电话添加多个手机号--> <!-- 案场人电话添加多个手机号-->
<li class="list-group-item" id="li_acr_phone"> <!--<li class="list-group-item" id="li_acr_phone">
<div class="form-group phone-list-container" style="width: 70px;"> <div class="form-group phone-list-container" style="width: 70px;">
<label for="">案场人电话</label> <label for="">案场人电话</label>
</div> </div>
...@@ -346,13 +346,8 @@ ...@@ -346,13 +346,8 @@
<input type="tel" class="form-control phone_jia" placeholder="请输入"> <input type="tel" class="form-control phone_jia" placeholder="请输入">
<ul></ul> <ul></ul>
</div> </div>
<!--<div class="form-group phone-list-container">
<input type="tel" class="form-control phone_jia" placeholder="请输入">
<ul></ul>
<img src="/resource/image/search_gb.png" class="input-cancel-pic" />
</div>-->
<img src="/resource/image/jia2@2x.png" data-hideid='1' class="input-add-tel" id="acr_tel_jia" /> <img src="/resource/image/jia2@2x.png" data-hideid='1' class="input-add-tel" id="acr_tel_jia" />
</li> </li>-->
<li class="list-group-item" id="li_pf_phone"> <li class="list-group-item" id="li_pf_phone">
<div class="form-group phone-list-container" style="width: 70px;"> <div class="form-group phone-list-container" style="width: 70px;">
...@@ -452,7 +447,7 @@ ...@@ -452,7 +447,7 @@
<div class="form-group" id="li_landlord_phone_input"> <div class="form-group" id="li_landlord_phone_input">
<label for="internalName">房东手机号</label> <label for="internalName">房东手机号</label>
<div class="form-group phone-list-container landlord-form-group"> <div class="form-group phone-list-container landlord-form-group">
<input type="tel" class="form-control phone_jia" placeholder="请输入" name="landlordPhone" id="landlordPhone" data-alert="请填写房东手机号！"> <input type="tel" class="form-control phone_jia" placeholder="请输入" name="landlordPhone" id="landlordPhone" data-alert="请填写房东手机号！" data-addtype="landlord">
</div> </div>
<img src="/resource/image/jia2@2x.png" class="input-add-tel input-add-tel-landlord" data-addtype="landlord" id="landlord_tel_jia" /> <img src="/resource/image/jia2@2x.png" class="input-add-tel input-add-tel-landlord" data-addtype="landlord" id="landlord_tel_jia" />
</div><br> </div><br>
......
public/resource/js/edit.js
View file @ 89e173ce
...@@ -4,8 +4,10 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -4,8 +4,10 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
//初始化dot //初始化dot
user.event (); user.event ();
}, },
upload_id: 0,
event: function () { event: function () {
var _id = getUrlParam('id'),//地址栏获取的商铺或者街铺id var _objThis = this,//user对象
_id = getUrlParam('id'),//地址栏获取的商铺或者街铺id
_doc = $(document), _doc = $(document),
_urlCut = location.origin + '/resource/lib/Attachments/images/',//要截取的部分url _urlCut = location.origin + '/resource/lib/Attachments/images/',//要截取的部分url
_loadMainItem = $('#main_loading_pic'),//整个页面的加载图标 _loadMainItem = $('#main_loading_pic'),//整个页面的加载图标
...@@ -70,12 +72,19 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -70,12 +72,19 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
}; };
if(_id != null){ if(_id != null){
var _source = getUrlParam('source');
var _sublet_id = getUrlParam('sublet_id');
var _data = {
'id': _id
};
if(_source){
_data['source'] = _source;
_data['sublet_id'] = _sublet_id;
};
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: '/index/houseEdit', url: '/index/houseEdit',
data: { data: _data,
'id': _id
},
timeout: 30000, timeout: 30000,
dataType: 'json', dataType: 'json',
beforeSend: function() { beforeSend: function() {
...@@ -85,6 +94,7 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -85,6 +94,7 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
if(typeof data === 'object') { if(typeof data === 'object') {
var _data = data['data']; var _data = data['data'];
if (data.code == 200) { if (data.code == 200) {
_objThis.upload_id = _data['upload_id'];
_shangpuTypeObj.val(_data['shop_type']).change().attr({ _shangpuTypeObj.val(_data['shop_type']).change().attr({
'disabled': 'disabled', 'disabled': 'disabled',
'title': '商铺类型暂不支持修改' 'title': '商铺类型暂不支持修改'
...@@ -120,18 +130,18 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -120,18 +130,18 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
}; };
//案场人电话 //案场人电话
var _phoneNum = 0; // var _phoneNum = 0;
for(var i in _data['phone']){ // for(var i in _data['phone']){
if(_phoneNum == 0){ // if(_phoneNum == 0){
$('#acr_tel_jia').prev().find('input').val(_data['phone'][i]['name']+'-'+_data['phone'][i]['phone']).attr('data-id',_data['phone'][i]['id']); // $('#acr_tel_jia').prev().find('input').val(_data['phone'][i]['name']+'-'+_data['phone'][i]['phone']).attr('data-id',_data['phone'][i]['id']);
}else{ // }else{
$('#acr_tel_jia').before('<div class="form-group phone-list-container"><input type="tel" class="form-control phone_jia" placeholder="请输入" value="{0}" data-id="{1}"><ul></ul><img src="/resource/image/search_gb.png" class="input-cancel-pic"></div>'.stringFormatObj({ // $('#acr_tel_jia').before('<div class="form-group phone-list-container"><input type="tel" class="form-control phone_jia" placeholder="请输入" value="{0}" data-id="{1}"><ul></ul><img src="/resource/image/search_gb.png" class="input-cancel-pic"></div>'.stringFormatObj({
'0': _data['phone'][i]['name']+'-'+_data['phone'][i]['phone'], // '0': _data['phone'][i]['name']+'-'+_data['phone'][i]['phone'],
'1': _data['phone'][i]['id'] // '1': _data['phone'][i]['id']
})); // }));
}; // };
_phoneNum++; // _phoneNum++;
}; // };
//盘方 //盘方
var _panfangNum = 0; var _panfangNum = 0;
...@@ -174,7 +184,7 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -174,7 +184,7 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
if(_landlordNum === 0){ if(_landlordNum === 0){
$('#landlord_tel_jia').prev().find('input').val(item); $('#landlord_tel_jia').prev().find('input').val(item);
}else{ }else{
$('#landlord_tel_jia').before('<div class="form-group phone-list-container landlord-form-group"><input type="tel" class="form-control phone_jia" placeholder="请输入" value="{0}"><img src="/resource/image/search_gb.png" class="input-cancel-pic"></div>'.stringFormatObj({ $('#landlord_tel_jia').before('<div class="form-group phone-list-container landlord-form-group"><input type="tel" class="form-control phone_jia" placeholder="请输入" value="{0}" data-addtype="landlord"><img src="/resource/image/search_gb.png" class="input-cancel-pic"></div>'.stringFormatObj({
'0': item '0': item
})); }));
}; };
...@@ -572,9 +582,10 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -572,9 +582,10 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
var _maxLen = _addType==='landlord'?3:5; var _maxLen = _addType==='landlord'?3:5;
var _htmlStrTemp = _addType==='landlord'?'':'<ul></ul>'; var _htmlStrTemp = _addType==='landlord'?'':'<ul></ul>';
if(_this.parent().find('.phone_jia').length < _maxLen){ if(_this.parent().find('.phone_jia').length < _maxLen){
_this.before('<div class="form-group phone-list-container{0}"><input type="tel" class="form-control phone_jia" placeholder="请输入">{1}<img src="/resource/image/search_gb.png" class="input-cancel-pic" /></div>'.stringFormatObj({ _this.before('<div class="form-group phone-list-container{0}"><input type="tel" class="form-control phone_jia" placeholder="请输入" {2}>{1}<img src="/resource/image/search_gb.png" class="input-cancel-pic" /></div>'.stringFormatObj({
'0': _addType==='landlord'?' landlord-form-group':'', '0': _addType==='landlord'?' landlord-form-group':'',
'1': _addType==='landlord'?'':'<ul></ul>' '1': _addType==='landlord'?'':'<ul></ul>',
'2': _addType==='landlord'?'data-addtype="landlord"':''
})); }));
}else{ }else{
alert('最多添加'+_maxLen+'个'); alert('最多添加'+_maxLen+'个');
...@@ -726,18 +737,18 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -726,18 +737,18 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
}; };
//验证案场联系人是否填写 //验证案场联系人是否填写
var _acrPhoneArr = []; // var _acrPhoneArr = [];
$.each($('#li_acr_phone input'), function(i,item) { // $.each($('#li_acr_phone input'), function(i,item) {
var _id = item.getAttribute('data-id'); // var _id = item.getAttribute('data-id');
if(_id !== undefined && _id !== null){ // if(_id !== undefined && _id !== null){
_acrPhoneArr.push(item.value); // _acrPhoneArr.push(item.value);
}; // };
}); // });
console.log(_acrPhoneArr); // console.log(_acrPhoneArr);
if(_acrPhoneArr.length<1){ // if(_acrPhoneArr.length<1){
alert('案场人电话至少需要选择一个!'); // alert('案场人电话至少需要选择一个!');
return false; // return false;
}; // };
//验证盘方是否填写 //验证盘方是否填写
var _pfPhoneArr = []; var _pfPhoneArr = [];
...@@ -957,9 +968,9 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -957,9 +968,9 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
}); });
}; };
$.each(_acrPhoneArr, function(i, item) { // $.each(_acrPhoneArr, function(i, item) {
_data['phone['+i+']'] = item; // _data['phone['+i+']'] = item;
}); // });
$.each(_liebiaoPicObj, function(i, item) { $.each(_liebiaoPicObj, function(i, item) {
_data['cover['+i+']'] = item.src.replace(_urlCut ,''); _data['cover['+i+']'] = item.src.replace(_urlCut ,'');
}); });
...@@ -972,7 +983,12 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () { ...@@ -972,7 +983,12 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
if(_fujianObj.length === 1){ if(_fujianObj.length === 1){
_data['file_path'] = _fujianObj[0].href.replace(_urlCut ,'');//附件取得是herf值 _data['file_path'] = _fujianObj[0].href.replace(_urlCut ,'');//附件取得是herf值
}; };
_id != null && (_data['id'] = _id);//当为编辑时，要传入id
//当为编辑时，要传入id
if(_id != null){
_data['id'] = _id;
_data['upload_id'] = _objThis.upload_id;
};
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: '/index/houseEdit', url: '/index/houseEdit',
......
public/resource/js/user.js
View file @ 89e173ce
...@@ -56,9 +56,9 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', ' ...@@ -56,9 +56,9 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
$ (document).delegate (".genj_ure", "click", function () { $ (document).delegate (".genj_ure", "click", function () {
user.user_id = $ (this).attr ("data-id"); user.user_id = $ (this).attr ("data-id");
$("#genj_text").val(''); $("#genj_text").val('');
$("input[name = 'user_status']:checked").removeAttr("checked"); // $("input[name = 'user_status']:checked").removeAttr("checked");
// $("input[name = 'user_status']:checked").attr("checked",true); $("input[name = 'user_status']:checked").attr("checked",true);
user.getGenjinLabel(); user.getGenjinLabel();
}); });
// ===========================新增客户==================== // ===========================新增客户====================
...@@ -469,7 +469,10 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', ' ...@@ -469,7 +469,10 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
if (data.code == 200 && data.data != null) { if (data.code == 200 && data.data != null) {
$("input[type='radio'][name='user_status'][value="+data.data+"]").attr("checked", "checked"); //
// user.user_id = $ (this).attr ("data-id");
console.log(user.user_id);
$("input[type='radio'][name='user_status'][value="+data.data+"]").prop("checked", "checked");
} }
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment