客户详情修改

application/app_broker/view/index/customerinfo_details_new.html

@@ -32,8 +32,9 @@
 			<div class="flex-center"><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><span class="edit-btn"><img src="/app/images/boy_ic@2x.png" class="sex-icon" /></span></p>
-				<p><a href="javascript:;" id="call_list_open_btn" class="flex-center"><span id="customer_phone"></span><img src="/app/images/ic_tel.png" /></a></p>
+				<p><a href="javascript:;" id="call_list_open_btn" class="flex-center"><span id="customer_id">客户ID：0，</span><span id="customer_phone"></span><img class="call-btn" src="/app/images/ic_tel.png" /></a></p>
 				<p><span class="flex-center" id="industry_type"></span><span class="flex-center" id="price_demand"></span><span class="flex-center" id="area_demand"></span></p>
+				<p id="add_city_type_area"></p>
 			</div>
 		</div>
 
@@ -78,8 +79,8 @@
 					<p>客源编号：<span id="customer_code"></span></p>
 					<!--<p>客户姓名：<span class="edit-btn"><span id="customer_name"></span><img class="edit-icon" src="/app/images/ic_bianji.png" /></span></p>
 					<p>性别：<span class="edit-btn"><span id="customer_sex"></span><img src="/app/images/boy_ic@2x.png" class="sex-icon" /><img class="edit-icon" src="/app/images/ic_bianji.png" /></span></p>-->
-					<p>客方：<span><span id="kefang"></span></span></p>
-					<p>邀请人：<span id="yaoqingren"></span></p>
+					<p>客方：<span id="kefang"></span><img class="call-btn call-btn-other" src="/app/images/ic_tel.png" /></p>
+					<p>邀请人：<span id="yaoqingren"></span><img class="call-btn call-btn-other" src="/app/images/ic_tel.png" /></p>
 					<p>VIP客户(客方和有权限的人才能看到)：<span id="isvip"></span></p>
 					<p>产生类型：<span id="create_type"></span></p>
 					<p>创建时间：<span id="add_time"></span></p>

public/app/css/customerinfo_details_new.css

@@ -52,12 +52,10 @@ header .icon-link{
 	/*color: #333;*/
 	color: #1a1a1a;
 }
-.info-area>div:nth-of-type(2)>p:nth-of-type(2)>a>img{
+.call-btn{
 	width: .3rem;
 	height: .3rem;
 	margin-left: .2rem;
-	position: relative;
-	top: -0.03rem;
 }
 .info-area>div:nth-of-type(2)>p:nth-of-type(3)>span{
 	display: flex;
@@ -73,6 +71,20 @@ header .icon-link{
 .info-area>div:nth-of-type(2)>p:nth-of-type(3)>span:nth-of-type(2){
 	flex: 1.8rem 0 0;
 }
+#add_city_type_area{
+	padding-top: .05rem;
+}
+#add_city_type_area>span{
+	font-size: .24rem;
+	color: #b2b2b2;
+	background-color: #f5f5f5;
+	height: .34rem;
+	padding: .02rem .1rem;
+	border-radius: .05rem;
+}
+#add_city_type_area>span+span{
+	margin-left: 1em;
+}
 
 .edit-btn{
 	display: flex;

public/app/js/customerinfo_details_new.js

@@ -92,8 +92,8 @@ function loadMain(){
 	                $('#price_demand').html(data['data']['user_info']['price_demand']+'元/月');
 	                $('#area_demand').html(data['data']['user_info']['area_demand']+'㎡');
 	                
-	                $('#kefang').html(data['data']['user_info']['agentinfo']);
-	                $('#yaoqingren').html(data['data']['user_info']['referrer_user']);//邀请人
+	                $('#kefang').html(data['data']['user_info']['agentinfo']).attr('data-tel',data['data']['user_info']['agentinfo'].split('-')[1]);
+	                $('#yaoqingren').html(data['data']['user_info']['referrer_user']).attr('data-tel',data['data']['user_info']['agentinfo'].split('-')[1]);//邀请人
 	                $('#isvip').html(data['data']['user_info']['vip']?'是':'否');//是否是vip
 	                if(data['data']['user_info']['source'] == 10){
 	                	$('#create_type').html('APP注册');//产生类型
@@ -105,8 +105,30 @@ function loadMain(){
 	                $('#add_time').html(data['data']['user_info']['create_time']);//创建时间
 	                $('#customer_pic').attr('src',data['data']['user_info']['user_pic']);
 	                _customerPhone = data['data']['user_info']['user_phone'];//当前客户手机号
+	                $('#customer_id').html('客户ID：'+_customerId+'，');
 	                $('#customer_phone').html(hideTel(data['data']['user_info']['user_phone']));
 	                $('#call_modal_phone_self').val(_userPhone);
+	                
+	                function landlordType(m) {
+	                	var _m = Number(m);
+	                	if(m === 0){
+	                		return '普通用户';
+	                	}else if(m === 1){
+	                		return '是租客也是房东';
+	                	}else if(m === 2){
+	                		return '纯房东';
+	                	}else{
+	                		return 'other';
+	                	}
+	                };
+	                
+	                $('#add_city_type_area').html('<span class="flex-center">{0}</span><span class="flex-center">{1}</span>'.stringFormatObj({
+	                	'0': data['data']['user_info']['city']+data['data']['user_info']['disc'],
+	                	'1': landlordType(data['data']['user_info']['user_label'])
+	                }));
+	                
+	                
+	                
 	                if(data['data']['user_info']['agent_id'] == _userId || localStorage.getItem('userlevel') != '10'){
 	                	//客方和当前登录用户一致,或者当前登录用户为店长或者总监时，才能进行编辑客户
 	                	$('#edit_btn').show().click(function(e){
@@ -562,11 +584,40 @@ function loadMain(){
 		_callModal.hide();
 	});
 	
+	//点击头部区域拨打电话出现弹窗部分
 	$('#call_list_open_btn').click(function(e){
 		e.preventDefault();
 		e.stopPropagation();
 		_callModal.show();
 	});
+	
+	$('.call-btn-other').click(function(e){
+		e.preventDefault();
+		e.stopPropagation();
+		var _this = $(this);
+		var _tel = _this.prev().attr('data-tel');
+		console.log(_tel)
+		if(is_mobile(_tel) == 1){
+			Compatible({
+				paraIos: {
+					'route': 'call',
+					'phone': _backPhone
+				},
+				fnAndroid: function() {
+					window.android.onPhoneCall(_backPhone);
+				},
+				fn: function() {
+					console.warn('error');
+				}
+			});
+		}else{
+			layer.open({
+				content: '所选的号码格式不正确',
+				skin: 'msg',
+				time: 2
+			});
+		};
+	});
 	_doc.on('click','#call_modal_phone_list>li',function(e){
 		e.preventDefault();
 		e.stopPropagation();

public/appnew/src/assets/js/public.js

@@ -74,7 +74,7 @@ export default {
 	achieveInitTimeThisMoon(callback) {
 		let _this = this;
 		let _enddate = _this.backNowDate();
-		let _startdate = _this.countDate(_enddate, 30, 'jian');
+		let _startdate = _enddate.substr(0, _enddate.length - 2) + '01';
 		callback(_startdate, _enddate);
 	},
 	countDate: function(date1, days, countType) {

public/appnew/src/components/achieveMain/achieveAgent.vue

@@ -371,7 +371,7 @@
 					if(_tempTimeNow === _tempTimeStart && _tempTimeNow === _tempTimeEnd) {
 						console.log('搜索为今天');
 					} else {
-						if(_tempTimeStart > _tempTimeEnd || _tempTimeEnd >= _tempTimeNow) {
+						if(_tempTimeStart > _tempTimeEnd) {
 							layer.open({
 								content: '开始时间不能大于结束时间，请重新选择日期',
 								btn: ['确定', '取消'],

public/appnew/src/components/achieveMain/achieveFork.vue

@@ -37,28 +37,28 @@
 					<li v-for="(item2, index2) in item.listData">
 						<achieve-fork-li :data="item2" :dataindex="index2"></achieve-fork-li>
 					</li>
-					<li class="self-achieve-li" v-if="mainData[index].selfData">
+					<li class="self-achieve-li" v-if="(item.listData.length>0) && (mainData[index].selfData)">
 						<achieve-fork-li :data="mainData[index].selfData" :dataindex="mainData[index].selfData.index_-1"></achieve-fork-li>
+						<!--<achieve-fork-li :data="mainData[index].selfData" :dataindex="9"></achieve-fork-li>-->
 					</li>
 				</ul>
-				<!--<div class="no-more-block" v-if="item.listData.length>0">没有更多了...</div>
-				<div class="no-data-block" v-else>暂无数据...</div>-->
+				<div class="no-data-block" v-show="item.listData.length===0">暂无数据...</div>
 				<footer class="oh achieve-footer">
-					<p class="time-title tc">统计时间：{{statisticsStartTime+'-'+statisticsEndTime}}</p>
+					<p class="time-title tc" v-show="false">统计时间：{{statisticsStartTime+'-'+statisticsEndTime}}</p>
 					<div class="btn-area" v-show="index<2">
 						<!--<div class="oh">
-							<a class="fl" :href="linkAchieveYwy">个人业绩</a>
+							<a class="fl" :href="linkAchieveYwy">本人业绩</a>
 						</div>
 						<div class="oh" v-if="userLevel!=10">
 							<a v-if="userLevel==20" :href="linkAchieveQy">门店业绩</a>
-							<a v-else :href="linkAchieveQy">区域业绩</a>
+							<a v-else :href="linkAchieveQy">分部业绩</a>
 						</div>-->
 						<div class="oh">
-							<a class="fl" href="javascript:;" @click="goPageAgent">个人业绩</a>
+							<a class="fl" href="javascript:;" @click="goPageAgent">本人业绩</a>
 						</div>
 						<div class="oh" v-if="userLevel!=10">
 							<a v-if="userLevel==20" href="javascript:;" @click="goPageRegion">门店业绩</a>
-							<a v-else href="javascript:;" @click="goPageRegion">区域业绩</a>
+							<a v-else href="javascript:;" @click="goPageRegion">分部业绩</a>
 						</div>
 					</div>
 				</footer>
@@ -92,7 +92,7 @@
 				'topLineNum': 5,
 				'listData': [],
 				'selfData': {
-					'index_': 4
+					'index_': 1
 				}
 			}, {
 				'title': '门店排行',
@@ -100,7 +100,7 @@
 				'topLineNum': 5,
 				'listData': [],
 				'selfData': {
-					'index_': 4
+					'index_': 1
 				}
 			}, {
 				'title': '部门排行',
@@ -182,7 +182,7 @@
 								_this.statisticsEndTime = response.data.data.end_time.replace(/-/g, '.');
 								_this.mainData[_index].listData = response.data.data.list.slice(0, _this.mainData[_index].topLineNum);
 								if(_index < 2){
-									//部门业绩（即区域业绩）时不需要这个
+									//部门业绩（即分部业绩）时不需要这个
 									_this.mainData[_index].selfData = response.data.data.list.filter(function(item, index, array) {
 										if(_index === 0){
 											//人员排行
@@ -232,7 +232,7 @@
 					'topLineNum': 5,
 					'listData': [],
 					'selfData': {
-						'index_': 4
+						'index_': 1
 					}
 				}, {
 					'title': '门店排行',
@@ -240,7 +240,7 @@
 					'topLineNum': 5,
 					'listData': [],
 					'selfData': {
-						'index_': 4
+						'index_': 1
 					}
 				}, {
 					'title': '部门排行',
@@ -410,7 +410,7 @@
 		padding-top: 0;
 	}
 	.main-sec:nth-of-type(3)>ul{
-		padding-bottom: 1.3rem;
+		/*padding-bottom: 1.3rem;*/
 	}
 	footer>.btn-area {
 		display: flex;

public/appnew/src/components/achieveMain/achieveRegion.vue

@@ -47,8 +47,8 @@
 			<ul class='achieve_zz_ul' v-for="(item,index) in tabsMain" :key="item.title" v-show="index == initTabNumMain" :id="'listall_'+index">
 				<li class="flex" v-for="(item2,index2) in item.dataList" :data-id="item2.store_id">
 					<div class="db-line">
-						<div class="ellipsis">{{item2.store_name}}</div>
-						<div class="ellipsis">{{item2.name}}</div>
+						<!--<div class="ellipsis">{{item2.store_name}}</div>-->
+						<div>{{item2.name}}</div>
 					</div>
 					<div class="flex-center">{{item2.add_house_num}}</div>
 					<div class="flex-center">{{item2.add_user_num}}</div>
@@ -227,7 +227,7 @@
 					if(_tempTimeNow === _tempTimeStart && _tempTimeNow === _tempTimeEnd) {
 						console.log('搜索为今天');
 					} else {
-						if(_tempTimeStart > _tempTimeEnd || _tempTimeEnd >= _tempTimeNow) {
+						if(_tempTimeStart > _tempTimeEnd) {
 							layer.open({
 								content: '开始时间不能大于结束时间，请重新选择日期',
 								btn: ['确定', '取消'],