Commit 5294359e authored by clone's avatar clone

Merge branch '0822-v2.8' into test

parents 62d523b2 163b8ece
...@@ -1712,8 +1712,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -1712,8 +1712,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
$.ajax({ $.ajax({
url:'/broker/useraction_search', url:'/broker/useraction_search',
// url: 'https://pre2.tonglianjituan.com'+'/broker/useraction_search', type: 'POST',
type: 'GET',
async: true, async: true,
data: { data: {
"AuthToken": user_info_obj.AuthToken, "AuthToken": user_info_obj.AuthToken,
......
...@@ -29,6 +29,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -29,6 +29,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
main_select : false , // true : 开启高级搜索 ,false :关闭高级搜索 main_select : false , // true : 开启高级搜索 ,false :关闭高级搜索
init: function() { init: function() {
//初始化dot //初始化dot
business.getDistrict(); business.getDistrict();
$("body").append(template); $("body").append(template);
$('.J_preview').preview();//放大收款图片 $('.J_preview').preview();//放大收款图片
...@@ -508,8 +509,8 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -508,8 +509,8 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
} else if ( ( business.name + '-' + business.phone ) === data.data.name) { } else if ( ( business.name + '-' + business.phone ) === data.data.name) {
$('.is_dujia').find('input').removeAttr("readonly"); $('.is_dujia').find('input').removeAttr("readonly");
} else { } else {
$('.is_dujia').find('input').removeAttr("readonly"); //$('.is_dujia').find('input').removeAttr("readonly");
//$('input').attr("readonly","readonly") $('.is_dujia').find('input').attr("readonly","readonly")
} }
} }
} else { } else {
......
...@@ -1349,7 +1349,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home ...@@ -1349,7 +1349,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
}); });
}, },
//客户编辑 修改记录 //客户编辑 修改记录
Caozuorecord: function() {//获取客户动态 Caozuorecord: function() {
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
checkLogin(); checkLogin();
$.ajax({ $.ajax({
...@@ -1628,7 +1628,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home ...@@ -1628,7 +1628,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
$.ajax({ $.ajax({
url:'/broker/useraction_search', url:'/broker/useraction_search',
// url: 'https://pre2.tonglianjituan.com'+'/broker/useraction_search', // url: 'https://pre2.tonglianjituan.com'+'/broker/useraction_search',
type: 'GET', type: 'POST',
async: true, async: true,
data: { data: {
"AuthToken": user_info_obj.AuthToken, "AuthToken": user_info_obj.AuthToken,
......
...@@ -1588,7 +1588,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -1588,7 +1588,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
user.pageNo = pageNo; user.pageNo = pageNo;
var params = {}; var params = {};
/*params.agent_id = user_info_obj.id;*/
params.agent_id = this.all_custom ? '' : user_info_obj.id ; params.agent_id = this.all_custom ? '' : user_info_obj.id ;
params.user_nick = $.trim($("input[name='user']").val()); params.user_nick = $.trim($("input[name='user']").val());
params.phone = $.trim($("input[name='phone']").val()); params.phone = $.trim($("input[name='phone']").val());
...@@ -1929,7 +1928,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -1929,7 +1928,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
checkLogin(); checkLogin();
$.ajax({ $.ajax({
url:'/broker/useraction_search', url:'/broker/useraction_search',
type: 'GET', type: 'POST',
async: true, async: true,
data: { data: {
"AuthToken": user_info_obj.AuthToken, "AuthToken": user_info_obj.AuthToken,
......
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