commit -m 协销资料备注

common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/font_1519039_jpci2izhta9.woff2?t=1622614721342') format('woff2'),
-       url('//at.alicdn.com/t/font_1519039_jpci2izhta9.woff?t=1622614721342') format('woff'),
-       url('//at.alicdn.com/t/font_1519039_jpci2izhta9.ttf?t=1622614721342') format('truetype');
+  src: url('//at.alicdn.com/t/font_1519039_9e2bfkcum7.woff2?t=1642663000447') format('woff2'),
+       url('//at.alicdn.com/t/font_1519039_9e2bfkcum7.woff?t=1642663000447') format('woff'),
+       url('//at.alicdn.com/t/font_1519039_9e2bfkcum7.ttf?t=1642663000447') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-riqi:before {
+  content: "\e66a";
+}
+
+.icon-gengduo1:before {
+  content: "\e696";
+}
+
+.icon-yishiyong:before {
+  content: "\e72e";
+}
+
+.icon-yishixiao:before {
+  content: "\e72d";
+}
+
 .icon-zichan:before {
   content: "\e72c";
 }

components/cm-module/cm-seller/cm-clubpopup.vue

@@ -116,7 +116,7 @@ export default {
 				})
 		},
 		checkedCoupon(idx) {
-			// 选择优惠券
+			// 选择机构
 			this.checkedIndex = idx
 			this.dataList.forEach((el, index) => {
 				if (this.checkedIndex == index) {

components/cm-module/cm-seller/cm-refereepopup.vue

@@ -0,0 +1,332 @@
+<template name="coupon">
+	<view class="coupon-template">
+		<!-- 选择机构 -->
+		<tui-bottom-popup :radius="true" :show="show" @close="hidePopup">
+			<view class="tui-popup-box clearfix">
+				<view class="title">选择咨询人</view>
+				<view class="title-search">
+					<view class="search-from name">
+						<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+						<input
+							class="input"
+							type="text"
+							confirm-type="search"
+							v-model="listQuery.name"
+							@input="onShowClose"
+							@confirm="initclubList()"
+							placeholder="咨询人姓名"
+							maxlength="16"
+						/>
+						<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+					</view>
+				</view>
+				<view class="tui-popup-main coupon">
+					<scroll-view class="tui-popup-scroll" scroll-y="true">
+						<view
+							v-for="(club, index) in dataList"
+							:key="index"
+							class="list"
+							@click.stop="checkedCoupon(index)"
+						>
+							<view class="list-cell-le">
+								{{ club.questionMan  }}
+							</view>
+							<view class="list-cell-btn">
+								<view
+									class="checkbox iconfont"
+									:class="[club.ischecked ? 'icon-yixuanze' : 'icon-weixuanze']"
+								>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+					<view class="tui-flex-1"> <view class="tui-button" @click="hidePopup">确定</view> </view>
+				</view>
+			</view>
+		</tui-bottom-popup>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'coupon',
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			isIphoneX: this.$store.state.isIphoneX,
+			checkedIndex: 0,
+			isShowClose: false,
+			listQuery: {
+				serviceProviderId: 0,
+				pageNum: 1,
+				pageSize: 100
+			},
+			dataList: []
+		}
+	},
+	created() {
+		this.initclubList()
+	},
+	methods: {
+		async initclubList() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId
+			this.UserService.getUserClubVisitorList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						 this.dataList = data.results.map((el,index)=>{
+							el.ischecked = false
+							return el
+						})
+					}
+					
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		checkedCoupon(idx) {
+			// 选择优惠券
+			this.checkedIndex = idx
+			this.dataList.forEach((el, index) => {
+				if (this.checkedIndex == index) {
+					el.ischecked = !el.ischecked
+				} else {
+					el.ischecked = false
+				}
+			})
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.listQuery.name != '') {
+				this.isShowClose = true
+			} else {
+				this.isShowClose = false
+			}
+		},
+		delInputText() {
+			//清除输入框内容
+			this.listQuery.name = ''
+			this.isShowClose = false
+		},
+		hidePopup() {
+			let clubInfo = null
+			let checkedData = false
+			this.dataList.forEach((el, index) => {
+				if (el.ischecked) {
+					clubInfo = el
+					checkedData = true
+				}
+			})
+			if (checkedData) {
+				this.$emit('handleChoiceaConsult', clubInfo)
+			}
+			this.$parent.isClubConsultShow = false
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.coupon-template {
+	width: 100%;
+	height: auto;
+	background: #ffffff;
+	float: left;
+	margin-top: 24rpx;
+	.coupon-title {
+		width: 702rpx;
+		padding: 0 24rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		position: relative;
+		.text {
+			font-size: $font-size-28;
+			color: $text-color;
+		}
+		.text-coupon {
+			display: inline-block;
+			float: right;
+			padding-right: 30rpx;
+			line-height: 88rpx;
+			font-size: 28rpx;
+			color: #f94b4b;
+		}
+		.iconfont {
+			width: 50rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			color: #999999;
+			display: block;
+			position: absolute;
+			right: 0;
+			top: 0;
+		}
+	}
+}
+.tui-popup-box {
+	position: relative;
+	box-sizing: border-box;
+	min-height: 220rpx;
+	padding: 24rpx 32rpx 0 32rpx;
+	.title {
+		font-size: $font-size-32;
+		color: $text-color;
+		line-height: 68rpx;
+		text-align: center;
+		float: left;
+		width: 100%;
+		height: 68rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+	}
+	.title-search {
+		width: 100%;
+		height: 66rpx;
+		background: #ffffff;
+		box-sizing: border-box;
+		float: left;
+		.search-from {
+			width: 100%;
+			height: 100%;
+			background: #f7f7f7;
+			border-radius: 32rpx;
+			float: left;
+			position: relative;
+			.input {
+				width: 500rpx;
+				height: 64rpx;
+				float: left;
+				line-height: 64rpx;
+				color: $text-color;
+				font-size: $font-size-24;
+			}
+			.icon-iconfonticonfontsousuo1 {
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				display: block;
+				font-size: $font-size-38;
+				float: left;
+				color: #999999;
+			}
+			.icon-shanchu1 {
+				font-size: $font-size-32;
+				color: #999999;
+				position: absolute;
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				top: 0;
+				right: 0;
+				z-index: 10;
+			}
+		}
+	}
+	.tui-popup-main {
+		width: 100%;
+		float: left;
+		padding-top: 10rpx;
+		.tui-popup-scroll {
+			width: 100%;
+			height: 800rpx;
+			.list {
+				width: 100%;
+				height: 100rpx;
+				box-sizing: border-box;
+				background-size: cover;
+				border-bottom: 1px solid #e1e1e1;
+				.list-cell-le {
+					height: 100%;
+					line-height: 100rpx;
+					box-sizing: border-box;
+					float: left;
+					text-align: left;
+					font-size: $font-size-26;
+					color: #333333;
+				}
+				.list-cell-btn {
+					width: 40rpx;
+					height: 100rpx;
+					line-height: 100rpx;
+					float: right;
+					.checkbox {
+						width: 40rpx;
+						line-height: 128rpx;
+						float: right;
+						box-sizing: border-box;
+						text-align: center;
+						text-decoration: none;
+						-webkit-tap-highlight-color: transparent;
+						overflow: hidden;
+						font-size: $font-size-34;
+						&.icon-weixuanze {
+							color: #b2b2b2;
+						}
+						&.icon-yixuanze {
+							color: #e15616;
+						}
+					}
+				}
+			}
+		}
+		.tui-popup-coupon {
+			width: 100%;
+			height: 500rpx;
+			box-sizing: border-box;
+			padding: 30rpx 20rpx;
+			.tui-popup-h1 {
+				width: 100%;
+				height: 66rpx;
+				display: flex;
+				align-items: center;
+				.tui-popup-text {
+					flex: 1;
+					height: 66rpx;
+					line-height: 66rpx;
+					font-size: $font-size-30;
+					color: #333333;
+					&.red {
+						color: #f94b4b;
+					}
+					&.bold {
+						font-weight: bold;
+					}
+					&.left {
+						text-align: left;
+					}
+					&.right {
+						text-align: right;
+					}
+				}
+			}
+		}
+	}
+	.tui-popup-btn {
+		width: 100%;
+		height: auto;
+		float: left;
+		margin-top: 24rpx;
+		.tui-button {
+			width: 100%;
+			height: 88rpx;
+			background: $btn-confirm;
+			line-height: 88rpx;
+			text-align: center;
+			color: #ffffff;
+			font-size: $font-size-28;
+			border-radius: 44rpx;
+		}
+	}
+}
+</style>

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

@@ -0,0 +1,432 @@
+<template>
+	<view class="drawer-content">
+		<!--右抽屉-->
+		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
+			<view
+				class="drawer-container clearfix"
+				scroll-y
+				:style="{ paddingTop: '0px', paddingBottom: isIphoneX ? '180rpx' : '146rpx' }"
+			>
+				<scroll-view class="tui-drawer-scroll" scroll-y :style="{ height: drawerH + 'px' }">
+					<view class="drawer-title">更多筛选</view>
+					<view class="drawer-main">
+						<view class="drawer-main-name">日期</view>
+						<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>
+								</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>
+								</picker>
+								<text class="iconfont icon-riqi"></text>
+							</view>
+						</view>
+						<view class="drawer-main-name">咨询类别</view>
+						<view class="drawer-main-brand clearfix">
+							<view
+								class="drawer-brand-list"
+								:class="isCheckedCategorys ? 'checked' : ''"
+								@click="choiceCategorysAll"
+								>全部</view
+							> 
+							<view
+								class="drawer-brand-list"
+								:class="category.isChecked ? 'checked' : ''"
+								v-for="(category, index) in categorys"
+								:key="index"
+								@click="choiceCategorys(category, index)"
+							>
+								{{ category.name }}
+							</view>
+						</view>
+						<view class="drawer-main-name">小组</view>
+						<view class="drawer-main-brand clearfix">
+							<view
+								class="drawer-brand-list"
+								:class="isCheckedGroups ? 'checked' : ''"
+								@click="choiceGroupsAll"
+								>全部</view
+							> 
+							<view
+								class="drawer-brand-list"
+								:class="group.isChecked ? 'checked' : ''"
+								v-for="(group, index) in groups"
+								:key="index"
+								@click="choiceGroups(group, index)"
+							>
+								{{ group.name }}
+							</view>
+						</view>
+						<view class="drawer-main-name">组员</view>
+						<view class="drawer-main-brand clearfix">
+							<view
+								class="drawer-brand-list"
+								:class="member.isChecked ? 'checked' : ''"
+								v-for="(member, index) in members"
+								:key="index"
+								@click="choiceMembers(member, index)"
+							>
+								{{ member.name }}
+							</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="handSearchConfirm">确定</view>
+				</view>
+			</view>
+		</tui-drawer>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'rightDrawer',
+	props: {
+		rightDrawer: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		const currentDate = this.getDate({
+			format: true
+		})
+		return {
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			isIphoneX: this.$store.state.isIphoneX,
+			isCheckedCategorys:false,
+			isCheckedGroups:false,
+			checkedIndex: 0,
+			checkedGroupsIndex: 0,
+			checkedCategorysIndex: 0,
+			checkedMemberIndex: 0,
+			isShowClose: false,
+			listQuery: {
+				serviceProviderId: 0,
+				pageNum: 1,
+				pageSize: 100
+			},
+			dataList: [],
+			date: currentDate,
+			startTime:'开始日期',
+			endTime:'结束日期',
+			height: 0,
+			drawerH: 0 ,// 抽屉内部scrollview高度
+			categorys:[
+				{name:'产品',isChecked:false},
+				{name:'仪器',isChecked:false},
+				{name:'耗材',isChecked:false},
+				{name:'二手',isChecked:false},
+				{name:'升级会员',isChecked:false},
+				{name:'超级会员',isChecked:false},
+				{name:'其他',isChecked:false},
+			],
+			groups:[
+				{name:'张顺星',isChecked:false},
+				{name:'高琳琳',isChecked:false},
+			],
+			members:[
+				{name:'张三',isChecked:false},
+				{name:'张三',isChecked:false},
+				{name:'张三',isChecked:false},
+				{name:'张三',isChecked:false},
+				{name:'张三',isChecked:false},
+			]
+		}
+	},
+	created() {
+		this.SetScrollHeight()
+		this.initclubList()
+	},
+	computed: {
+		startDate() {
+			return this.getDate('start')
+		},
+		endDate() {
+			return this.getDate('end')
+		}
+	},
+	methods: {
+		async initclubList() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId
+			this.UserService.getUserClubVisitorList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						 this.dataList = data.results.map((el,index)=>{
+							el.isChecked = false
+							return el
+						})
+					}
+					
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		choiceCategorysAll() {
+			// 点击选择全部分类
+			this.isCheckedCategorys = true
+			// this.listQuery.brandIds = ''
+			this.categorys.forEach(el => {
+				el.isChecked = false
+			})
+		},
+		choiceCategorys(category,idx){
+			//选择分类
+			this.isCheckedCategorys = false
+			this.checkedCategorysIndex = idx
+			this.categorys.forEach((el, index) => {
+				if (this.checkedCategorysIndex == index) {
+					el.isChecked = true
+				} else {
+					el.isChecked = false
+				}
+			})
+		},
+		choiceGroupsAll() {
+			// 点击选择全部小组
+			this.isCheckedGroups = true
+			// this.listQuery.brandIds = ''
+			this.groups.forEach(el => {
+				el.isChecked = false
+			})
+		},
+		choiceGroups(group,idx){
+			//选择小组
+			this.isCheckedGroups = false
+			this.checkedGroupsIndex = idx
+			this.groups.forEach((el, index) => {
+				if (this.checkedGroupsIndex == index) {
+					el.isChecked = true
+				} else {
+					el.isChecked = false
+				}
+			})
+		},
+		choiceMembers(member, idx) {
+			//选择组员
+			this.checkedMemberIndex = idx
+			this.members.forEach((el, index) => {
+				if (this.checkedMemberIndex == index) {
+					el.isChecked = true
+				} 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)
+		},
+		bindStartDateChange(event){
+			//开始时间
+			console.log('开始时间==>',event.detail.value)
+			this.startTime = event.detail.value
+		},
+		bindEndDateChange(event){
+			//结束时间
+			console.log('结束时间==>',event.detail.value)
+			this.endTime = event.detail.value
+		},
+		SetScrollHeight() {
+			let obj = {}
+			const { windowHeight, pixelRatio } = wx.getSystemInfoSync()
+			uni.getSystemInfo({
+				success: res => {
+					this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44
+					this.drawerH = res.windowHeight - uni.upx2px(180) - this.height
+				}
+			})
+			this.windowHeight = windowHeight - 1
+			this.scrollHeight = windowHeight - 1
+		},
+		getDate(type) {
+			const date = new Date()
+			let year = date.getFullYear()
+			let month = date.getMonth() + 1
+			let day = date.getDate()
+
+			if (type === 'start') {
+				year = year - 60
+			} else if (type === 'end') {
+				year = year + 2
+			}
+			month = month > 9 ? month : '0' + month
+			day = day > 9 ? day : '0' + day
+			return `${year}-${month}-${day}`
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+/*screen*/
+.drawer-container {
+	width: 580rpx;
+	height: 100%;
+	padding: 80rpx 0;
+	overflow: hidden;
+	box-sizing: border-box;
+	background-color: #FFFFFF;
+	.drawer-title {
+		width: 100%;
+		height: 72rpx;
+		line-height: 72rpx;
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		float: left;
+		background-color: #f7f7f7;
+		font-size: $font-size-26;
+		color: #333333;
+		font-weight: bold;
+		text-align: left;
+	}
+	.drawer-main {
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		float: left;
+		.drawer-main-name{
+			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: left;
+			font-size: $font-size-26;
+			color: #333333;
+			box-sizing: border-box;
+			padding: 0 20rpx;
+		}
+		.drawer-main-time{
+			width: 100%;
+			height: 56rpx;
+			box-sizing: border-box;
+			.line{
+				color: #999999;
+				float: left;
+				line-height: 56rpx;
+			}
+			.drawer-main-time-input{
+				width: 228rpx;
+				height: 56rpx;
+				background: #F7F7F7;
+				border-radius: 28rpx;
+				box-sizing: border-box;
+				padding: 0 20rpx;
+				line-height: 56rpx;
+				float: left;
+				margin: 0 20rpx;
+				position: relative;
+				.input-text{
+					font-size: 26rpx;
+					color: #666666;
+				}
+				.icon-riqi{
+					color: #E15616;
+					display: block;
+					width: 40rpx;
+					height: 56rpx;
+					position: absolute;
+					right: 10rpx;
+					top: 0;
+					line-height: 56rpx;
+				}
+			}
+		}
+		.drawer-main-brand {
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			background-color: #ffffff;
+			.drawer-brand-list {
+				width: 160rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				text-align: center;
+				font-size: 26rpx;
+				background-color: #f7f7f7;
+				color: #999999;
+				border-radius: 30rpx;
+				box-sizing: border-box;
+				padding: 0 15rpx;
+				float: left;
+				margin: 12rpx 24rpx 12rpx 0;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
+				&.checked {
+					background-color: #fef6f3;
+					color: #e15616;
+				}
+				&:nth-child(3n) {
+					margin-right: 0;
+				}
+			}
+		}
+	}
+	.drawer-input {
+		width: 100%;
+		float: left;
+		box-sizing: border-box;
+		padding: 24rpx 10rpx 0 10rpx;
+		border: 1px solid rgba(0, 0, 0, 0.2);
+		border-radius: 4rpx;
+		position: relative;
+		background-color: #ffffff;
+		&.btn {
+			border: none;
+			display: flex;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+		}
+		.drawer-btn {
+			width: 210rpx;
+			height: 84rpx;
+			border-radius: 42rpx;
+			background: $btn-confirm;
+			line-height: 84rpx;
+			text-align: center;
+			font-size: $font-size-26;
+			color: #ffffff;
+			flex: 1;
+			margin: 0 10rpx;
+			&.comfrim {
+				background: $btn-confirm;
+			}
+			&.clear {
+				background: #FFE6DC;
+				color: $color-system;
+			}
+		}
+	}
+}
+</style>

pages.json

@@ -625,7 +625,7 @@
                 {
                     "path": "remarks/customer-list",
                     "style": {
-                        "navigationBarTitleText": "未注册客户咨询记录"
+                        "navigationBarTitleText": "选择咨询人"
                     }
                 },
                 {

pages/seller/remarks/add-record.vue

@@ -5,6 +5,21 @@
 				<view class="list-view-h1">咨询人：</view>
 			</view>
 			<view class="remarks-input">{{ questionMan }}</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"><text>*</text>咨询类别：</view>
+			</view>
+			<view class="remarks-category">
+				<view
+					class="checkbox-list"
+					:class="category.checked ? '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 }}
+				</view>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"><text>*</text>关键词记录：</view>
 			</view>
@@ -89,7 +104,16 @@ export default {
 			questionMan:'',
 			clubUserId:0,
 			clubInfo:{},
-			userInfo:{}
+			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},
+			]
 		}
 	},
 	onLoad(option) {
@@ -153,6 +177,18 @@ export default {
 				this.$util.msg(error.msg, 2000)
 			})
 		},
+		choiceCategorys(category,index){
+			// 选择类别
+			category.checked = !category.checked
+			if (category.checked) {
+				this.checkedCategorysList.push(category.value)
+			} 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)
+		},
 		uploadFile(array) {
 			//上传资质文件
 			console.log(array)
@@ -247,6 +283,38 @@ page {
 			font-size: $font-size-20;
 		}
 	}
+	.remarks-category{
+		width: 100%;
+		display: flex;
+		flex-flow: row wrap;
+		justify-content: space-between;
+		align-items: center;
+		.checkbox-list {
+			height: 60rpx;
+			font-size: $font-size-28;
+			line-height: 60rpx;
+			border-radius: 10rpx;
+			margin-right: 20rpx;
+			margin-bottom: 10rpx;
+			box-sizing: border-box;
+			float: left;
+			.icon-yixuanze{
+				margin-right: 10rpx;
+				color: #E15616;
+			}
+			.icon-weixuanze{ 
+				margin-right: 10rpx;
+				color: #B2B2B2;
+			}
+		}
+		.item-text {
+			display: inline-block;
+			font-size: 26rpx;
+			color: #333333; 
+			border-radius: 28rpx;
+			line-height: 50rpx;
+		}
+	}
 	.remarks-input{
 		width: 100%;
 		height: 48rpx;

pages/seller/remarks/add.vue

@@ -30,6 +30,21 @@
 					maxlength="15"
 				/>
 			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"><text>*</text>咨询类别：</view>
+			</view>
+			<view class="remarks-category">
+				<view
+					class="checkbox-list"
+					:class="category.checked ? '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 }}
+				</view>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"><text>*</text>关键词记录：</view>
 			</view>
@@ -114,7 +129,16 @@ export default {
 			handleType: '',
 			clubUserId: 0,
 			clubInfo: {},
-			userInfo: {}
+			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},
+			]
 		}
 	},
 	onLoad(option) {
@@ -191,6 +215,18 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
+		choiceCategorys(category,index){
+			// 选择类别
+			category.checked = !category.checked
+			if (category.checked) {
+				this.checkedCategorysList.push(category.value)
+			} 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)
+		},
 		uploadFile(array) {
 			//上传资质文件
 			console.log(array)
@@ -327,6 +363,38 @@ page {
 			font-size: $font-size-20;
 		}
 	}
+	.remarks-category{
+		width: 100%;
+		display: flex;
+		flex-flow: row wrap;
+		justify-content: space-between;
+		align-items: center;
+		.checkbox-list {
+			height: 60rpx;
+			font-size: $font-size-28;
+			line-height: 60rpx;
+			border-radius: 10rpx;
+			margin-right: 20rpx;
+			margin-bottom: 10rpx;
+			box-sizing: border-box;
+			float: left;
+			.icon-yixuanze{
+				margin-right: 10rpx;
+				color: #E15616;
+			}
+			.icon-weixuanze{ 
+				margin-right: 10rpx;
+				color: #B2B2B2;
+			}
+		}
+		.item-text {
+			display: inline-block;
+			font-size: 26rpx;
+			color: #333333; 
+			border-radius: 28rpx;
+			line-height: 50rpx;
+		}
+	}
 	.remarks-input {
 		width: 100%;
 		height: 90rpx;

pages/seller/remarks/customer-list.vue

@@ -1,20 +1,23 @@
 <template>
 	<view class="container product clearfix">
 		<view class="club-search clearfix">
-			<view class="search-from name">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input
-					class="input"
-					type="text"
-					confirm-type="search"
-					v-model="listQuery.keyWord"
-					@input="onShowClose"
-					@confirm="GetProductListInfo"
-					placeholder="搜索咨询人"
-					maxlength="16"
-				/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+			<view class="club-search-form">
+				<view class="search-from name">
+					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+					<input
+						class="input"
+						type="text"
+						confirm-type="search"
+						v-model="listQuery.keyWord"
+						@input="onShowClose"
+						@confirm="GetProductListInfo"
+						placeholder="搜索关键词"
+						maxlength="16"
+					/>
+					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+				</view>
 			</view>
+			<view class="search-from-title"> 请选择一个咨询人，将他所有的咨询记录同步到一个机构中去 </view>
 		</view>
 		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '216rpx' : '168rpx' }">
 			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
@@ -26,11 +29,16 @@
 				<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="details(list)">
-							<view class="tui-remarks-name-le">咨询人：{{ list.questionMan }}</view>
-							<view class="tui-remarks-name-ri"><text class="iconfont icon-xiayibu"></text></view>
+						<view class="tui-remarks-name" @click.stop="checkedCoustomer(index)">
+							<view class="tui-remarks-name-le">{{ list.questionMan }}</view>
+							<view class="tui-remarks-name-ri">
+								<view
+									class="checkbox iconfont"
+									:class="[list.ischecked ? 'icon-yixuanze' : 'icon-weixuanze']"
+								>
+								</view>
+							</view>
 						</view>
-						<view class="tui-remarks-button" @click.stop="handleShowClubpopup(1, list)"> 修改姓名 </view>
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
@@ -39,29 +47,28 @@
 				</template>
 			</view>
 		</view>
-		<!-- 取消收藏操作 -->
+		<!-- 下一步 -->
 		<tui-bottom-popup :radius="false" :mask="false" :show="popupShow">
 			<view class="tui-popup-box clearfix">
 				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 					<view class="tui-flex-1">
-						<view class="tui-button" @click="handleShowClubpopup(2)">添加咨询人</view>
+						<view class="tui-button" @click="handleShowClubpopup">下一步</view>
 					</view>
 				</view>
 			</view>
 		</tui-bottom-popup>
-		<!-- 操作弹窗 -->
-		<cm-clubmodal
-			ref="clubModal"
-			v-if="isClubModalShow"
-			:show="isClubModalShow"
-			:modalType="modalType"
-			@handleChoiceaText="handleChoiceaTextData"
+		<!-- 添加记录 -->
+		<cm-clubpopup
+			ref="clubpopup"
+			v-if="isClubpopupShow"
+			:show="isClubpopupShow"
+			@handleChoiceaClub="handleChoiceaClubData"
 		>
-		</cm-clubmodal>
+		</cm-clubpopup>
 	</view>
 </template>
 <script>
-import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
+import cmClubpopup from '@/components/cm-module/cm-seller/cm-clubpopup'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
@@ -71,7 +78,7 @@ const defaultListQuery = {
 }
 export default {
 	components: {
-		cmClubmodal
+		cmClubpopup
 	},
 	data() {
 		return {
@@ -107,7 +114,9 @@ export default {
 			nomoreText: '上拉显示更多',
 			handleUpdataVisitorId: 0,
 			modalType: 1,
-			isClubModalShow: false
+			checkedIndex: 0,
+			isClubModalShow: false,
+			isClubpopupShow: false
 		}
 	},
 	onLoad() {},
@@ -139,7 +148,10 @@ export default {
 						this.isEmpty = false
 						this.hasNextPage = data.hasNextPage
 						this.totalRecord = data.totalRecord
-						this.remarksList = data.results
+						this.remarksList = data.results.map((el,index)=>{
+							el.ischecked = false
+							return el
+						})
 						this.pullFlag = false
 						setTimeout(() => {
 							this.pullFlag = true
@@ -192,15 +204,9 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		handleShowClubpopup(type, el) {
+		handleShowClubpopup() {
 			// 点击操作
-			this.modalType = type
-			if (this.modalType == 1) {
-				this.handleUpdataVisitorId = el.questionManId
-				this.isClubModalShow = true
-			} else {
-				this.isClubModalShow = true
-			}
+			this.isClubpopupShow = true
 		},
 		handleChoiceaTextData(data) {
 			// 监听获取
@@ -211,6 +217,10 @@ export default {
 				this.handleSaveVisitor(data)
 			}
 		},
+		handleChoiceaClubData(data){
+			// 同步机构
+			console.log('data',data)
+		},
 		handleUpdateVisitor(data) {
 			// 修改咨询人姓名
 			this.UserService.getUserClubVisitorUpdate({
@@ -265,14 +275,17 @@ export default {
 			this.listQuery.pageNum = 1
 			this.GetProductListInfo()
 		},
-		details(list) {
-			let VisitorInfo = {
-				questionManId: list.questionManId,
-				questionMan: list.questionMan
-			}
-			this.$api.setStorage('VisitorInfo', VisitorInfo)
-			this.$api.navigateTo('/pages/seller/remarks/record-list')
-		}
+		checkedCoustomer(idx) {
+			// 选择机构
+			this.checkedIndex = idx
+			this.remarksList.forEach((el, index) => {
+				if (this.checkedIndex == index) {
+					el.ischecked = !el.ischecked
+				} else {
+					el.ischecked = false
+				}
+			})
+		},
 	},
 	onPageScroll(e) {
 		//实时获取到滚动的值
@@ -299,57 +312,76 @@ export default {
 <style lang="scss">
 @import '@/uni.scss';
 page {
-	background: #f7f7f7;
+	background: #FFFFFF;
 }
 .empty-container {
 	z-index: 99;
 }
 .club-search {
 	width: 100%;
-	height: 112rpx;
-	padding: 24rpx;
+	height: 192rpx;
 	background: #ffffff;
 	box-sizing: border-box;
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 20;
-	.search-from {
+	z-index: 100;
+	.search-from-title {
 		width: 100%;
-		height: 100%;
-		background: #f7f7f7;
-		border-radius: 32rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		font-size: $font-size-26;
 		float: left;
-		position: relative;
-		.input {
-			width: 500rpx;
-			height: 64rpx;
-			float: left;
-			line-height: 64rpx;
-			color: $text-color;
-			font-size: $font-size-24;
-		}
-		.icon-iconfonticonfontsousuo1 {
-			width: 64rpx;
-			height: 64rpx;
-			line-height: 64rpx;
-			text-align: center;
-			display: block;
-			font-size: $font-size-38;
+		color: #1890f9;
+		background-color: #f2f9ff;
+		font-weight: normal;
+	}
+	.club-search-form {
+		width: 100%;
+		height: 112rpx;
+		background: #ffffff;
+		box-sizing: border-box;
+		padding: 24rpx;
+		float: left;
+		.search-from {
+			width: 100%;
+			height: 100%;
+			background: #f7f7f7;
+			border-radius: 32rpx;
 			float: left;
-			color: #999999;
-		}
-		.icon-shanchu1 {
-			font-size: $font-size-32;
-			color: #999999;
-			position: absolute;
-			width: 64rpx;
-			height: 64rpx;
-			line-height: 64rpx;
-			text-align: center;
-			top: 0;
-			right: 0;
-			z-index: 10;
+			position: relative;
+			.input {
+				width: 500rpx;
+				height: 64rpx;
+				float: left;
+				line-height: 64rpx;
+				color: $text-color;
+				font-size: $font-size-24;
+			}
+			.icon-iconfonticonfontsousuo1 {
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				display: block;
+				font-size: $font-size-38;
+				float: left;
+				color: #999999;
+			}
+			.icon-shanchu1 {
+				font-size: $font-size-32;
+				color: #999999;
+				position: absolute;
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				top: 0;
+				right: 0;
+				z-index: 10;
+			}
 		}
 	}
 }
@@ -360,7 +392,7 @@ page {
 	padding: 0;
 	box-sizing: border-box;
 	padding: 24rpx;
-	padding-top: 136rpx;
+	padding-top: 212rpx;
 	.empty-container-image {
 		width: 260rpx;
 		height: 260rpx;
@@ -368,12 +400,9 @@ page {
 	}
 	.tui-remarks-cell {
 		width: 100%;
-		height: 200rpx;
 		border-radius: 16rpx;
 		background: #ffffff;
-		margin-bottom: 24rpx;
 		box-sizing: border-box;
-		padding: 0 24rpx;
 		.tui-remarks-name {
 			width: 100%;
 			height: 100rpx;
@@ -388,11 +417,25 @@ page {
 			}
 			.tui-remarks-name-ri {
 				width: 40rpx;
+				height: 100%;
 				float: right;
-				line-height: 100rpx;
-				font-size: $font-size-44;
-				color: #b2b2b2;
-				text-align: center;
+				.checkbox {
+					width: 40rpx;
+					line-height: 128rpx;
+					float: right;
+					box-sizing: border-box;
+					text-align: center;
+					text-decoration: none;
+					-webkit-tap-highlight-color: transparent;
+					overflow: hidden;
+					font-size: $font-size-34;
+					&.icon-weixuanze {
+						color: #b2b2b2;
+					}
+					&.icon-yixuanze {
+						color: #e15616;
+					}
+				}
 			}
 		}
 		.tui-remarks-button {

pages/seller/remarks/details.vue

@@ -18,7 +18,7 @@
 		</view>
 		<view class="remarks-content clearfix">
 			<view class="list-view-title"> <view class="list-view-h1">咨询人：{{ remarksParams.questionMan }}</view> </view>
-			
+			<view class="list-view-title"> <view class="list-view-h1">咨询类别：</view> </view>
 			<view class="list-view-title"> <view class="list-view-h1">关键词记录：</view> </view>
 			<view class="tui-remarks-content">
 				<text class="tui-remarks-span" v-for="(label, labelIndex) in remarksParams.remarks" :key="labelIndex">

pages/seller/remarks/list.vue

@@ -13,6 +13,10 @@
 					   maxlength="16"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
+			<view class="search-screen" @click="showScreenDrawer">
+				<text class="iconfont icon-gengduo1"></text>
+				筛选
+			</view>
 		</view>
 		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '216rpx' : '168rpx' }">
 			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
@@ -24,10 +28,23 @@
 				<!-- 列表 -->
 				<view class="tui-remarks-cell  tui-mtop" v-for="(remark, index) in remarksList" :key="index" @click.stop="details(remark.remarksId)">
 					<view class="tui-remarks-title">
-						<view class="tui-remarks-time tt">{{ remark.clubName }}</view>
-						<view class="tui-remarks-time sm">{{ remark.addTime }}</view>
+						<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>
+						<view class="tui-remarks-title-bot">
+							<view class="tui-remarks-text h">记录人：黄豪</view>
+							<view class="tui-remarks-text y">管理员：张顺星</view>
+						</view>
+					</view>
+					<view class="tui-remarks-name">
+						<view class="tui-remarks-name-text h">
+							咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
+						</view>
+						<view class="tui-remarks-name-text y">
+							咨询类别：产品，二手
+						</view>
 					</view>
-					<view class="tui-remarks-name">咨询人：{{ remark.questionMan ? remark.questionMan : '' }}</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
 							{{ label }}
@@ -57,11 +74,77 @@
 				</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"
+						 :rightDrawer="isScreenDrawer"
+						 @handSearchConfirm="handSearchConfirmData">
+		</cm-screenDrawer>
 		<!-- 添加记录 -->
 		<cm-clubpopup ref="clubpopup" 
-				v-if="isClubpopupShow"
-				:show="isClubpopupShow"
-				@handleChoiceaClub="handleChoiceaClubData">
+					v-if="isClubpopupShow"
+					:show="isClubpopupShow"
+					@handleChoiceaClub="handleChoiceaClubData">
 		</cm-clubpopup>
 		<!-- 弹窗提示 -->
 		<tui-modal
@@ -80,6 +163,7 @@
 </template>
 <script>
 import cmClubpopup from '@/components/cm-module/cm-seller/cm-clubpopup'
+import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 
 import { mapState, mapMutations } from 'vuex'
@@ -90,7 +174,8 @@ const defaultListQuery = {
 }
 export default {
 	components: {
-		cmClubpopup
+		cmClubpopup,
+		cmScreenDrawer
 	},
 	data() {
 		return {
@@ -127,7 +212,8 @@ export default {
 			contentModalText: '', //操作文字提示语句
 			modal: false,
 			handleRemarksId:0,
-			isClubpopupShow:false
+			isClubpopupShow:false,
+			isScreenDrawer:false,
 		}
 	},
 	onLoad() {
@@ -228,12 +314,22 @@ export default {
 			this.$api.navigateTo('/pages/seller/remarks/record-list')
 		},
 		handleShowClubpopup(){ 
+			//显示已注册机构弹窗
 			this.isClubpopupShow = true
 		},
 		handleChoiceaClubData(data){
+			//跳转添加记录
 			console.log(data)
 			this.$api.navigateTo(`/pages/seller/remarks/add?userId=${data.userId}`)
 		},
+		handSearchConfirmData(data){
+			//确定筛选
+			console.log(data)
+		},
+		showScreenDrawer(){
+			//显示筛选抽屉
+			this.isScreenDrawer = true
+		},
 		handleClick(e) {
 			//确认删除
 			if (e.index == 1) {
@@ -318,15 +414,27 @@ page {
 	top: 0;
 	left: 0;
 	z-index: 20;
+	.search-screen{
+		width: 152rpx;
+		height: 64rpx;
+		float: right;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+		border: 1px solid #999999;
+		line-height: 64rpx;
+		border-radius: 32rpx;
+		color: #333333;
+		text-align: center;
+	}
 	.search-from{
-		width: 100%;
+		width: 526rpx;
 		height: 100%;
 		background: #F7F7F7;
 		border-radius: 32rpx;
 		float: left;
 		position: relative;
 		.input{
-			width: 500rpx;
+			width: 420rpx;
 			height: 64rpx;
 			float: left;
 			line-height: 64rpx;
@@ -379,31 +487,58 @@ page {
 		padding: 24rpx;
 		.tui-remarks-title{
 			width: 100%;
-			height: 48rpx;
-			line-height: 48rpx;
-			.tui-remarks-time {
-				float: left;
-				&.tt{
-					width: 60%;
-					font-size: $font-size-32;
-					color: #333333;
-					text-align: left;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					display: -webkit-box;
-					-webkit-line-clamp: 1;
-					line-clamp: 1;
-					-webkit-box-orient: vertical;
-					font-weight: bold;
+			height: 144rpx;
+			line-height: 144rpx;
+			box-sizing: border-box;
+			padding: 20rpx 0;
+			border-bottom: 1px solid #E1E1E1;
+			.tui-remarks-title-top{
+				width: 100%;
+				height: 56rpx;
+				line-height: 56rpx;
+				.tui-remarks-time {
+					float: left;
+					&.tt{
+						width: 60%;
+						font-size: $font-size-32;
+						color: #333333;
+						text-align: left;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-weight: bold;
+					}
+					&.sm{
+						width: 40%;
+						font-size: $font-size-26;
+						color: #999999;
+						text-align: right;
+					}
 				}
-				&.sm{
-					width: 40%;
+			}
+			.tui-remarks-title-bot{
+				width: 100%;
+				height: 48rpx;
+				line-height: 48rpx;
+				.tui-remarks-text{
+					height: 48rpx;
+					text-align: left;
 					font-size: $font-size-26;
 					color: #999999;
-					text-align: right;
+					float: left;
+					&.h{
+						padding-right: 24rpx;
+						border-right: 1px solid #E1E1E1;
+					}
+					&.y{
+						padding-left: 24rpx;
+					}
 				}
 			}
-		}
+		}	
 		.tui-remarks-name{
 			width: 100%;
 			height: 48rpx;
@@ -412,12 +547,24 @@ page {
 			color: #666666;
 			text-align: left;
 			margin-bottom: 20rpx;
+			margin-top: 20rpx;
+			.tui-remarks-name-text{
+				height: 48rpx;
+				text-align: left;
+				font-size: $font-size-26;
+				color: #333333;
+				float: left;
+				&.h{
+					padding-right: 24rpx;
+				}
+				&.y{
+					padding-left: 24rpx;
+				}
+			}
 		}
 		.tui-remarks-content {
 			width: 100%;
 			height: auto;
-			border-bottom: 1px solid #E1E1E1;
-			margin-bottom: 24rpx;
 			.tui-remarks-span{
 				height: 48rpx;
 				line-height: 48rpx;
@@ -437,7 +584,9 @@ page {
 		}
 		.tui-remarks-button {
 			width: 100%;
-			height: 48rpx;
+			height: 68rpx;
+			border-top: 1px solid #E1E1E1;
+			padding-top: 20rpx;
 			.btn {
 				width: 50%;
 				line-height: 48rpx;

pages/seller/remarks/record-list.vue

@@ -16,9 +16,13 @@
 					/>
 					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 				</view>
+				<view class="search-screen" @click="showScreenDrawer">
+					<text class="iconfont icon-gengduo1"></text>
+					筛选
+				</view>
 			</view>
 		</view>
-		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '182rpx' : '148rpx' }">
+		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '220rpx' : '148rpx' }">
 			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
 				<!-- 空白页 -->
 				<view class="empty-container" v-if="isEmpty">
@@ -33,7 +37,24 @@
 						:key="index"
 						@click.stop="details(remark.remarksId)"
 					>
-						<view class="tui-remarks-title">{{ remark.addDate }}</view>
+						<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>
+							<view class="tui-remarks-title-bot">
+								<view class="tui-remarks-text h">记录人：黄豪</view>
+								<view class="tui-remarks-text y">管理员：张顺星</view>
+							</view>
+						</view>
+						<view class="tui-remarks-name">
+							<view class="tui-remarks-name-text h">
+								咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
+							</view>
+							<view class="tui-remarks-name-text y">
+								咨询类别：产品，二手
+							</view>
+						</view>
 						<view class="tui-remarks-content">
 							<text
 								class="tui-remarks-span"
@@ -60,7 +81,7 @@
 			<view class="tui-popup-box clearfix">
 				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 					<view class="tui-flex-1">
-						<view class="tui-button" :class="isEmpty ? 'disabled' : 'cancel'" 
+						<view class="tui-button" :class="isEmpty ? 'disabled' : 'cancel'" @click="handleShowFereepopup"
 							>添加记录</view
 						>
 						<view class="tui-button confirm" @click="handleAddRecord">新增咨询人</view>
@@ -71,14 +92,20 @@
 				</view>
 			</view>
 		</tui-bottom-popup>
-		<!-- 同步机构 -->
-		<cm-clubpopup
-			ref="clubpopup"
-			v-if="isClubpopupShow"
-			:show="isClubpopupShow"
-			@handleChoiceaClub="handleChoiceaClubData"
-		>
+		<!-- 筛选抽屉 -->
+		<cm-screenDrawer ref="screendrawer"
+						 :rightDrawer="isScreenDrawer"
+						 @handSearchConfirm="handSearchConfirmData">
+		</cm-screenDrawer>
 		</cm-clubpopup>
+		<!-- 咨询人列表弹窗 -->
+		<cm-refereepopup
+			ref="cmrefereepopup"
+			v-if="isClubConsultShow"
+			:show="isClubConsultShow"
+			@handleChoiceaConsult="handleChoiceaConsultData"
+		>
+		</cm-refereepopup>
 		<!-- 弹窗提示 -->
 		<tui-modal
 			:show="modal"
@@ -104,13 +131,11 @@
 	</view>
 </template>
 <script>
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
-import cmClubpopup from '@/components/cm-module/cm-seller/cm-clubpopup'
+import { mapState, mapMutations } from 'vuex'
+import cmRefereepopup from '@/components/cm-module/cm-seller/cm-refereepopup'
 import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
+import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
-
-import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
 	serviceProviderId: 0,
 	pageNum: 1,
@@ -118,10 +143,9 @@ const defaultListQuery = {
 }
 export default {
 	components: {
-		tuiLoadmore,
-		tuiNomore,
-		cmClubpopup,
-		cmClubmodal
+		cmRefereepopup,
+		cmClubmodal,
+		cmScreenDrawer
 	},
 	data() {
 		return {
@@ -160,8 +184,9 @@ export default {
 			questionMan: '',
 			questionManId: '',
 			handleRemarksId: 0,
-			isClubpopupShow: false,
-			isClubModalShow: false
+			isClubConsultShow:false,
+			isClubModalShow: false,
+			isScreenDrawer:false,
 		}
 	},
 	onLoad(option) {
@@ -191,7 +216,7 @@ export default {
 		getUserClubVisitorRecordlist() {
 			this.remarksList = []
 			this.listQuery.pageNum = 1
-			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+			this.UserService.getUserClubRemarksList(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
@@ -258,19 +283,13 @@ export default {
 		},
 		handEditRemark(remarksId) {
 			//跳转修改画像
-			this.$api.redirectTo(`/pages/seller/remarks/add-record?type=edit&remarksId=${remarksId}&questionMan=${
+			this.$api.navigateTo(`/pages/seller/remarks/add-record?type=edit&remarksId=${remarksId}&questionMan=${
 					this.questionMan
 				}`)
 		},
-		handleAllUnder() {
-			//跳转添加资料备注
-			this.$api.navigateTo('/pages/seller/remarks/customer-list')
-		},
 		handleShowClubpopup() {
-			if (this.isEmpty) {
-				return
-			}
-			this.isClubpopupShow = true
+			//跳转选择咨询人
+			this.$api.navigateTo('/pages/seller/remarks/customer-list')
 		},
 		handleChoiceaClubData(data) {// 同步至机构
 			console.log(data)
@@ -290,9 +309,18 @@ export default {
 				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() {// 新增咨询人
 			this.isClubModalShow = true
 		},
+		handleShowFereepopup(){// 显示咨询人弹窗
+			this.isClubConsultShow = true
+		},
 		handleChoiceaTextData(data) {// 监听弹窗事件
 			console.log('data',data)
 			this.handleSaveVisitor(data)
@@ -338,6 +366,10 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
+		showScreenDrawer(){
+			//显示筛选抽屉
+			this.isScreenDrawer = true
+		},
 		onShowClose() {
 			//输入框失去焦点时触发
 			if (this.listQuery.keyWord != '') {
@@ -409,15 +441,27 @@ page {
 		box-sizing: border-box;
 		padding: 24rpx;
 		float: left;
+		.search-screen{
+			width: 152rpx;
+			height: 64rpx;
+			float: right;
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			border: 1px solid #999999;
+			line-height: 64rpx;
+			border-radius: 32rpx;
+			color: #333333;
+			text-align: center;
+		}
 		.search-from {
-			width: 100%;
+			width: 526rpx;
 			height: 100%;
 			background: #f7f7f7;
 			border-radius: 32rpx;
 			float: left;
 			position: relative;
 			.input {
-				width: 500rpx;
+				width: 420rpx;
 				height: 64rpx;
 				float: left;
 				line-height: 64rpx;
@@ -456,7 +500,7 @@ page {
 	padding: 0;
 	box-sizing: border-box;
 	padding: 24rpx;
-	padding-top: 212rpx;
+	padding-top: 134rpx;
 	.empty-container-image {
 		width: 260rpx;
 		height: 260rpx;
@@ -469,30 +513,86 @@ page {
 		margin-bottom: 24rpx;
 		box-sizing: border-box;
 		padding: 24rpx;
-		.tui-remarks-title {
+		.tui-remarks-title{
 			width: 100%;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: $font-size-26;
-			color: #333333;
-			border-bottom: 1px solid #e1e1e1;
+			height: 144rpx;
+			line-height: 144rpx;
 			box-sizing: border-box;
-		}
-		.tui-remarks-name {
+			padding: 20rpx 0;
+			border-bottom: 1px solid #E1E1E1;
+			.tui-remarks-title-top{
+				width: 100%;
+				height: 56rpx;
+				line-height: 56rpx;
+				.tui-remarks-time {
+					float: left;
+					&.tt{
+						width: 60%;
+						font-size: $font-size-32;
+						color: #333333;
+						text-align: left;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-weight: bold;
+					}
+					&.sm{
+						width: 40%;
+						font-size: $font-size-26;
+						color: #999999;
+						text-align: right;
+					}
+				}
+			}
+			.tui-remarks-title-bot{
+				width: 100%;
+				height: 48rpx;
+				line-height: 48rpx;
+				.tui-remarks-text{
+					height: 48rpx;
+					text-align: left;
+					font-size: $font-size-26;
+					color: #999999;
+					float: left;
+					&.h{
+						padding-right: 24rpx;
+						border-right: 1px solid #E1E1E1;
+					}
+					&.y{
+						padding-left: 24rpx;
+					}
+				}
+			}
+		}	
+		.tui-remarks-name{
 			width: 100%;
-			height: 37rpx;
-			line-height: 37rpx;
+			height: 48rpx;
+			line-height: 48rpx;
 			font-size: $font-size-26;
 			color: #666666;
 			text-align: left;
-			margin-bottom: 24rpx;
+			margin-bottom: 20rpx;
+			margin-top: 20rpx;
+			.tui-remarks-name-text{
+				height: 48rpx;
+				text-align: left;
+				font-size: $font-size-26;
+				color: #333333;
+				float: left;
+				&.h{
+					padding-right: 24rpx;
+				}
+				&.y{
+					padding-left: 24rpx;
+				}
+			}
 		}
 		.tui-remarks-content {
 			width: 100%;
 			height: auto;
-			border-bottom: 1px solid #e1e1e1;
-			margin-bottom: 24rpx;
-			padding-top: 20rpx;
 			.tui-remarks-span {
 				height: 48rpx;
 				line-height: 48rpx;
@@ -512,7 +612,9 @@ page {
 		}
 		.tui-remarks-button {
 			width: 100%;
-			height: 48rpx;
+			height: 68rpx;
+			border-top: 1px solid #E1E1E1;
+			padding-top: 20rpx;
 			.btn {
 				width: 50%;
 				line-height: 48rpx;
@@ -521,12 +623,12 @@ page {
 				font-size: $font-size-34;
 				float: left;
 				font-weight: bold;
-				&.edit {
-					color: #1890f9;
-					border-right: 1px solid #e1e1e1;
+				&.edit{
+					color: #1890F9;
+					border-right: 1px solid #E1E1E1;
 				}
-				&.del {
-					color: #f94b4b;
+				&.del{
+					color: #F94B4B;
 				}
 			}
 		}