解决冲突

pages/center/Piabodata/Userinsightinto.vue

@@ -147,11 +147,11 @@
 					});
 				}else if(i==2){
 					uni.navigateTo({
-						url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=1'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd
+						url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=1&validInvalid=0'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd
 					});
 				}else{
 					uni.navigateTo({
-						url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=0'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd
+						url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=0&validInvalid=0'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd
 					});
 				}
 			},

pages/center/consumer/consumerDetail.vue

@@ -33,7 +33,7 @@
 						</view>
 					</view>
 					<view class="content-sec-lab">
-						顾问姓名：<view class="content-sec-lab1">{{customerInfo.agentName}}</view>
+						顾问姓名：<view class="content-sec-lab1">{{customerInfo.ownerName}}</view>
 					</view>
 					<view class="content-sec-lab">
 						添加时间：<view class="content-sec-lab1">{{customerInfo.createTime}}</view>

pages/center/records/index.vue

@@ -342,8 +342,9 @@
 				this.screen.validInvalid = options.validInvalid
 			}
 			if (options.staTime) {
+				
 				this.staTime = options.staTime;
-				this.endtime = options.endtime;
+				this.endtime = options.endtime+' 23:59:59';
 			}
 
 		},
@@ -555,6 +556,8 @@
 				let orderBy = 0;
 				if (this.activeTotal == 5) {
 					dateType = null;
+				} else if (this.activeTotal == 3) {
+					dateType = null;
 				} else if (this.activeTotal == 4) {
 					dateType = null;
 				} else {