Merge branch 'test'

application/app_broker/view/index/customerinfo_details_new.html

@@ -28,7 +28,7 @@
 		<div class="header_seat"></div>
 
 		<div class="info-area">
-			<div><img src="/app/images/ic_default_headpic.png" onerror="javascript:this.src='images/ic_default_headpic.png'" id="customer_pic" /></div>
+			<div><img src="/app/images/ic_default_headpic.png" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" id="customer_pic" /></div>
 			<div>
 				<p>客户姓名：<span id="name"></span></p>
 				<p>客户电话：
@@ -47,7 +47,7 @@
 				<ul>
 					<!--<li>
 						<div class="li-top">
-							<div class="li-top-left"><img src="/app/images/ic_default_headpic.png" onerror="javascript:this.src='images/ic_default_headpic.png'" /></div>
+							<div class="li-top-left"><img src="/app/images/ic_default_headpic.png" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" /></div>
 							<div class="li-top-right">
 								<div class="li-top-right-header">
 									<div>顾倾城【南京东路店】</div>
@@ -155,7 +155,7 @@
 
 		<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
 		<script src="/app/js/common.js?new39" charset="utf-8"></script>
-		<script src="/app/js/customerinfo_details_new.js?new43"></script>
+		<script src="/app/js/customerinfo_details_new.js?new44"></script>
 
 	</body>
 

public/app/css/achieve_temp.css

@@ -296,7 +296,7 @@ p.ul_title>span{
 	box-sizing: border-box;
 }
 p.ul_title_add>span{
-	font-size: 0.3rem;
+	font-size: 0.28rem;
 	color: #666;
 	line-height: .7rem;
 	text-align: center;

public/app/js/achieve_fork.js

@@ -55,9 +55,9 @@ require(['vue', 'vconsole', 'css!style/achieve_fork.css', 'jquery0325', 'common'
 			},
 			loadMain: function(){
 				var _this =this;
-				this.userLevel = localStorage.getItem('level');
-				this.linkAchieveYwy = 'achieve_ywy?ywyId='+localStorage.getItem('id');
-				this.linkAchieveQy = 'achieve_region?ywyId='+localStorage.getItem('id');
+				this.userLevel = localStorage.getItem('userlevel');
+				this.linkAchieveYwy = 'achieve_ywy?ywyId='+localStorage.getItem('userid');
+				this.linkAchieveQy = 'achieve_region?ywyId='+localStorage.getItem('userid');
 			}
 		}
 	});

public/app/js/achieve_region.js

@@ -71,7 +71,7 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
 		methods: {
 			loadMain: function() {
 				var _this = this;
-				_this.userLevel = localStorage.getItem('level');
+				_this.userLevel = localStorage.getItem('userlevel');
 				_this.token = localStorage.getItem('token');
 				if(_this.userLevel == '30'||_this.userLevel == '40'){
 					_this.headerTitle = '区域业绩';

public/app/js/achieve_ywy.js

@@ -79,7 +79,7 @@ require(['vue', 'css!style/achieve_tonglian_ac.css', 'jquery0325', 'common'], fu
 		methods: {
 			loadMain: function() {
 				var _this = this;
-				_this.userId = localStorage.getItem('id');
+				_this.userId = localStorage.getItem('userid');
 				_this.token = localStorage.getItem('token');
 				_this.initTime(function(start_date, end_date) {
 					_this.startDate = start_date;

public/app/js/common.js

@@ -119,7 +119,16 @@ function h5PageC(token, fn) {
 		success: function(data) {
 			if(typeof data === 'object'){
 				if(data['code'] == '200'){
-					setLoginStorage(data.data, token, 'agents');
+					localStorage.removeItem('id');
+			    	localStorage.removeItem('phone');
+			    	localStorage.removeItem('name');
+			    	localStorage.setItem('token', response.data.data.token);//存储登录的token值
+			    	localStorage.setItem('userid', response.data.data.id);//存储用户id
+			    	localStorage.setItem('userlevel', response.data.data.level);//存储用户id
+					localStorage.setItem('userphone', response.data.data.phone);//存储用户名字
+					localStorage.setItem('username', response.data.data.name);//存储用户电话号码
+			    	localStorage.setItem('userinfo', encodeURIComponent(JSON.stringify(response.data.data)));//存储用户所有信息
+					
 					fn(data);
 				}else{
 					try{
@@ -156,10 +165,10 @@ function setLoginStorage(data, _token, _usertable){
 	//每次登录成功，记录下token,用户身份类别,id,level
 	localStorage.setItem("token",_token);//存储登录的token值
 	//localStorage.setItem("openid",data.device_id);
-	localStorage.setItem("usertable",_usertable);//存储身份类型
+	//localStorage.setItem("usertable",_usertable);//存储身份类型
 	if(_usertable === "agents"){
 		//不是案场人员
-		localStorage.setItem("level",data.level);//不是案场人员时存储身份类型
+		localStorage.setItem("userlevel",data.level);//不是案场人员时存储身份类型
 		localStorage.removeItem("roleId");
 		localStorage.setItem('username',data.name);//存储用户名字
 	}else if(_usertable === "admins"){

public/app/js/customer_gj.js

@@ -74,7 +74,7 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu
 			loadMain: function() {
 				var _this = this;
 				_this.token = localStorage.getItem('token');
-				_this.userid = localStorage.getItem('id');
+				_this.userid = localStorage.getItem('userid');
 				_this.userName = localStorage.getItem('username');
 				$.ajax({
 					url: ServerHostTempC + "/broker/getFollowUpList",

public/app/js/customerinfo_customer_add.js

@@ -43,9 +43,9 @@ $(function() {
 function loadMain(){
 	var _token = localStorage.getItem('token'),
 		_customerId = getUrlParam('customerId'),
-		_userId = localStorage.getItem('id'), //用户id
-		_userName = localStorage.getItem('realname'),
-		_userPhone = localStorage.getItem('phone'),
+		_userId = localStorage.getItem('userid'), //用户id
+		_userName = localStorage.getItem('username'),
+		_userPhone = localStorage.getItem('userphone'),
 		_kefangObj = $('#kefang'),
 		ulHtml = $('.list-area'),
 		loadItem = $("#loading_pic"),

public/app/js/customerinfo_details_new.js

@@ -45,11 +45,11 @@ function loadMain(){
 		_genjinCloseBtn = $('#close_btn'),//跟进模态框关闭按钮
 		_btnSave = $('#btn_save'),//跟进的保存按钮
 		_btnSaveTemp = $('#btn_save_temp'),//跟进保存按钮临时
-		_userId = localStorage.getItem('id'),//当前用户id
+		_userId = localStorage.getItem('userid'),//当前用户id
 		isCallFlag = true,//是否是电话跟进，默认不是
 		_addPhoneBtn = $('#add_phone_btn'),//添加电话按钮
 		_addPhoneListObj = $('#call_modal_phone_list'),//添加电话列表对象dom
-		_userPhone = localStorage.getItem('phone'),//当前用户的手机号
+		_userPhone = localStorage.getItem('userphone'),//当前用户的手机号
 		_selectPhone = '',//拨号列表里选择的号码,也是当前用户对应的手机号，可能和_userPhone是一样的
 		_customerPhone = '',//当前客户的手机号
 		_backPhone = '';//绑定之后返回的号码
@@ -84,7 +84,7 @@ function loadMain(){
 	                _customerPhone = data['data']['user_info']['user_phone'];//当前客户手机号
 	                $('#customer_phone').html(hideTel(data['data']['user_info']['user_phone']));
 	                $('#call_modal_phone_self').val(_userPhone);
-	                if(data['data']['user_info']['agent_id'] == _userId || localStorage.getItem('level') != '10'){
+	                if(data['data']['user_info']['agent_id'] == _userId || localStorage.getItem('userlevel') != '10'){
 	                	//客方和当前登录用户一致,或者当前登录用户为店长或者总监时，才能进行编辑客户
 	                	$('.edit-icon').show();
 	                	$('.edit-btn').click(function(e){
@@ -111,7 +111,7 @@ function loadMain(){
 	                var _htmlTemp = '';
 	                if(data['data']['user_date'] && data['data']['user_date'].length > 0){
 	                	$.each(data['data']['user_date'], function(i, item) {
-		                	_htmlTemp += '<li><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=\'images/ic_default_headpic.png\'" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div></li>'.stringFormatObj({
+		                	_htmlTemp += '<li><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=\'/app/images/ic_default_headpic.png\'" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div></li>'.stringFormatObj({
 		                		'0': data['data']['agent_path']+item['img'],
 		                		'1': item['name'],
 		                		'2': item['step_name']=='phone_fllow_up'?'电话跟进:':(item['step_name']=='fllow_up'?'跟进:':''),

public/app/js/daily_achieve_dz.js

@@ -83,7 +83,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 				var _this = this;
 				_this.token = localStorage.getItem('token');
 				_this.userName = localStorage.getItem('username');
-				_this.userId = localStorage.getItem('id');
+				_this.userId = localStorage.getItem('userid');
 				$.ajax({
 					type: 'POST',
 					url: ServerHostTempC + '/broker/dayStatement',

public/app/js/daily_achieve_mdzj.js

@@ -80,7 +80,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 				var _this = this;
 				_this.token = localStorage.getItem('token');
 				_this.userName = localStorage.getItem('username');
-				_this.userId = localStorage.getItem('id');
+				_this.userId = localStorage.getItem('userid');
 				$.ajax({
 					type: 'POST',
 					url: ServerHostTempC + '/broker/dayStatement',

public/app/js/daily_achieve_ywy.js

@@ -74,7 +74,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 				var _this = this;
 				_this.token = localStorage.getItem('token');
 				_this.userName = localStorage.getItem('username');
-				_this.userId = localStorage.getItem('id');
+				_this.userId = localStorage.getItem('userid');
 				$.ajax({
 					type: 'POST',
 					url: ServerHostTempC + '/broker/dayStatement',

public/app/js/details.js

@@ -180,7 +180,7 @@ $(document).ready(function(e){
     var id=getUrlParam("id");
     var _usertable = localStorage.getItem('usertable');
     if(_usertable === 'agents'){
-    	var _level = localStorage.getItem('level');
+    	var _level = localStorage.getItem('userlevel');
     	if(_level == '4' || _level == '6'){
     		$('#caipan_link').css("display","block");
     	}

public/app/js/weekly.js

@@ -29,11 +29,11 @@ require(['vue', 'vconsole', 'css!style/weekly.css', 'jquery0325', 'common'], fun
 				var _this = this;
 				_this.dateEnd = backNowDate();
 				_this.dateStart = _this.countDate(_this.dateEnd, 6, 'jian');
-				_this.level = localStorage.getItem('level');
+				_this.level = localStorage.getItem('userlevel');
 				
 				//如果之前有存储的用户输入数据，则打开询问框
 				var _mdzjZbData = localStorage.getItem('mdzjZbData') == null?'':JSON.parse(decodeURIComponent(localStorage.getItem('mdzjZbData'))); //用户输入的存储
-				if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('id')){
+				if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('userid')){
 					layer.open({
 					    content: '您有未完成的内容，是否继续？',
 					    btn: ['前往', '留在本页'],

public/app/js/weekly_achieve_dz.js

@@ -11,7 +11,7 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
 
 	var _weekly_data = JSON.parse(decodeURIComponent(getUrlParam('weekly_data'))); //从url获取所需的参数，解码，转json格式
 	var _token = localStorage.getItem('token');
-	var _id = localStorage.getItem('id');
+	var _id = localStorage.getItem('userid');
 	var _userInfo = JSON.parse(decodeURIComponent(localStorage.getItem('userinfo'))); //用户信息
 
 	var vm = new Vue({

public/app/js/weekly_achieve_mdzj.js

@@ -29,7 +29,7 @@ $(function() {
 
 	function loadMain() {
 		var _token = localStorage.getItem('token');
-		var _id = localStorage.getItem('id');
+		var _id = localStorage.getItem('userid');
 		var _weekly_data = JSON.parse(decodeURIComponent(getUrlParam('weekly_data'))); //从url获取所需的参数，解码，转json格式
 		var _sjcnObjMbsz = $('#sjcn_mb_sz');
 		var _sjcnObjMbxz = $('#sjcn_mb_xz');
@@ -58,7 +58,7 @@ $(function() {
 				};
 			};
 			var _data = {
-				'userId': localStorage.getItem('id'),
+				'userId': localStorage.getItem('userid'),
 				'sjcn': {},
 				'zjyj': {},
 				'yjData': [],
@@ -129,8 +129,8 @@ $(function() {
 		//读取本地存储的用户输入文字和数字
 		function readLocalCache(_contentFlag, _dataServer, _timeFlag) {
 			console.log(_mdzjZbData);
-			//if((_mdzjZbData || _dataServer) && _mdzjZbData['userId'] == localStorage.getItem('id')) {
-			if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('id')) {
+			//if((_mdzjZbData || _dataServer) && _mdzjZbData['userId'] == localStorage.getItem('userid')) {
+			if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('userid')) {
 				if(_timeFlag) {
 					//判断日期是否是对应存储的日期，如果对得上才进入下边的内容
 					_sjcnObjMbsz.val(_mdzjZbData['sjcn']['mbsz'] == '' ? '' : _mdzjZbData['sjcn']['mbsz']);