commit -m 资料备注

components/cm-module/cm-seller/cm-screen-drawer.vue

@@ -14,14 +14,14 @@
 						<view class="drawer-main-time">
 							<view class="drawer-main-time-input">
 								<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindStartDateChange">
-									<text class="input-text">{{ startTime }}</text>
+									<text class="input-text">{{ queryData.startAddTime }}</text>
 								</picker>
 								<text class="iconfont icon-riqi"></text>
 							</view>
 							<view class="line">-</view>
 							<view class="drawer-main-time-input">
 								<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindEndDateChange">
-									<text class="input-text">{{ endTime }}</text>
+									<text class="input-text">{{ queryData.endAddTime }}</text>
 								</picker>
 								<text class="iconfont icon-riqi"></text>
 							</view>
@@ -53,11 +53,11 @@
 								:key="index"
 								@click="choiceGroups(group, index)"
 							>
-								{{ group.name }}
+								{{ group.leaderName }}
 							</view>
 						</view>
-						<view class="drawer-main-name">组员</view>
-						<view class="drawer-main-brand clearfix">
+						<view class="drawer-main-name" v-if="members.length>0">组员</view>
+						<view class="drawer-main-brand clearfix" v-if="members.length>0">
 							<view
 								class="drawer-brand-list"
 								:class="member.isChecked ? 'checked' : ''"
@@ -65,7 +65,7 @@
 								:key="index"
 								@click="choiceMembers(member, index)"
 							>
-								{{ member.name }}
+								{{ member.groupName }}
 							</view>
 						</view>
 					</view>
@@ -100,36 +100,26 @@ export default {
 			checkedGroupsIndex: 0,
 			checkedMemberIndex: 0,
 			isShowClose: false,
-			listQuery: {
-				serviceProviderId: 0,
-				pageNum: 1,
-				pageSize: 100
-			},
 			dataList: [],
 			date: currentDate,
-			startTime:'开始日期',
-			endTime:'结束日期',
 			height: 0,
 			drawerH: 0 ,// 抽屉内部scrollview高度
 			categorys:[],
 			checkedCategorysList:[],
-			groups:[
-				{name:'张顺星',isChecked:false},
-				{name:'高琳琳',isChecked:false},
-			],
-			members:[
-				{name:'张三',isChecked:false},
-				{name:'张三',isChecked:false},
-				{name:'张三',isChecked:false},
-				{name:'张三',isChecked:false},
-				{name:'张三',isChecked:false},
-			]
+			groups:[],
+			members:[],
+			queryData:{
+				startAddTime:'开始日期',
+				endAddTime:'结束日期',
+				consult:'',
+				leaderId:0,
+				groupId:0,
+			}
 		}
 	},
 	created() {
-		console.log('11111111')
 		this.SetScrollHeight()
-		this.initCategorysList()
+		this.getUserClubConsults()
 	},
 	computed: {
 		startDate() {
@@ -140,13 +130,39 @@ export default {
 		}
 	},
 	methods: {
-		initCategorysList() {
+		getUserClubConsults() {
+			//查询咨询类别
 			this.UserService.getUserClubConsults()
 				.then(response => {
 					this.categorys = response.data.map((el, index) => {
 						el.isChecked = false
 						return el
 					})
+					this.getUserClubTeams()
+				})
+				.catch(error => {
+					console.log('=========>获取咨询类别列表失败')
+				})
+		},
+		getUserClubTeams() {
+			this.UserService.getUserClubTeams()
+				.then(response => {
+					this.groups = response.data.map((el, index) => {
+						el.isChecked = false
+						return el
+					})
+				})
+				.catch(error => {
+					console.log('=========>获取咨询类别列表失败')
+				})
+		},
+		getUserClubTeamsRroups(leaderId) {
+			this.UserService.getUserClubTeamsRroups({leaderId:leaderId})
+				.then(response => {
+					this.members = response.data.map((el, index) => {
+						el.isChecked = false
+						return el
+					})
 				})
 				.catch(error => {
 					console.log('=========>获取咨询类别列表失败')
@@ -160,12 +176,13 @@ export default {
 			} else {
 				this.checkedCategorysList.splice(index, 1)
 			}
-			console.log('checkedBrandList', this.checkedCategorysList)
+			this.queryData.consult = this.checkedCategorysList.join(',')
+			console.log('checkedBrandList', this.queryData.consult)
 		},
 		choiceGroupsAll() {
 			// 点击选择全部小组
 			this.isCheckedGroups = true
-			// this.listQuery.brandIds = ''
+			this.queryData.leaderId = ''
 			this.groups.forEach(el => {
 				el.isChecked = false
 			})
@@ -177,6 +194,8 @@ export default {
 			this.groups.forEach((el, index) => {
 				if (this.checkedGroupsIndex == index) {
 					el.isChecked = true
+					this.queryData.leaderId = group.leaderId
+					this.getUserClubTeamsRroups(group.leaderId)
 				} else {
 					el.isChecked = false
 				}
@@ -188,40 +207,29 @@ export default {
 			this.members.forEach((el, index) => {
 				if (this.checkedMemberIndex == index) {
 					el.isChecked = true
+					this.queryData.groupId = member.groupId
 				} else {
 					el.isChecked = false
 				}
 			})
 		},
-		onShowClose() {
-			//输入框失去焦点时触发
-			if (this.listQuery.name != '') {
-				this.isShowClose = true
-			} else {
-				this.isShowClose = false
-			}
-		},
-		delInputText() {
-			//清除输入框内容
-			this.listQuery.name = ''
-			this.isShowClose = false
-		},
 		closeDrawer(){
 			this.$parent.isScreenDrawer = false
 		},
 		handSearchConfirm(){
 			//确定筛选
-			this.$emit('handSearchConfirm', clubInfo)
+			this.$emit('handSearchConfirm', this.queryData)
+			this.$parent.isScreenDrawer = false
 		},
 		bindStartDateChange(event){
 			//开始时间
 			console.log('开始时间==>',event.detail.value)
-			this.startTime = event.detail.value
+			this.queryData.startAddTime = event.detail.value
 		},
 		bindEndDateChange(event){
 			//结束时间
 			console.log('结束时间==>',event.detail.value)
-			this.endTime = event.detail.value
+			this.queryData.endAddTime = event.detail.value
 		},
 		SetScrollHeight() {
 			let obj = {}

pages/seller/remarks/add-record.vue

@@ -11,12 +11,12 @@
 			<view class="remarks-category">
 				<view
 					class="checkbox-list"
-					:class="category.checked ? 'checked' : ''"
+					:class="category.isChecked ? 'checked' : ''"
 					v-for="(category, index) in categorys"
 					:key="index"
 					@click="choiceCategorys(category, index)"
 				>
-					<text class="iconfont" :class="category.checked ? 'icon-yixuanze' : 'icon-weixuanze'"></text>
+					<text class="iconfont" :class="category.isChecked ? 'icon-yixuanze' : 'icon-weixuanze'"></text>
 					{{ category.className }}
 				</view>
 			</view>
@@ -106,14 +106,7 @@ export default {
 			clubInfo:{},
 			userInfo:{},
 			checkedCategorysList:[],
-			categorys:[
-				{value: '1',value: '1',name:'产品',checked:false},
-				{value: '2',name:'仪器',checked:false},
-				{value: '3',name:'耗材',checked:false},
-				{value: '4',name:'超级会员',checked:false},
-				{value: '5',name:'机构会员',checked:false},
-				{value: '6',name:'其他',checked:false},
-			]
+			categorys:[]
 		}
 	},
 	onLoad(option) {
@@ -121,12 +114,14 @@ export default {
 		if (option.type == 'edit') {
 			this.questionMan = option.questionMan
 			this.handleType = option.type
+			this.getUserClubConsults()
 			this.getUserRemarksVisitDetail(option.remarksId)
 			uni.setNavigationBarTitle({title:'修改记录'})
 		} else {
 			this.questionMan = option.questionMan
 			this.remarksParams.questionManId = option.questionManId
 			this.initGetStotage(option)
+			this.getUserClubConsults()
 		}
 	},
 	methods: {
@@ -147,12 +142,34 @@ export default {
 				this.remarksParams.remarksId = data.remarksId
 				this.remarksParams.fileList = data.fileList
 				this.remarksParams.imageList = data.imageList
+				this.checkedCategorysList = data.consult.split(',')
+				this.categorys = this.categorys.map((el, index) => {
+					if(data.consult.includes(el.id)){
+						el.isChecked = true
+					}else{
+						el.isChecked = false
+					}
+					return el
+				})
 				this.initGetStotage()
 			})
 			.catch(error => {
 				this.$util.msg(error.msg, 2000)
 			})
 		},
+		getUserClubConsults() {
+			//查询咨询类别
+			this.UserService.getUserClubConsults()
+				.then(response => {
+					this.categorys = response.data.map((el, index) => {
+						el.isChecked = false
+						return el
+					})
+				})
+				.catch(error => {
+					console.log('=========>获取咨询类别列表失败')
+				})
+		},
 		editButtonConfim() {
 			//保存资料备注
 			if (this.remarksParams.remarks == '') {
@@ -179,15 +196,14 @@ export default {
 		},
 		choiceCategorys(category,index){
 			// 选择类别
-			category.checked = !category.checked
-			if (category.checked) {
-				this.checkedCategorysList.push(category.value)
+			category.isChecked = !category.isChecked
+			if (category.isChecked) {
+				this.checkedCategorysList.push(category.id)
 			} else {
 				this.checkedCategorysList.splice(index, 1)
 			}
-			console.log('checkedBrandList', this.checkedCategorysList)
-			// this.listQuery.brandIds = this.checkedBrandList.join(',')
-			// console.log('this.listQuery.brandIds', this.listQuery.brandIds)
+			this.remarksParams.consult = this.checkedCategorysList.join(',')
+			console.log('this.remarksParams.consult', this.remarksParams.consult)
 		},
 		uploadFile(array) {
 			//上传资质文件
@@ -285,10 +301,7 @@ page {
 	}
 	.remarks-category{
 		width: 100%;
-		display: flex;
-		flex-flow: row wrap;
-		justify-content: space-between;
-		align-items: center;
+		float: left;
 		.checkbox-list {
 			height: 60rpx;
 			font-size: $font-size-28;

pages/seller/remarks/add.vue

@@ -36,13 +36,13 @@
 			<view class="remarks-category">
 				<view
 					class="checkbox-list"
-					:class="category.checked ? 'checked' : ''"
+					:class="category.isChecked ? 'checked' : ''"
 					v-for="(category, index) in categorys"
 					:key="index"
 					@click="choiceCategorys(category, index)"
 				>
-					<text class="iconfont" :class="category.checked ? 'icon-yixuanze' : 'icon-weixuanze'"></text>
-					{{ category.name }}
+					<text class="iconfont" :class="category.isChecked ? 'icon-yixuanze' : 'icon-weixuanze'"></text>
+					{{ category.className }}
 				</view>
 			</view>
 			<view class="list-view-title">
@@ -122,7 +122,8 @@ export default {
 				remarks: '',
 				fileList: [],
 				imageList: [],
-				serviceProviderId: 0
+				serviceProviderId: 0,
+				consult:''
 			},
 			min: 0,
 			max: 500,
@@ -131,25 +132,20 @@ export default {
 			clubInfo: {},
 			userInfo: {},
 			checkedCategorysList:[],
-			categorys:[
-				{value: '1',value: '1',name:'产品',checked:false},
-				{value: '2',name:'仪器',checked:false},
-				{value: '3',name:'耗材',checked:false},
-				{value: '4',name:'超级会员',checked:false},
-				{value: '5',name:'机构会员',checked:false},
-				{value: '6',name:'其他',checked:false},
-			]
+			categorys:[]
 		}
 	},
 	onLoad(option) {
 		console.log(option)
 		if (option.type == 'edit') {
+			this.getUserClubConsults()
 			this.getUserClubRemarksDetail(option.remarksId)
 			this.handleType = option.type
 			uni.setNavigationBarTitle({ title: '修改记录' })
 		} else {
 			this.clubUserId = option.userId
 			this.getCulbInfo()
+			this.getUserClubConsults()
 		}
 	},
 	methods: {
@@ -183,6 +179,15 @@ export default {
 					this.remarksParams.imageList = data.imageList
 					if(this.handleType == 'edit'){
 						this.remarksParams.questionMan = data.questionMan
+						this.checkedCategorysList = data.consult.split(',')
+						this.categorys = this.categorys.map((el, index) => {
+							if(data.consult.includes(el.id)){
+								el.isChecked = true
+							}else{
+								el.isChecked = false
+							}
+							return el
+						})
 					}
 					this.getCulbInfo()
 				})
@@ -190,6 +195,19 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
+		getUserClubConsults() {
+			//查询咨询类别
+			this.UserService.getUserClubConsults()
+				.then(response => {
+					this.categorys = response.data.map((el, index) => {
+						el.isChecked = false
+						return el
+					})
+				})
+				.catch(error => {
+					console.log('=========>获取咨询类别列表失败')
+				})
+		},
 		async editButtonConfim() {
 			//保存资料备注
 			const userInfo = await this.$api.getStorage()
@@ -217,15 +235,14 @@ export default {
 		},
 		choiceCategorys(category,index){
 			// 选择类别
-			category.checked = !category.checked
-			if (category.checked) {
-				this.checkedCategorysList.push(category.value)
+			category.isChecked = !category.isChecked
+			if (category.isChecked) {
+				this.checkedCategorysList.push(category.id)
 			} else {
 				this.checkedCategorysList.splice(index, 1)
 			}
-			console.log('checkedBrandList', this.checkedCategorysList)
-			// this.listQuery.brandIds = this.checkedBrandList.join(',')
-			// console.log('this.listQuery.brandIds', this.listQuery.brandIds)
+			this.remarksParams.consult = this.checkedCategorysList.join(',')
+			console.log('this.remarksParams.consult', this.remarksParams.consult)
 		},
 		uploadFile(array) {
 			//上传资质文件
@@ -365,10 +382,7 @@ page {
 	}
 	.remarks-category{
 		width: 100%;
-		display: flex;
-		flex-flow: row wrap;
-		justify-content: space-between;
-		align-items: center;
+		float: left;
 		.checkbox-list {
 			height: 60rpx;
 			font-size: $font-size-28;

pages/seller/remarks/customer-list.vue

@@ -29,7 +29,7 @@
 				<template v-else>
 					<!-- 列表 -->
 					<view class="tui-remarks-cell  tui-mtop" v-for="(list, index) in remarksList" :key="index">
-						<view class="tui-remarks-name" @click.stop="checkedCoustomer(index)">
+						<view class="tui-remarks-name" @click.stop="checkedCoustomer(list,index)">
 							<view class="tui-remarks-name-le">{{ list.questionMan }}</view>
 							<view class="tui-remarks-name-ri">
 								<view
@@ -208,55 +208,24 @@ export default {
 			// 点击操作
 			this.isClubpopupShow = true
 		},
-		handleChoiceaTextData(data) {
-			// 监听获取
-			console.log(data)
-			if (this.modalType == 1) {
-				this.handleUpdateVisitor(data)
-			} else {
-				this.handleSaveVisitor(data)
-			}
-		},
 		handleChoiceaClubData(data){
 			// 同步机构
 			console.log('data',data)
-		},
-		handleUpdateVisitor(data) {
-			// 修改咨询人姓名
-			this.UserService.getUserClubVisitorUpdate({
-				questionMan: data,
-				questionManId: this.handleUpdataVisitorId,
-				serviceProviderId: this.listQuery.serviceProviderId
+			this.UserService.getUserRemarksConcactVisit(
+				{
+					clubId: data.clubId,
+					questionManId:this.questionManId
+				}
+			)
+			.then(response => {
+				this.$util.msg('同步成功', 2000, true, 'success')
+				setTimeout(() => {
+					this.$api.redirectTo('/pages/seller/remarks/list')
+				}, 2000)
 			})
-				.then(response => {
-					this.$util.msg('修改成功', 2000, true, 'success')
-					setTimeout(() => {
-						this.GetProductListInfo()
-					}, 2000)
-				})
-				.catch(error => {
-					console.log('=======>修改咨询姓名失败~')
-				})
-		},
-		handleSaveVisitor(data) {
-			// 添加咨询人
-			this.UserService.getUserClubVisitorSave({
-				name: data,
-				serviceProviderId: this.listQuery.serviceProviderId
+			.catch(error => {
+				this.$util.msg(error.msg, 2000)
 			})
-				.then(response => {
-					let VisitorInfo = {
-						questionManId: response.data.questionManId,
-						questionMan: response.data.questionMan
-					}
-					this.$api.setStorage('VisitorInfo', VisitorInfo)
-					setTimeout(() => {
-						this.$api.navigateTo('/pages/seller/remarks/record-list')
-					}, 1000)
-				})
-				.catch(error => {
-					console.log('=======>添加咨询人失败~')
-				})
 		},
 		onShowClose() {
 			//输入框失去焦点时触发
@@ -275,12 +244,13 @@ export default {
 			this.listQuery.pageNum = 1
 			this.GetProductListInfo()
 		},
-		checkedCoustomer(idx) {
+		checkedCoustomer(list,idx) {
 			// 选择机构
 			this.checkedIndex = idx
 			this.remarksList.forEach((el, index) => {
 				if (this.checkedIndex == index) {
 					el.ischecked = !el.ischecked
+					this.questionManId = el.questionManId
 				} else {
 					el.ischecked = false
 				}

pages/seller/remarks/list.vue

@@ -33,8 +33,8 @@
 							<view class="tui-remarks-time sm">{{ remark.addTime }}</view>
 						</view>
 						<view class="tui-remarks-title-bot">
-							<view class="tui-remarks-text h">记录人：黄豪</view>
-							<view class="tui-remarks-text y">管理员：张顺星</view>
+							<view class="tui-remarks-text h">记录人：{{ remark.recordName }}</view>
+							<view class="tui-remarks-text y">管理员：{{ remark.leaderName ? remark.leaderName : '' }}</view>
 						</view>
 					</view>
 					<view class="tui-remarks-name">
@@ -42,7 +42,7 @@
 							咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
 						</view>
 						<view class="tui-remarks-name-text y">
-							咨询类别：产品，二手
+							咨询类别：{{ remark.consult }}
 						</view>
 					</view>
 					<view class="tui-remarks-content">
@@ -50,7 +50,7 @@
 							{{ label }}
 						</text>
 					</view>
-					<view class="tui-remarks-button">
+					<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
 						<view class="btn edit"  @click.stop="handEditRemark(remark.remarksId)">修改</view> 
 						<view class="btn del" @click.stop="deleteRemark(remark.remarksId)">删除</view>
 					</view>
@@ -74,67 +74,6 @@
 				</view>
 			</view>
 		</tui-bottom-popup>
-		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
-			<view
-				class="drawer-container clearfix"
-				scroll-y
-				:style="{ paddingTop: CustomBar + 'px', paddingBottom: isIphoneX ? '180rpx' : '146rpx' }"
-			>
-				<scroll-view class="tui-drawer-scroll" scroll-y :style="{ height: drawerH + 'px' }">
-					<view class="drawer-title">
-						<view class="drawer-title-h1">品牌</view>
-						<view class="drawer-title-p"
-							>已选中<text class="text">{{ checkedBrandLength }}</text
-							>个品牌</view
-						>
-					</view>
-					<view class="drawer-main">
-						<view class="drawer-main-brand clearfix">
-							<view
-								class="drawer-brand-list"
-								:class="isAllcheckedBrand ? 'checked' : ''"
-								@click="choiceBrandAll"
-								>全部</view
-							> 
-							<view
-								class="drawer-brand-list"
-								:class="brand.isChecked ? 'checked' : ''"
-								v-for="(brand, index) in brandLists"
-								:key="index"
-								@click="choiceBrand(brand, index)"
-							>
-								{{ brand.name }}
-							</view>
-							<view class="drawer-brand-more" v-if="!isShowAllBrands" @click="showAllBrands"
-								>查看全部<text class="iconfont icon-xiangxiajiantou"></text
-							></view>
-						</view>
-						<view class="drawer-main-radio">
-							<view class="drawer-radio-name">新品</view>
-							<view class="drawer-radio-input" @click="choiceNewType">
-								<text
-									class="iconfont"
-									:class="isChoiceNewType ? 'icon-yixuanze' : 'icon-weixuanze'"
-								></text>
-							</view>
-						</view>
-						<view class="drawer-main-radio">
-							<view class="drawer-radio-name">促销商品</view>
-							<view class="drawer-radio-input" @click="choiceActiType">
-								<text
-									class="iconfont"
-									:class="isChoiceActiType ? 'icon-yixuanze' : 'icon-weixuanze'"
-								></text>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
-					<view class="drawer-btn clear" @click="closeDrawer">取消</view>
-					<view class="drawer-btn comfrim" @click="handSearchList">确定</view>
-				</view>
-			</view>
-		</tui-drawer>
 		<!-- 筛选抽屉 -->
 		<cm-screenDrawer ref="screendrawer"
 						 v-if="isScreenDrawer"
@@ -169,9 +108,16 @@ import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
+	startAddTime:'',
+	endAddTime:'',
+	consult:'',
+	leaderId:0,
+	groupId:0,
+	manager:0,
 	serviceProviderId: 0,
 	pageNum: 1,
 	pageSize: 10
+	
 }
 export default {
 	components: {
@@ -236,6 +182,7 @@ export default {
 		async initGetStotage() {
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			this.listQuery.manager = userInfo.manager ? userInfo.manager : 0
 			this.GetProductListInfo()
 		},
 		GetProductListInfo() {
@@ -320,12 +267,17 @@ export default {
 		},
 		handleChoiceaClubData(data){
 			//跳转添加记录
-			console.log(data)
 			this.$api.navigateTo(`/pages/seller/remarks/add?userId=${data.userId}`)
 		},
 		handSearchConfirmData(data){
 			//确定筛选
-			console.log(data)
+			this.listQuery.startAddTime = data.startAddTime
+			this.listQuery.endAddTime = data.endAddTime
+			this.listQuery.consult = data.consult
+			this.listQuery.leaderId = data.leaderId
+			this.listQuery.groupId = data.groupId
+			console.log('确定筛选',this.listQuery)
+			this.GetProductListInfo()
 		},
 		showScreenDrawer(){
 			//显示筛选抽屉
@@ -414,7 +366,7 @@ page {
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 20;
+	z-index: 1000;
 	.search-screen{
 		width: 152rpx;
 		height: 64rpx;
@@ -426,6 +378,11 @@ page {
 		border-radius: 32rpx;
 		color: #333333;
 		text-align: center;
+		font-size: 28rpx;
+		.icon-gengduo1{
+			font-size: 30rpx;
+			margin-right: 10rpx;
+		}
 	}
 	.search-from{
 		width: 526rpx;
@@ -555,6 +512,12 @@ page {
 				font-size: $font-size-26;
 				color: #333333;
 				float: left;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
 				&.h{
 					padding-right: 24rpx;
 				}

pages/seller/remarks/record-list.vue

@@ -39,12 +39,11 @@
 					>
 						<view class="tui-remarks-title">
 							<view class="tui-remarks-title-top">
-								<view class="tui-remarks-time tt">{{ remark.clubName }}</view>
-								<view class="tui-remarks-time sm">{{ remark.addTime }}</view>
+								<view class="tui-remarks-time tt">记录人：{{ remark.recordName }}</view>
+								<view class="tui-remarks-time sm">{{ remark.addDate }}</view>
 							</view>
 							<view class="tui-remarks-title-bot">
-								<view class="tui-remarks-text h">记录人：黄豪</view>
-								<view class="tui-remarks-text y">管理员：张顺星</view>
+								<view class="tui-remarks-text y">管理员：{{ remark.leaderName }}</view>
 							</view>
 						</view>
 						<view class="tui-remarks-name">
@@ -52,7 +51,7 @@
 								咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
 							</view>
 							<view class="tui-remarks-name-text y">
-								咨询类别：产品，二手
+								咨询类别：{{ remark.consult }}
 							</view>
 						</view>
 						<view class="tui-remarks-content">
@@ -64,7 +63,7 @@
 								{{ label }}
 							</text>
 						</view>
-						<view class="tui-remarks-button">
+						<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
 							<view class="btn edit" @click.stop="handEditRemark(remark.remarksId)">修改</view>
 							<view class="btn del" @click.stop="deleteRemark(remark.remarksId)">删除</view>
 						</view>
@@ -94,6 +93,7 @@
 		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
 		<cm-screenDrawer ref="screendrawer"
+						 v-if="isScreenDrawer"
 						 :rightDrawer="isScreenDrawer"
 						 @handSearchConfirm="handSearchConfirmData">
 		</cm-screenDrawer>
@@ -137,6 +137,12 @@ import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
 import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 const defaultListQuery = {
+	startAddTime:'',
+	endAddTime:'',
+	consult:'',
+	leaderId:0,
+	groupId:0,
+	manager:0,
 	serviceProviderId: 0,
 	pageNum: 1,
 	pageSize: 10
@@ -216,7 +222,7 @@ export default {
 		getUserClubVisitorRecordlist() {
 			this.remarksList = []
 			this.listQuery.pageNum = 1
-			this.UserService.getUserClubRemarksList(this.listQuery)
+			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
@@ -287,41 +293,33 @@ export default {
 					this.questionMan
 				}`)
 		},
+		handSearchConfirmData(data){
+			//确定筛选
+			this.listQuery.startAddTime = data.startAddTime
+			this.listQuery.endAddTime = data.endAddTime
+			this.listQuery.consult = data.consult
+			this.listQuery.leaderId = data.leaderId
+			this.listQuery.groupId = data.groupId
+			console.log('确定筛选',this.listQuery)
+			this.GetProductListInfo()
+		},
 		handleShowClubpopup() {
 			//跳转选择咨询人
 			this.$api.navigateTo('/pages/seller/remarks/customer-list')
 		},
-		handleChoiceaClubData(data) {// 同步至机构
-			console.log(data)
-			this.UserService.getUserRemarksConcactVisit(
-				{
-					clubId: data.clubId,
-					questionManId:this.listQuery.questionManId
-				}
-			)
-			.then(response => {
-				this.$util.msg('同步成功', 2000, true, 'success')
-				setTimeout(() => {
-					this.$api.redirectTo('/pages/seller/remarks/list')
-				}, 2000)
-			})
-			.catch(error => {
-				this.$util.msg(error.msg, 2000)
-			})
-		},
 		handleChoiceaConsultData(data){// 选择咨询人添加记录
 			//跳转添加记录
 			this.$api.navigateTo(`/pages/seller/remarks/add-record?type=add&questionManId=${data.questionManId}&questionMan=${
 					data.questionMan
 				}`)
 		},
-		handleAddRecord() {// 新增咨询人
+		handleAddRecord() {// 新增咨询人显示弹框
 			this.isClubModalShow = true
 		},
 		handleShowFereepopup(){// 显示咨询人弹窗
 			this.isClubConsultShow = true
 		},
-		handleChoiceaTextData(data) {// 监听弹窗事件
+		handleChoiceaTextData(data) {// 新增咨询人监听时间
 			console.log('data',data)
 			this.handleSaveVisitor(data)
 		},
@@ -452,6 +450,11 @@ page {
 			border-radius: 32rpx;
 			color: #333333;
 			text-align: center;
+			font-size: 28rpx;
+			.icon-gengduo1{
+				font-size: 30rpx;
+				margin-right: 10rpx;
+			}
 		}
 		.search-from {
 			width: 526rpx;
@@ -512,7 +515,7 @@ page {
 		background: #ffffff;
 		margin-bottom: 24rpx;
 		box-sizing: border-box;
-		padding: 24rpx;
+		padding: 0 24rpx 24rpx 24rpx;
 		.tui-remarks-title{
 			width: 100%;
 			height: 144rpx;
@@ -527,8 +530,8 @@ page {
 				.tui-remarks-time {
 					float: left;
 					&.tt{
-						width: 60%;
-						font-size: $font-size-32;
+						width: 50%;
+						font-size: $font-size-26;
 						color: #333333;
 						text-align: left;
 						text-overflow: ellipsis;
@@ -537,10 +540,9 @@ page {
 						-webkit-line-clamp: 1;
 						line-clamp: 1;
 						-webkit-box-orient: vertical;
-						font-weight: bold;
 					}
 					&.sm{
-						width: 40%;
+						width: 50%;
 						font-size: $font-size-26;
 						color: #999999;
 						text-align: right;
@@ -557,13 +559,6 @@ page {
 					font-size: $font-size-26;
 					color: #999999;
 					float: left;
-					&.h{
-						padding-right: 24rpx;
-						border-right: 1px solid #E1E1E1;
-					}
-					&.y{
-						padding-left: 24rpx;
-					}
 				}
 			}
 		}