Merge branch 'dev' into supdev

pages/center/Piabodata/index.vue

@@ -249,20 +249,20 @@
 				totalTimeShow: false,
 				activeTab: 0,
 				numlist: [{
-						name: '接待量',
-						num: '10'
+						name: '接待客户',
+						num: ''
 					},
 					{
-						name: '接待客户',
-						num: '10'
+						name: '接待量',
+						num: ''
 					},
 					{
 						name: '平均执行率',
-						num: '10'
+						num: ''
 					},
 					{
 						name: '录音时长',
-						num: '10'
+						num: ''
 					},
 				],
 				lineOptsect: {

pages/center/consumer/consumerDetail.vue

@@ -932,6 +932,7 @@
 		// background: #FFFFFF;
 		overflow: hidden;
 		.tabactive1{
+			padding-bottom: 100rpx;
 			.content-tips{
 				background: #fff;
 				padding: 0 30rpx;

pages/center/records/index.vue

@@ -65,7 +65,7 @@
 				<view class="content-sec">
 					<view class="left">
 						<view class="cus">客户：{{item.name || '--'}} |</view>
-						<view class="arriveNum">{{item.visitRecord || "--"}}次到访</view>
+						<view class="arriveNum">第{{item.visitRecord || "--"}}次接待</view>
 					</view>
 					<view class="right">
 						<!-- {{item.fraction || '0'}}% | {{item.fraction || '0'}}分 -->

pages/mine/reception/addreception.vue

@@ -182,6 +182,7 @@
 							that.parames.agentId=res.assign.accountId;
 							that.baochunfun()
 						}else{
+							console.log("zo")
 							if(res.assign==null&&res.replacement==null){
 								that.baochunfun()
 							}else{
@@ -193,6 +194,7 @@
 									that.show=true;
 								}else{
 									that.daitiReceptionobj=res;
+									console.log(that.daitiReceptionobj)
 									that.content="此客户的顾问为【"+ res.owner.name +"】，确认让【"+ res.replacement.name +"】代接待吗？"
 									that.confirmtext=res.replacement.name +"代接代",//确认文字
 									that.canceltext=res.assign.name +'接待',//取消文字