Explorar el Código

咨询记录新增报备

zhengjinyi hace 2 años
padre
commit
4d3533b596

+ 409 - 0
components/cm-module/cm-seller/cm-goods-popup.vue

@@ -0,0 +1,409 @@
+<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="(pros, index) in dataList"
+							:key="index"
+							class="list"
+							@click.stop="checkedCoupon(index)"
+						>
+							<view class="list-cell-le">
+								<image
+									class="logo"
+									:src="pros.images"
+									mode=""
+								></image>
+							</view>
+							<view class="list-cell-ri">
+								<view class="list-text">{{ pros.name }}</view>
+								<view class="list-text small"> <text class="none">供应商:</text>{{ pros.shopName }}</view>
+								<view class="list-text red">¥{{ pros.price }}</view>
+							</view>
+							<view class="list-cell-btn">
+								<view
+									class="checkbox iconfont"
+									:class="[pros.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: {
+				userIdentity: '',
+				name: '',
+				pageNum: 1,
+				pageSize: 200,
+				spId: this.serviceProviderId,
+				status: 66
+			},
+			dataList: [
+				{
+					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
+					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
+					shopName:'广州市昊运生物科技有限公司',
+					price:100000,
+					ischecked:false
+				},
+				{
+					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
+					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
+					shopName:'广州市昊运生物科技有限公司',
+					price:100000,
+					ischecked:false
+					
+				},
+				{
+					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
+					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
+					shopName:'广州市昊运生物科技有限公司',
+					price:100000,
+					ischecked:false
+					
+				},
+				{
+					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
+					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
+					shopName:'广州市昊运生物科技有限公司',
+					price:100000,
+					ischecked:false
+					
+				},
+			]
+		}
+	},
+	created() {
+		// this.initclubList()
+	},
+	methods: {
+		async initclubList() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.spId = userInfo.serviceProviderId
+			this.SellerService.GetSellerClubList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.list && data.list.length > 0) {
+						 this.dataList = data.list.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 goods = null
+			let checkedData = false
+			this.dataList.forEach((el, index) => {
+				if (el.ischecked) {
+					goods = el
+					checkedData = true
+				}
+			})
+			if (checkedData) {
+				this.$emit('handleChoiceaGoods', goods)
+			}
+			this.$parent.isGoodspopup = 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: 176rpx;
+				box-sizing: border-box;
+				padding: 24rpx 0;
+				background-size: cover;
+				.list-cell-le {
+					width: 128rpx;
+					height: 100%;
+					box-sizing: border-box;
+					float: left;
+					border: 1px dashed #e1e1e1;
+					.logo {
+						width: 125rpx;
+						height: 125rpx;
+						border-radius: 8rpx;
+					}
+				}
+				.list-cell-ri {
+					width: 470rpx;
+					height: 100%;
+					box-sizing: border-box;
+					float: left;
+					margin-left: 24rpx;
+					.list-text{
+						width: 100%;
+						height: 42rpx;
+						float: left;
+						line-height: 42rpx;
+						text-align: left;
+						font-size: $font-size-26;
+						color: #333333;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						&.small{
+							font-size: 24rpx;
+							.none{
+								color: #999;
+							}
+						}
+						&.red{
+							color: #F94B4B;
+						}
+					}
+				}
+				.list-cell-btn {
+					width: 40rpx;
+					height: 100%;
+					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>

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

@@ -51,7 +51,7 @@
 
 <script>
 export default {
-	name: 'coupon',
+	name: 'cm-goods-popup',
 	props: {
 		show: {
 			type: Boolean,

+ 528 - 0
components/cm-module/cm-seller/cm-report-popup.vue

@@ -0,0 +1,528 @@
+<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="(remark, index) in dataList"
+							:key="index"
+							class="list clearfix"
+							@click.stop="checkedCoupon(index)"
+						>
+							<view
+								class="list-cell-icon"
+								:class="{
+									reviewed: remark.type == 1,
+									failed: remark.type == 2,
+									approved: remark.type == 3
+								}"
+							>
+							</view>
+							<view class="list-cell-title">
+								<view class="list-cell-h1">{{ remark.clubName }}</view>
+								<view class="list-cell-p"> {{ remark.addDate }} </view>
+							</view>
+							<view class="list-cell-content clearfix">
+								<view class="tui-remarks-goods" v-if="remark.product">
+									<view class="goods-image">
+										<image :src="remark.product.images" mode=""></image>
+									</view>
+									<view class="goods-main">
+										<view class="name"> {{ remark.product.name }} </view>
+										<view class="shop">{{ remark.reportText }}</view>
+									</view>
+								</view>
+								<view class="tui-remarks-text" v-else> {{ remark.reportText }} </view>
+								<view class="list-cell-btn">
+									<view
+										class="checkbox iconfont"
+										:class="[remark.ischecked ? 'icon-yixuanze' : 'icon-weixuanze']"
+									>
+									</view>
+								</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 class="tui-flex-1">
+						<view class="tui-button-text" @click="handleAddReport">新建报备 ></view>
+					</view>
+				</view>
+			</view>
+		</tui-bottom-popup>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'coupon',
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		popupType:{
+			type:Number,
+		}
+	},
+	data() {
+		return {
+			isIphoneX: this.$store.state.isIphoneX,
+			checkedIndex: 0,
+			isShowClose: false,
+			listQuery: {
+				userIdentity: '',
+				name: '',
+				pageNum: 1,
+				pageSize: 200,
+				spId: this.serviceProviderId,
+				status: 66
+			},
+			dataList: [
+				{
+					clubName: '采美信息技术有限公司',
+					recordName: '吴小研',
+					addDate: '2022-08-10',
+					ischecked: false,
+					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product: {
+						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:
+							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type: 1
+				},
+				{
+					clubName: '采美信息技术有限公司',
+					recordName: '吴小研',
+					addDate: '2022-08-10',
+					ischecked: false,
+					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product: {
+						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:
+							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type: 2
+				},
+				{
+					clubName: '采美信息技术有限公司',
+					recordName: '吴小研',
+					addDate: '2022-08-10',
+					ischecked: false,
+					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product: null,
+					type: 3
+				},
+				{
+					clubName: '采美信息技术有限公司',
+					recordName: '吴小研',
+					addDate: '2022-08-10',
+					ischecked: false,
+					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product: {
+						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:
+							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type: 1
+				},
+				{
+					clubName: '采美信息技术有限公司',
+					recordName: '吴小研',
+					addDate: '2022-08-10',
+					ischecked: false,
+					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product: {
+						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:
+							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type: 2
+				},
+				{
+					clubName: '采美信息技术有限公司',
+					recordName: '吴小研',
+					addDate: '2022-08-10',
+					ischecked: false,
+					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product: null,
+					type: 3
+				}
+			],
+		}
+	},
+	created() {
+		console.log('22222222',this.popupType)
+		// this.initclubList()
+	},
+	methods: {
+		async initclubList() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.spId = userInfo.serviceProviderId
+			this.SellerService.GetSellerClubList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.list && data.list.length > 0) {
+						this.dataList = data.list.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
+				}
+			})
+		},
+		handleAddReport(){
+			// 跳转新建报备
+			this.$parent.isReportpopup = false
+			this.$api.navigateTo(`/pages/seller/remarks/report-add?type=${this.popupType}`)
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.listQuery.name != '') {
+				this.isShowClose = true
+			} else {
+				this.isShowClose = false
+			}
+		},
+		delInputText() {
+			//清除输入框内容
+			this.listQuery.name = ''
+			this.isShowClose = false
+		},
+		hidePopup() {
+			let report = null
+			let checkedData = false
+			this.dataList.forEach((el, index) => {
+				if (el.ischecked) {
+					report = el
+					checkedData = true
+				}
+			})
+			if (checkedData) {
+				this.$emit('handleChoiceaReport', report)
+			}
+			this.$parent.isReportpopup = 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: 40rpx;
+		.tui-popup-scroll {
+			width: 100%;
+			height: 800rpx;
+			.list {
+				width: 100%;
+				padding-top: 20rpx;
+				box-sizing: border-box;
+				background-size: cover;
+				position: relative;
+				border-bottom: 1px solid #e1e1e1;
+				.list-cell-icon {
+					width: 128rpx;
+					height: 128rpx;
+					position: absolute;
+					top: 30rpx;
+					right: 32rpx;
+					&.reviewed {
+						background: url(https://static.caimei365.com/app/img/icon/icon-verify1@2x.png);
+						background-size: cover;
+					}
+					&.failed {
+						background: url(https://static.caimei365.com/app/img/icon/icon-verify2@2x.png);
+						background-size: cover;
+					}
+					&.approved {
+						background: url(https://static.caimei365.com/app/img/icon/icon-verify3@2x.png);
+						background-size: cover;
+					}
+				}
+				.list-cell-title {
+					width: 100%;
+					height: auto;
+					height: 56rpx;
+					line-height: 56rpx;
+					box-sizing: border-box;
+					.list-cell-h1 {
+						float: left;
+						width: 50%;
+						font-size: $font-size-26;
+						color: #333333;
+						text-align: left;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+					.list-cell-p {
+						float: right;
+						width: 50%;
+						font-size: $font-size-26;
+						color: #999999;
+						text-align: right;
+					}
+				}
+				.list-cell-content {
+					width: 100%;
+					box-sizing: border-box;
+					.tui-remarks-text {
+						width: 570rpx;
+						height: 168rpx;
+						float: left;
+						box-sizing: border-box;
+						padding: 20rpx 20rpx 20rpx 0;
+						border-radius: 6rpx;
+						line-height: 42rpx;
+						color: #999999;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 3;
+						line-clamp: 3;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+					.tui-remarks-goods {
+						width: 646rpx;
+						height: 168rpx;
+						float: left;
+						box-sizing: border-box;
+						padding: 20rpx 0;
+						border-radius: 6rpx;
+						.goods-image {
+							width: 128rpx;
+							height: 128rpx;
+							float: left;
+							image {
+								width: 128rpx;
+								height: 128rpx;
+								display: block;
+								border-radius: 4rpx;
+							}
+						}
+						.goods-main {
+							width: 440rpx;
+							height: 128rpx;
+							box-sizing: border-box;
+							padding-left: 24rpx;
+							float: left;
+							.name {
+								width: 100%;
+								height: 48rpx;
+								box-sizing: border-box;
+								line-height: 48rpx;
+								color: #333333;
+								text-overflow: ellipsis;
+								overflow: hidden;
+								display: -webkit-box;
+								-webkit-line-clamp: 1;
+								line-clamp: 1;
+								-webkit-box-orient: vertical;
+								font-size: 26rpx;
+							}
+							.shop {
+								line-height: 36rpx;
+								color: #999999;
+								font-size: 26rpx;
+								text-overflow: ellipsis;
+								overflow: hidden;
+								display: -webkit-box;
+								-webkit-line-clamp: 2;
+								line-clamp: 2;
+								-webkit-box-orient: vertical;
+								font-size: 24rpx;
+							}
+						}
+					}
+					.list-cell-btn {
+						width: 40rpx;
+						height: 168rpx;
+						float: right;
+						.checkbox {
+							width: 40rpx;
+							line-height: 168rpx;
+							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-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;
+		}
+		.tui-button-text{
+			width: 600rpx;
+			height: 48rpx;
+			line-height: 48rpx;
+			text-align: center;
+			color: #e15616;
+			font-size: $font-size-26;
+			margin: 0 auto;
+			margin-top: 15rpx;
+		}
+	}
+}
+</style>

+ 39 - 0
components/cm-module/cm-seller/cm-screen-drawer.vue

@@ -99,6 +99,24 @@
 								</picker>
 							</view>
 						</view>
+						<view class="drawer-main-name">报备状态:</view>
+						<view class="drawer-main-radiov">
+							<view class="drawer-main-radio">
+								<picker @change="bindPickerChange(4,$event)" :value="index" :range="reportActions" range-key="name">
+									<input class="input" type="text" disabled="false" v-model="reportText" value="" placeholder="请选择"/>
+									<text class="iconfont icon-xiangyou"></text>
+								</picker>
+							</view>
+						</view>
+						<view class="drawer-main-name">新增分配机构:</view>
+						<view class="drawer-main-radiov">
+							<view class="drawer-main-radio">
+								<picker @change="bindPickerChange(5,$event)" :value="index" :range="clubActions" range-key="name">
+									<input class="input" type="text" disabled="false" v-model="clubStateText" value="" placeholder="请选择"/>
+									<text class="iconfont icon-xiangyou"></text>
+								</picker>
+							</view>
+						</view>
 					</view>
 				</scroll-view>
 				<view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
@@ -141,9 +159,11 @@ export default {
 			checkedCategorysList:[],
 			groups:[],
 			members:[],
+			reportText:'',
 			priceFlagText:'',
 			intenFlagText:'',
 			followStateText:'',
+			clubStateText:'',
 			queryData:{
 				startAddTime:'',
 				endAddTime:'',
@@ -174,6 +194,17 @@ export default {
 				{name: '跟进完成',value:2},
 				{name: '已放弃',value:3},
 			],
+			reportActions:[
+				{name:'全部',value:0},
+				{name:'待审核',value:1},
+				{name: '审核通过',value:2},
+				{name: '审核未通过',value:3},
+			],
+			clubActions:[
+				{name:'全部',value:0},
+				{name:'是',value:1},
+				{name: '否',value:2},
+			],
 		}
 	},
 	created() {
@@ -298,6 +329,14 @@ export default {
 					this.followStateText = this.stateActions[e.target.value].name
 					this.queryData.followup = this.stateActions[e.target.value].value
 					break
+				case 4:			
+					this.reportText = this.reportActions[e.target.value].name
+					this.queryData.followup = this.reportActions[e.target.value].value
+					break
+				case 5:			
+					this.clubStateText = this.clubActions[e.target.value].name
+					this.queryData.followup = this.clubActions[e.target.value].value
+					break
 			}
 		},
 		closeDrawer(){

+ 38 - 1
pages.json

@@ -556,7 +556,8 @@
 		},
 		{
 			"root": "pages/seller/",
-			"pages": [{
+			"pages": [
+				{
 					"path": "index/index",
 					"style": {
 						"navigationBarTitleText": "采美采购商城",
@@ -767,6 +768,42 @@
 					"style": {
 						"navigationBarTitleText": "记录详情"
 					}
+				},
+				{
+					"path": "remarks/report-add",
+					"style": {
+						"navigationBarTitleText": "新建报备"
+					}
+				},
+				{
+					"path": "remarks/report-details",
+					"style": {
+						"navigationBarTitleText": "报备详情"
+					}
+				},
+				{
+					"path": "remarks/report-list",
+					"style": {
+						"navigationBarTitleText": "注册客户报备记录"
+					}
+				},
+				{
+					"path": "remarks/report-visitor-list",
+					"style": {
+						"navigationBarTitleText": "报备记录"
+					}
+				},
+				{
+					"path": "remarks/relation-consult-list",
+					"style": {
+						"navigationBarTitleText": "关联咨询记录"
+					}
+				},
+				{
+					"path": "remarks/relation-visitor-list",
+					"style": {
+						"navigationBarTitleText": "关联咨询记录"
+					}
 				}
 			]
 		},

+ 199 - 2
pages/seller/remarks/add-record.vue

@@ -31,6 +31,26 @@
 					maxlength="15"
 				/>
 			</view>
+			<view class="list-view-title"> <view class="list-view-h1">咨询商品:</view> </view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-goods-input" v-if="handleGoods.length === 0" @click="handleShowGoodPopup">
+					<view class="input-add"> <text class="iconfont icon-jiahao"></text> </view>
+					<view class="input-text"> 点击添加客户咨询的商品 </view>
+				</view>
+				<view class="tui-remarks-showgoods" v-else>
+					<view class="tui-remarks-goods" v-for="(pros, index) in handleGoods" :key="index">
+						<view class="goods-image"> <image :src="pros.images" mode=""></image> </view>
+						<view class="goods-main">
+							<view class="name"> {{ pros.name }} </view>
+							<view class="shop"> 供应商:{{ pros.shopName }} </view>
+						</view>
+					</view>
+					<view class="tui-remarks-btn">
+						<view class="btn delete" @click="handleClean">删除</view> 
+						<view class="btn update" @click="handleShowGoodPopup">更换</view>
+					</view>
+				</view>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"><text>*</text>关键词记录:</view>
 				<view class="list-view-p"
@@ -76,6 +96,23 @@
 					</view>
 				</view>
 			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1">关联报备:</view>
+				<view class="list-view-p"
+					>(若客户咨询的事项不确定采美能不能做,请创建并关联报备向上级反馈)</view
+				>
+			</view>
+			<view class="list-view-radio" @click="handleShowReportPopup">
+				<input
+					class="input"
+					type="text"
+					disabled="false"
+					v-model="priceFlagText"
+					value=""
+					placeholder="请选择报备"
+				/>
+				<text class="iconfont icon-xiangyou"></text>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"><text>*</text>价格敏感度:</view>
 			</view>
@@ -177,6 +214,23 @@
 		<view class="remarks-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 			<view class="edit-button" @click="editButtonConfim">确定</view>
 		</view>
+		<!-- 商品列表弹窗 -->
+		<cm-goodspopup
+			ref="cmgoodspopup"
+			v-if="isGoodspopup"
+			:show="isGoodspopup"
+			@handleChoiceaGoods="handleChoiceaGoodsData"
+		>
+		</cm-goodspopup>
+		<!-- 商品列表弹窗 -->
+		<cm-reportpopup
+			ref="cmreportpopup"
+			v-if="isReportpopup"
+			:show="isReportpopup"
+			:popupType ="2"
+			@handleChoiceaReport="handleChoiceaReportData"
+		>
+		</cm-reportpopup>
 	</view>
 </template>
 
@@ -184,9 +238,15 @@
 import { mapState, mapMutations } from 'vuex'
 import authorize from '@/common/config/authorize.js'
 import { uploadFileImage, uploadFilePdfDocDocxXlsx } from '@/services/public.js'
+import cmGoodspopup from '@/components/cm-module/cm-seller/cm-goods-popup'
+import cmReportpopup from '@/components/cm-module/cm-seller/cm-report-popup'
 
 var isPreviewImg
 export default {
+	components: {
+		cmGoodspopup,
+		cmReportpopup
+	},
 	data() {
 		return {
 			isIphoneX: this.$store.state.isIphoneX,
@@ -238,7 +298,10 @@ export default {
 				}
 			],
 			checkRemarkIndex:0,
-			assActionList: []
+			assActionList: [],
+			isGoodspopup:false,
+			isReportpopup:false,
+			handleGoods: []
 		}
 	},
 	onLoad(option) {
@@ -431,6 +494,27 @@ export default {
 			}
 			this.remarksParams.consult = this.checkedCategorysList.join(',')
 		},
+		handleShowReportPopup(){
+			// 显示报备弹窗
+			this.isReportpopup = true
+		},
+		handleShowGoodPopup() {
+			// 显示添加商品弹窗
+			this.isGoodspopup = true
+		},
+		handleClean(){//删除选择的商品
+			this.handleGoods = []
+		},
+		handleChoiceaGoodsData(data) {
+			console.log('data', data)
+			this.handleGoods = []
+			this.handleGoods.push(data)
+		},
+		handleChoiceaReportData(data) {
+			console.log('data', data)
+			this.handleGoods = []
+			this.handleGoods.push(data)
+		},
 		contains(arr, val) {// 校验
 			return arr.some(item => item === val)
 		},
@@ -556,6 +640,119 @@ page {
 			font-size: $font-size-20;
 		}
 	}
+	.tui-remarks-content {
+		width: 100%;
+		height: auto;
+		margin-bottom: 24rpx;
+		.tui-remarks-goods-input {
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			background-color: #f7f7f7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.input-add {
+				width: 128rpx;
+				height: 128rpx;
+				line-height: 128rpx;
+				float: left;
+				text-align: center;
+				box-sizing: border-box;
+				border: 1px dashed #b2b2b2;
+				border-radius: 6rpx;
+				.iconfont {
+					font-size: 44rpx;
+					color: #b2b2b2;
+				}
+			}
+			.input-text {
+				height: 128rpx;
+				box-sizing: border-box;
+				padding: 0 32rpx;
+				line-height: 128rpx;
+				text-align: left;
+				font-size: 26rpx;
+				color: #b2b2b2;
+				float: left;
+			}
+		}
+		.tui-remarks-showgoods {
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			.tui-remarks-btn {
+				width: 90rpx;
+				height: 180rpx;
+				float: right;
+				.btn {
+					width: 100%;
+					height: 90rpx;
+					float: left;
+					line-height: 90rpx;
+					text-align: center;
+					font-size: 26rpx;
+					&.delete {
+						color: #f94b4b;
+					}
+					&.update {
+						color: #1890f9;
+					}
+				}
+			}
+			.tui-remarks-goods {
+				width: 612rpx;
+				height: 180rpx;
+				box-sizing: border-box;
+				background-color: #f7f7f7;
+				padding: 26rpx;
+				border-radius: 6rpx;
+				float: left;
+				.goods-image {
+					width: 128rpx;
+					height: 128rpx;
+					float: left;
+					image {
+						width: 128rpx;
+						height: 128rpx;
+						display: block;
+						border-radius: 4rpx;
+					}
+				}
+				.goods-main {
+					width: 432rpx;
+					height: 128rpx;
+					box-sizing: border-box;
+					padding-left: 32rpx;
+					float: right;
+					.name {
+						width: 100%;
+						height: 60rpx;
+						box-sizing: border-box;
+						line-height: 60rpx;
+						color: #333333;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+					.shop {
+						line-height: 60rpx;
+						color: #999999;
+						font-size: 26rpx;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+		}
+	}
 	.list-view-radio {
 		width: 100%;
 		height: 90rpx;
@@ -852,7 +1049,7 @@ page {
 	bottom: 0;
 	left: 0;
 	background-color: #ffffff;
-	z-index: 9999;
+	z-index: 99;
 	.edit-button-canel {
 		width: 100%;
 		height: 88rpx;

+ 199 - 2
pages/seller/remarks/add.vue

@@ -58,6 +58,26 @@
 					maxlength="15"
 				/>
 			</view>
+			<view class="list-view-title"> <view class="list-view-h1">咨询商品:</view> </view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-goods-input" v-if="handleGoods.length === 0" @click="handleShowGoodPopup">
+					<view class="input-add"> <text class="iconfont icon-jiahao"></text> </view>
+					<view class="input-text"> 点击添加客户咨询的商品 </view>
+				</view>
+				<view class="tui-remarks-showgoods" v-else>
+					<view class="tui-remarks-goods" v-for="(pros, index) in handleGoods" :key="index">
+						<view class="goods-image"> <image :src="pros.images" mode=""></image> </view>
+						<view class="goods-main">
+							<view class="name"> {{ pros.name }} </view>
+							<view class="shop"> 供应商:{{ pros.shopName }} </view>
+						</view>
+					</view>
+					<view class="tui-remarks-btn">
+						<view class="btn delete" @click="handleClean">删除</view> 
+						<view class="btn update" @click="handleShowGoodPopup">更换</view>
+					</view>
+				</view>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"><text>*</text>关键词记录:</view>
 				<view class="list-view-p"
@@ -103,6 +123,23 @@
 					</view>
 				</view>
 			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1">关联报备:</view>
+				<view class="list-view-p"
+					>(若客户咨询的事项不确定采美能不能做,请创建并关联报备向上级反馈)</view
+				>
+			</view>
+			<view class="list-view-radio" @click="handleShowReportPopup">
+				<input
+					class="input"
+					type="text"
+					disabled="false"
+					v-model="priceFlagText"
+					value=""
+					placeholder="请选择报备"
+				/>
+				<text class="iconfont icon-xiangyou"></text>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"><text>*</text>价格敏感度:</view>
 			</view>
@@ -204,6 +241,23 @@
 		<view class="remarks-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 			<view class="edit-button" @click="editButtonConfim">确定</view>
 		</view>
+		<!-- 商品列表弹窗 -->
+		<cm-goodspopup
+			ref="cmgoodspopup"
+			v-if="isGoodspopup"
+			:show="isGoodspopup"
+			@handleChoiceaGoods="handleChoiceaGoodsData"
+		>
+		</cm-goodspopup>
+		<!-- 机构报备弹窗 -->
+		<cm-reportpopup
+			ref="cmreportpopup"
+			v-if="isReportpopup"
+			:show="isReportpopup"
+			:popupType ="1"
+			@handleChoiceaReport="handleChoiceaReportData"
+		>
+		</cm-reportpopup>
 	</view>
 </template>
 
@@ -211,9 +265,15 @@
 import { mapState, mapMutations } from 'vuex'
 import authorize from '@/common/config/authorize.js'
 import { uploadFileImage, uploadFilePdfDocDocxXlsx } from '@/services/public.js'
+import cmGoodspopup from '@/components/cm-module/cm-seller/cm-goods-popup'
+import cmReportpopup from '@/components/cm-module/cm-seller/cm-report-popup'
 
 var isPreviewImg
 export default {
+	components: {
+		cmGoodspopup,
+		cmReportpopup
+	},
 	data() {
 		return {
 			hideButton: true,
@@ -267,7 +327,10 @@ export default {
 				}
 			],
 			checkRemarkIndex:0,
-			assActionList: []
+			assActionList: [],
+			isGoodspopup:false,
+			isReportpopup:false,
+			handleGoods: []
 		}
 	},
 	onLoad(option) {
@@ -478,6 +541,27 @@ export default {
 			}
 			this.remarksParams.consult = this.checkedCategorysList.join(',')
 		},
+		handleShowReportPopup(){
+			// 显示报备弹窗
+			this.isReportpopup = true
+		},
+		handleShowGoodPopup() {
+			// 显示添加商品弹窗
+			this.isGoodspopup = true
+		},
+		handleClean(){//删除选择的商品
+			this.handleGoods = []
+		},
+		handleChoiceaGoodsData(data) {
+			console.log('data', data)
+			this.handleGoods = []
+			this.handleGoods.push(data)
+		},
+		handleChoiceaReportData(data) {
+			console.log('data', data)
+			this.handleGoods = []
+			this.handleGoods.push(data)
+		},
 		contains(arr, val) {
 			// 校验
 			return arr.some(item => item === val)
@@ -647,6 +731,119 @@ page {
 			font-size: $font-size-20;
 		}
 	}
+	.tui-remarks-content {
+		width: 100%;
+		height: auto;
+		margin-bottom: 24rpx;
+		.tui-remarks-goods-input {
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			background-color: #f7f7f7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.input-add {
+				width: 128rpx;
+				height: 128rpx;
+				line-height: 128rpx;
+				float: left;
+				text-align: center;
+				box-sizing: border-box;
+				border: 1px dashed #b2b2b2;
+				border-radius: 6rpx;
+				.iconfont {
+					font-size: 44rpx;
+					color: #b2b2b2;
+				}
+			}
+			.input-text {
+				height: 128rpx;
+				box-sizing: border-box;
+				padding: 0 32rpx;
+				line-height: 128rpx;
+				text-align: left;
+				font-size: 26rpx;
+				color: #b2b2b2;
+				float: left;
+			}
+		}
+		.tui-remarks-showgoods {
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			.tui-remarks-btn {
+				width: 90rpx;
+				height: 180rpx;
+				float: right;
+				.btn {
+					width: 100%;
+					height: 90rpx;
+					float: left;
+					line-height: 90rpx;
+					text-align: center;
+					font-size: 26rpx;
+					&.delete {
+						color: #f94b4b;
+					}
+					&.update {
+						color: #1890f9;
+					}
+				}
+			}
+			.tui-remarks-goods {
+				width: 612rpx;
+				height: 180rpx;
+				box-sizing: border-box;
+				background-color: #f7f7f7;
+				padding: 26rpx;
+				border-radius: 6rpx;
+				float: left;
+				.goods-image {
+					width: 128rpx;
+					height: 128rpx;
+					float: left;
+					image {
+						width: 128rpx;
+						height: 128rpx;
+						display: block;
+						border-radius: 4rpx;
+					}
+				}
+				.goods-main {
+					width: 432rpx;
+					height: 128rpx;
+					box-sizing: border-box;
+					padding-left: 32rpx;
+					float: right;
+					.name {
+						width: 100%;
+						height: 60rpx;
+						box-sizing: border-box;
+						line-height: 60rpx;
+						color: #333333;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+					.shop {
+						line-height: 60rpx;
+						color: #999999;
+						font-size: 26rpx;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+		}
+	}
 	.list-view-radio {
 		width: 100%;
 		height: 90rpx;
@@ -942,7 +1139,7 @@ page {
 	bottom: 0;
 	left: 0;
 	background-color: #ffffff;
-	z-index: 9999;
+	z-index: 99;
 	.edit-button-canel {
 		width: 100%;
 		height: 88rpx;

+ 92 - 0
pages/seller/remarks/details.vue

@@ -34,12 +34,42 @@
 					机构类型:<text>{{ remarksParams.clubType ? remarksParams.clubType : '无' }}</text>
 				</view>
 			</view>
+			<view class="list-view-title"> <view class="list-view-h1">咨询商品:</view> </view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-goods">
+					<view class="goods-image">
+						<image
+							src="https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg"
+							mode=""
+						></image>
+					</view>
+					<view class="goods-main">
+						<view class="name">
+							易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水
+						</view>
+						<view class="shop"> 供应商:华熙生物 </view>
+					</view>
+				</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">
 					{{ label.label }}
 				</text>
 			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>关联报备:<text
+						>报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由</text
+					></view
+				>
+			</view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-text">
+					<view class="txt">报备审核通过</view>
+					<view class="txm">审核说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明</view>
+				</view>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"
 					>价格敏感度:<text>{{ remarksParams.pinceSensitve | pinceFilters }}</text>
@@ -331,6 +361,68 @@ page {
 		width: 100%;
 		height: auto;
 		margin-bottom: 24rpx;
+		.tui-remarks-text{
+			width: 100%;
+			box-sizing: border-box;
+			background-color: #F7F7F7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.txt{
+				line-height: 36rpx;
+				color: #0DB26D;
+				font-size: 26rpx;
+			}
+			.txm{
+				line-height: 36rpx;
+				color: #666666;
+				font-size: 26rpx;
+			}
+		}
+		.tui-remarks-goods{
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			background-color: #F7F7F7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.goods-image{
+				width: 128rpx;
+				height: 128rpx;
+				float: left;
+				image{
+					width: 128rpx;
+					height: 128rpx;
+					display: block;
+					border-radius: 4rpx;
+				}
+			}
+			.goods-main{
+				width: 522rpx;
+				height: 128rpx;
+				box-sizing: border-box;
+				padding: 0 32rpx;
+				float: right;
+				.name{
+					width: 100%;
+					height: 60rpx;
+					box-sizing: border-box;
+					line-height: 60rpx;
+					color: #333333;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					line-clamp: 1;
+					-webkit-box-orient: vertical;
+					font-size: 26rpx;
+				}
+				.shop{
+					line-height: 60rpx;
+					color: #999999;
+					font-size: 26rpx;
+				}
+			}
+		}
 		.tui-remarks-span {
 			height: 48rpx;
 			line-height: 48rpx;

+ 142 - 74
pages/seller/remarks/list.vue

@@ -1,22 +1,32 @@
 <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="getUserClubRemarksList"
-					placeholder="搜索关键词 / 咨询人 / 机构名称"
-					maxlength="16"
-				/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+		<view class="container-fiexd-top">
+			<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="getUserClubRemarksList"
+						placeholder="搜索关键词 / 咨询人 / 机构名称"
+						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="search-screen" @click="showScreenDrawer">
-				<text class="iconfont icon-gengduo1"></text> 筛选
+			<view class="fiexd-top-title">
+				<view class="top-left">
+					共 <text>{{ totalRecord }}</text> 条咨询记录
+				</view>
+				<view class="top-right">
+					<view class="top-right-btn" @click="handlerGoReportList">查看报备记录</view>
+				</view>
 			</view>
 		</view>
 		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '216rpx' : '168rpx' }">
@@ -36,7 +46,7 @@
 				>
 					<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 tt"><text class="tags">新分配</text>{{ remark.clubName }}</view>
 							<view class="tui-remarks-time sm" v-if="remark.followup">
 								<text
 									:class="{
@@ -73,8 +83,11 @@
 						</view>
 					</view>
 					<view class="tui-remarks-name none" v-if="remark.satisfied">
-						<view class="tui-remarks-name-text a">
-							意向程度:{{ remark.satisfied | intenActionsFilters }}
+						<view class="tui-remarks-name-text h">
+							意向程度:<text class="red">{{ remark.satisfied | intenActionsFilters }}</text> 
+						</view>
+						<view class="tui-remarks-name-text y">
+							报备状态:<text>审核通过</text> 
 						</view>
 					</view>
 					<view class="tui-remarks-content">
@@ -384,6 +397,9 @@ export default {
 		},
 		details(remarksId) {
 			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
+		},
+		handlerGoReportList(){
+			this.$api.navigateTo(`/pages/seller/remarks/report-list`)
 		}
 	},
 	onPageScroll(e) {
@@ -416,69 +432,104 @@ page {
 .empty-container {
 	z-index: 99;
 }
-.club-search {
+.container-fiexd-top{
 	width: 100%;
-	height: 112rpx;
-	padding: 24rpx;
-	background: #ffffff;
+	height: 208rpx;
+	background: #F5F5F5;
 	box-sizing: border-box;
 	position: fixed;
 	top: 0;
 	left: 0;
 	z-index: 982;
-	.search-screen {
-		width: 152rpx;
-		height: 64rpx;
-		float: right;
+	.club-search {
+		width: 100%;
+		height: 112rpx;
+		padding: 24rpx;
+		background: #ffffff;
 		box-sizing: border-box;
-		padding: 0 20rpx;
-		border: 1px solid #999999;
-		line-height: 64rpx;
-		border-radius: 32rpx;
-		color: #333333;
-		text-align: center;
-		font-size: 28rpx;
-		.icon-gengduo1 {
-			font-size: 30rpx;
-			margin-right: 10rpx;
-		}
-	}
-	.search-from {
-		width: 526rpx;
-		height: 100%;
-		background: #f7f7f7;
-		border-radius: 32rpx;
-		float: left;
-		position: relative;
-		.input {
-			width: 420rpx;
-			height: 64rpx;
-			float: left;
-			line-height: 64rpx;
-			color: $text-color;
-			font-size: $font-size-24;
-		}
-		.icon-iconfonticonfontsousuo1 {
-			width: 64rpx;
+		.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;
-			display: block;
-			font-size: $font-size-38;
+			font-size: 28rpx;
+			.icon-gengduo1 {
+				font-size: 30rpx;
+				margin-right: 10rpx;
+			}
+		}
+		.search-from {
+			width: 526rpx;
+			height: 100%;
+			background: #f7f7f7;
+			border-radius: 32rpx;
+			float: left;
+			position: relative;
+			.input {
+				width: 420rpx;
+				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;
+			}
+		}
+	}
+	.fiexd-top-title{
+		width: 100%;
+		height: 96rpx;
+		box-sizing: border-box;
+		padding: 24rpx;
+		.top-left{
 			float: left;
-			color: #999999;
+			line-height: 48rpx;
+			font-size: 26rpx;
+			color: #666666;
+			text{
+				color: #e15616;
+			}
 		}
-		.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;
+		.top-right{
+			float: right;
+			.top-right-btn{
+				height: 48rpx;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+				border: 1px solid #e15616;
+				font-size: 26rpx;
+				text-align: center;
+				line-height: 48rpx;
+				color: #e15616;
+				border-radius: 24rpx;
+			}
 		}
 	}
 }
@@ -489,7 +540,7 @@ page {
 	padding: 0;
 	box-sizing: border-box;
 	padding: 24rpx;
-	padding-top: 136rpx;
+	padding-top: 232rpx;
 	.empty-container-image {
 		width: 260rpx;
 		height: 260rpx;
@@ -525,7 +576,7 @@ page {
 				.tui-remarks-time {
 					float: left;
 					&.tt {
-						width: 50%;
+						width: 60%;
 						font-size: $font-size-32;
 						color: #333333;
 						text-align: left;
@@ -536,12 +587,26 @@ page {
 						line-clamp: 1;
 						-webkit-box-orient: vertical;
 						font-weight: bold;
+						.tags{
+							display: inline-block;
+							padding: 0 10rpx;
+							border-radius: 8rpx;
+							line-height: 36rpx;
+							font-size: 22rpx;
+							background-color: #F94B4B;
+							color: #ffffff;
+							text-align: center;
+							float: left;
+							margin-right: 10rpx;
+							margin-top: 10rpx;
+							font-weight: normal;
+						}
 					}
 					&.sm {
-						width: 50%;
+						width: 40%;
 						font-size: $font-size-26;
 						color: #999999;
-						text-align: right;
+						text-align: right;					
 						.orange {
 							display: inline-block;
 							padding: 0 15rpx;
@@ -633,6 +698,9 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
+				.red{
+					color: #F94B4B;
+				}
 				&.a {
 					width: 100%;
 				}

+ 92 - 0
pages/seller/remarks/record-details.vue

@@ -16,12 +16,42 @@
 					机构类型:<text>{{ remarksParams.clubType ? remarksParams.clubType : '无' }}</text>
 				</view>
 			</view>
+			<view class="list-view-title"> <view class="list-view-h1">咨询商品:</view> </view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-goods">
+					<view class="goods-image">
+						<image
+							src="https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg"
+							mode=""
+						></image>
+					</view>
+					<view class="goods-main">
+						<view class="name">
+							易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水
+						</view>
+						<view class="shop"> 供应商:华熙生物 </view>
+					</view>
+				</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">
 					{{ label.label }}
 				</text>
 			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>关联报备:<text
+						>报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由</text
+					></view
+				>
+			</view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-text">
+					<view class="txt">报备审核通过</view>
+					<view class="txm">审核说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明</view>
+				</view>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"
 					>价格敏感度:<text>{{ remarksParams.pinceSensitve | pinceFilters }}</text>
@@ -238,6 +268,68 @@ page {
 		width: 100%;
 		height: auto;
 		margin-bottom: 24rpx;
+		.tui-remarks-text{
+			width: 100%;
+			box-sizing: border-box;
+			background-color: #F7F7F7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.txt{
+				line-height: 36rpx;
+				color: #0DB26D;
+				font-size: 26rpx;
+			}
+			.txm{
+				line-height: 36rpx;
+				color: #666666;
+				font-size: 26rpx;
+			}
+		}
+		.tui-remarks-goods{
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			background-color: #F7F7F7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.goods-image{
+				width: 128rpx;
+				height: 128rpx;
+				float: left;
+				image{
+					width: 128rpx;
+					height: 128rpx;
+					display: block;
+					border-radius: 4rpx;
+				}
+			}
+			.goods-main{
+				width: 522rpx;
+				height: 128rpx;
+				box-sizing: border-box;
+				padding: 0 32rpx;
+				float: right;
+				.name{
+					width: 100%;
+					height: 60rpx;
+					box-sizing: border-box;
+					line-height: 60rpx;
+					color: #333333;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					line-clamp: 1;
+					-webkit-box-orient: vertical;
+					font-size: 26rpx;
+				}
+				.shop{
+					line-height: 60rpx;
+					color: #999999;
+					font-size: 26rpx;
+				}
+			}
+		}
 		.tui-remarks-span {
 			height: 48rpx;
 			line-height: 48rpx;

+ 78 - 31
pages/seller/remarks/record-list.vue

@@ -1,27 +1,37 @@
 <template>
 	<view class="container product clearfix">
-		<view class="club-search clearfix">
-			<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="getUserClubVisitorRecordlist"
-						placeholder="搜索关键词"
-						maxlength="16"
-					/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+		<view class="container-fiexd-top">
+			<view class="club-search clearfix">
+				<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="getUserClubVisitorRecordlist"
+							placeholder="搜索关键词"
+							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>
+			<view class="fiexd-top-title">
+				<view class="top-left">
+					共 <text>{{ totalRecord }}</text> 条咨询记录
 				</view>
-				<view class="search-screen" @click="showScreenDrawer">
-					<text class="iconfont icon-gengduo1"></text>
-					筛选
+				<view class="top-right">
+					<view class="top-right-btn" @click="handlerGoReportList">查看报备记录</view>
 				</view>
 			</view>
-		</view>
+		</view>	
 		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '220rpx' : '148rpx' }">
 			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
 				<!-- 空白页 -->
@@ -68,8 +78,11 @@
 							</view>
 						</view>
 						<view class="tui-remarks-name none" v-if="remark.satisfied">
-							<view class="tui-remarks-name-text a">
-								意向程度:{{ remark. satisfied | intenActionsFilters	 }}
+							<view class="tui-remarks-name-text h">
+								意向程度:<text class="red">{{ remark. satisfied | intenActionsFilters }}</text> 
+							</view>
+							<view class="tui-remarks-name-text y">
+								报备状态:<text>审核通过</text> 
 							</view>
 						</view>
 						<view class="tui-remarks-content">
@@ -431,6 +444,9 @@ export default {
 		},
 		details(remarksId) {
 			this.$api.navigateTo(`/pages/seller/remarks/record-details?remarksId=${remarksId}`)
+		},
+		handlerGoReportList(){
+			this.$api.navigateTo(`/pages/seller/remarks/report-visitor-list`)
 		}
 	},
 	onPageScroll(e) {
@@ -464,23 +480,22 @@ page {
 .empty-container {
 	z-index: 99;
 }
-.club-search {
+.container-fiexd-top{
 	width: 100%;
-	height: 112rpx;
-	background: #ffffff;
+	height: 208rpx;
+	background: #F5F5F5;
 	box-sizing: border-box;
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 100;
-	.club-search-form {
+	z-index: 982;
+	.club-search {
 		width: 100%;
 		height: 112rpx;
+		padding: 24rpx;
 		background: #ffffff;
 		box-sizing: border-box;
-		padding: 24rpx;
-		float: left;
-		.search-screen{
+		.search-screen {
 			width: 152rpx;
 			height: 64rpx;
 			float: right;
@@ -492,7 +507,7 @@ page {
 			color: #333333;
 			text-align: center;
 			font-size: 28rpx;
-			.icon-gengduo1{
+			.icon-gengduo1 {
 				font-size: 30rpx;
 				margin-right: 10rpx;
 			}
@@ -536,6 +551,35 @@ page {
 			}
 		}
 	}
+	.fiexd-top-title{
+		width: 100%;
+		height: 96rpx;
+		box-sizing: border-box;
+		padding: 24rpx;
+		.top-left{
+			float: left;
+			line-height: 48rpx;
+			font-size: 26rpx;
+			color: #666666;
+			text{
+				color: #e15616;
+			}
+		}
+		.top-right{
+			float: right;
+			.top-right-btn{
+				height: 48rpx;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+				border: 1px solid #e15616;
+				font-size: 26rpx;
+				text-align: center;
+				line-height: 48rpx;
+				color: #e15616;
+				border-radius: 24rpx;
+			}
+		}
+	}
 }
 .remarks-content {
 	width: 100%;
@@ -544,7 +588,7 @@ page {
 	padding: 0;
 	box-sizing: border-box;
 	padding: 24rpx;
-	padding-top: 134rpx;
+	padding-top: 232rpx;
 	.empty-container-image {
 		width: 260rpx;
 		height: 260rpx;
@@ -719,6 +763,9 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
+				.red{
+					color: #F94B4B;
+				}
 				&.a{
 					width: 100%;
 				}

+ 753 - 0
pages/seller/remarks/relation-consult-list.vue

@@ -0,0 +1,753 @@
+<template>
+	<view class="container product clearfix">
+		<view class="container-fiexd-top">
+			<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="getUserClubRemarksList"
+						placeholder="搜索关键词 / 咨询人 / 机构名称"
+						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>
+		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '216rpx' : '168rpx' }">
+			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
+				<!-- 空白页 -->
+				<view class="empty-container" v-if="isEmpty">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-remarks-empty@2x.png'"></image>
+					<text class="error-text">暂无任何数据~</text>
+				</view>
+				<!-- 列表 -->
+				<view
+					class="tui-remarks-cell  tui-mtop clearfix"
+					v-for="(remark, index) in remarksList"
+					:key="index"
+					:class="{ orange: remark.followup == 1, blue: remark.followup == 2, grey: remark.followup == 3 }"
+					@click.stop="details(remark.remarksId)"
+				>
+					<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" v-if="remark.followup">
+								<text
+									:class="{
+										orange: remark.followup == 1,
+										blue: remark.followup == 2,
+										grey: remark.followup == 3
+									}"
+									>{{ remark.followup | followupFilters }}</text
+								>
+							</view>
+						</view>
+						<view class="tui-remarks-title-bot">
+							<view class="tui-remarks-text-view">
+								<view class="tui-remarks-text h"
+									><text class="iconfont icon-bianji"></text>记录人:{{ remark.recordName }}</view
+								>
+							</view>
+							<view class="tui-remarks-text-view" v-if="listQuery.manager >= 0">
+								<view class="tui-remarks-text h"
+									><text class="iconfont icon-guanliyuan"></text>管理员:{{
+										remark.leaderName ? remark.leaderName : ''
+									}}</view
+								>
+								<view class="tui-remarks-text y">{{ remark.addTime }}</view>
+							</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">
+							咨询类别:{{ remark.consultBack ? remark.consultBack : '无' }}
+						</view>
+					</view>
+					<view class="tui-remarks-name none" v-if="remark.satisfied">
+						<view class="tui-remarks-name-text h">
+							意向程度:<text class="red">{{ remark.satisfied | intenActionsFilters }}</text> 
+						</view>
+						<view class="tui-remarks-name-text y">
+							报备状态:<text>审核通过</text> 
+						</view>
+					</view>
+					<view class="tui-remarks-content">
+						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
+							{{ label.label }}
+						</text>
+					</view>
+					<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
+						<view class="btn edit" @click.stop="handEditRemark(remark.remarksId)">取消关联</view>
+					</view>
+				</view>
+				<!--加载loadding-->
+				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<!--加载loadding-->
+			</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">添加已注册客户记录</view>
+					</view>
+					<view class="tui-flex-1">
+						<view class="tui-button-text" @click="handleAllUnder">未注册客户咨询记录 ></view>
+					</view>
+				</view>
+			</view>
+		</tui-bottom-popup>
+		<!-- 筛选抽屉 -->
+		<cm-screenDrawer ref="screendrawer" :rightDrawer="isScreenDrawer" @handSearchConfirm="handSearchConfirmData">
+		</cm-screenDrawer>
+		<!-- 添加记录 -->
+		<cm-clubpopup
+			ref="clubpopup"
+			v-if="isClubpopupShow"
+			:show="isClubpopupShow"
+			@handleChoiceaClub="handleChoiceaClubData"
+		>
+		</cm-clubpopup>
+		<!-- 弹窗提示 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			@cancel="hideMobel"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
+	</view>
+</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'
+const defaultListQuery = {
+	startAddTime: '',
+	endAddTime: '',
+	consult: '',
+	pinceSensitve: 0, //价格敏感度
+	satisfied: 0, // 意向程度
+	followup: 0, // 跟进状态
+	leaderId: 0,
+	groupId: 0,
+	manager: 0,
+	serviceProviderId: 0,
+	pageNum: 1,
+	pageSize: 10
+}
+export default {
+	components: {
+		cmClubpopup,
+		cmScreenDrawer
+	},
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '确认',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
+					},
+					plain: false
+				}
+			],
+			totalRecord: 0,
+			popupShow: true,
+			popupShow1: false,
+			listQuery: Object.assign({}, defaultListQuery),
+			remarksList: [],
+			scrollTop: 0,
+			isEmpty: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			contentModalText: '', //操作文字提示语句
+			modal: false,
+			handleRemarksId: 0,
+			isClubpopupShow: false,
+			isScreenDrawer: false
+		}
+	},
+	onLoad() {},
+	filters: {
+		NumFormat: function(value) {
+			//处理金额
+			if (!value) return '0.00'
+			let number = Number(value).toFixed(2)
+			return number
+		},
+		followupFilters(value) {
+			// 订单来源
+			const map = {
+				1: '跟进中',
+				2: '跟进完成',
+				3: '已放弃'
+			}
+			return map[value]
+		},
+		intenActionsFilters(value) {
+			// 意向
+			if (value) {
+				const map = {
+					1: '意向强烈',
+					2: '意向一般',
+					3: '意向平淡',
+					4: '随便看看'
+				}
+				return map[value]
+			} else {
+				return ''
+			}
+		}
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login', 'logout']),
+		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.getUserClubRemarksList()
+		},
+		getUserClubRemarksList() {
+			this.remarksList = []
+			this.listQuery.pageNum = 1
+			this.UserService.getUserClubRemarksList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.isEmpty = false
+						this.hasNextPage = data.hasNextPage
+						this.totalRecord = data.totalRecord
+						this.remarksList = data.results
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							if (this.remarksList.length < 8) {
+								this.pullUpOn = true
+							} else {
+								this.pullUpOn = false
+								this.loadding = false
+								this.nomoreText = '已至底部'
+							}
+						}
+					} else {
+						this.isEmpty = true
+					}
+					this.isRequest = true
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		GetOnReachBottomData(index) {
+			//上拉加载
+			this.listQuery.pageNum += 1
+			this.UserService.getUserClubRemarksList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.hasNextPage = data.hasNextPage
+						this.remarksList = this.remarksList.concat(data.results)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							this.pullUpOn = false
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		deleteRemark(remarksId) {
+			this.handleRemarksId = remarksId
+			this.modal = true
+			this.contentModalText = '确定删除这条记录吗?'
+		},
+		handEditRemark(remarksId) {
+			//跳转修改客户咨询记录
+			this.$api.navigateTo(`/pages/seller/remarks/add?type=edit&remarksId=${remarksId}`)
+		},
+		handleAllUnder() {
+			//跳转未注册客户咨询记录也
+			this.$api.navigateTo('/pages/seller/remarks/record-list')
+		},
+		handleShowClubpopup() {
+			//显示已注册机构弹窗
+			this.isClubpopupShow = true
+		},
+		handleChoiceaClubData(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
+			this.listQuery.pinceSensitve = data.pinceSensitve
+			this.listQuery.satisfied = data.satisfied
+			this.listQuery.followup = data.followup
+			
+			this.getUserClubRemarksList()
+		},
+		showScreenDrawer() {
+			//显示筛选抽屉
+			this.isScreenDrawer = true
+		},
+		handleClick(e) {
+			//确认删除
+			if (e.index == 1) {
+				this.handleDeleteUserLike()
+			}
+			this.modal = false
+		},
+		handleDeleteUserLike() {
+			//操作删除资料备注
+			this.UserService.getUserClubRemarksDelete({
+				remarksId: this.handleRemarksId
+			})
+				.then(response => {
+					this.$util.msg('已删除', 2000, true, 'success')
+					setTimeout(() => {
+						this.getUserClubRemarksList()
+					}, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.listQuery.keyWord != '') {
+				this.isShowClose = true
+			} else {
+				this.isShowClose = false
+				this.listQuery.pageNum = 1
+				this.getUserClubRemarksList()
+			}
+		},
+		delInputText() {
+			//清除输入框内容
+			this.listQuery.keyWord = ''
+			this.isShowClose = false
+			this.listQuery.pageNum = 1
+			this.getUserClubRemarksList()
+		},
+		hideMobel() {
+			this.modal = false
+		},
+		details(remarksId) {
+			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
+		}
+	},
+	onPageScroll(e) {
+		//实时获取到滚动的值
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.GetOnReachBottomData()
+		}
+	},
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.listQuery.pageNum = 1
+			uni.stopPullDownRefresh()
+		}, 200)
+	},
+	onShow() {
+		this.initGetStotage()
+	}
+}
+</script>
+
+<style lang="scss">
+@import '@/uni.scss';
+page {
+	background: #f7f7f7;
+}
+.empty-container {
+	z-index: 99;
+}
+.container-fiexd-top{
+	width: 100%;
+	height: 112rpx;
+	background: #F5F5F5;
+	box-sizing: border-box;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 982;
+	.club-search {
+		width: 100%;
+		height: 112rpx;
+		padding: 24rpx;
+		background: #ffffff;
+		box-sizing: border-box;
+		.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;
+			font-size: 28rpx;
+			.icon-gengduo1 {
+				font-size: 30rpx;
+				margin-right: 10rpx;
+			}
+		}
+		.search-from {
+			width: 526rpx;
+			height: 100%;
+			background: #f7f7f7;
+			border-radius: 32rpx;
+			float: left;
+			position: relative;
+			.input {
+				width: 420rpx;
+				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;
+			}
+		}
+	}
+}
+.remarks-content {
+	width: 100%;
+	height: auto;
+	position: relative;
+	padding: 0;
+	box-sizing: border-box;
+	padding: 24rpx;
+	padding-top: 136rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+	.tui-remarks-cell {
+		width: 100%;
+		border-radius: 16rpx;
+		margin-bottom: 24rpx;
+		background: #ffffff;
+		box-sizing: border-box;
+		padding: 0 24rpx 24rpx 24rpx;
+		&.orange {
+			background: #ffffff linear-gradient(180deg, #ffede5 0%, rgba(255, 255, 255, 0) 50%);
+		}
+		&.blue {
+			background: #ffffff linear-gradient(180deg, #deefff 0%, rgba(255, 255, 255, 0) 50%);
+		}
+		&.grey {
+			background: #ffffff linear-gradient(180deg, #ececec 0%, rgba(255, 255, 255, 0) 50%);
+		}
+		.tui-remarks-title {
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 20rpx 0;
+			border-bottom: 1px solid #e1e1e1;
+			float: left;
+			.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;
+						.tags{
+							display: inline-block;
+							padding: 0 10rpx;
+							border-radius: 8rpx;
+							line-height: 36rpx;
+							font-size: 22rpx;
+							background-color: #F94B4B;
+							color: #ffffff;
+							text-align: center;
+							float: left;
+							margin-right: 10rpx;
+							margin-top: 10rpx;
+							font-weight: normal;
+						}
+					}
+					&.sm {
+						width: 40%;
+						font-size: $font-size-26;
+						color: #999999;
+						text-align: right;					
+						.orange {
+							display: inline-block;
+							padding: 0 15rpx;
+							border-radius: 24rpx;
+							line-height: 48rpx;
+							font-size: 24rpx;
+							background-color: #e15616;
+							color: #ffffff;
+							text-align: center;
+						}
+						.blue {
+							display: inline-block;
+							padding: 0 15rpx;
+							border-radius: 24rpx;
+							line-height: 48rpx;
+							font-size: 24rpx;
+							background-color: #1890f9;
+							color: #ffffff;
+							text-align: center;
+						}
+						.grey {
+							display: inline-block;
+							padding: 0 15rpx;
+							border-radius: 24rpx;
+							line-height: 48rpx;
+							font-size: 24rpx;
+							background-color: #e1e1e1;
+							color: #999999;
+							text-align: center;
+						}
+					}
+				}
+			}
+			.tui-remarks-title-bot {
+				width: 100%;
+				height: auto;
+				.tui-remarks-text-view {
+					width: 100%;
+					height: 48rpx;
+					.tui-remarks-text {
+						width: 50%;
+						height: 48rpx;
+						line-height: 48rpx;
+						box-sizing: border-box;
+						text-align: left;
+						font-size: $font-size-26;
+						color: #999999;
+						float: left;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						&.a {
+							width: 100%;
+						}
+						&.y {
+							text-align: right;
+						}
+					}
+				}
+			}
+		}
+		.tui-remarks-name {
+			width: 100%;
+			height: 48rpx;
+			line-height: 48rpx;
+			font-size: $font-size-26;
+			color: #666666;
+			text-align: left;
+			margin-bottom: 10rpx;
+			margin-top: 20rpx;
+			float: left;
+			&.none {
+				margin-top: 0;
+				margin-bottom: 20rpx;
+			}
+			.tui-remarks-name-text {
+				height: 48rpx;
+				box-sizing: border-box;
+				text-align: left;
+				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;
+				.red{
+					color: #F94B4B;
+				}
+				&.a {
+					width: 100%;
+				}
+				&.h {
+					width: 40%;
+					padding-right: 24rpx;
+				}
+				&.y {
+					width: 60%;
+					padding-left: 24rpx;
+				}
+			}
+		}
+		.tui-remarks-content {
+			width: 100%;
+			height: auto;
+			.tui-remarks-span {
+				height: 48rpx;
+				line-height: 48rpx;
+				text-align: center;
+				padding: 0 20rpx;
+				background-color: #f7f7f7;
+				font-size: $font-size-26;
+				color: #666666;
+				border-radius: 25rpx;
+				display: inline-block;
+				margin-right: 24rpx;
+				margin-bottom: 24rpx;
+				&:nth-child(4n) {
+					margin-right: none;
+				}
+			}
+		}
+		.tui-remarks-button {
+			width: 100%;
+			height: 68rpx;
+			border-top: 1px solid #e1e1e1;
+			padding-top: 20rpx;
+			.btn {
+				width:100%;
+				line-height: 48rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: $font-size-34;
+				float: left;
+				font-weight: bold;
+				&.edit {
+					color: #1890f9;
+				}
+			}
+		}
+	}
+}
+.tui-popup-box {
+	position: relative;
+	box-sizing: border-box;
+	min-height: 100rpx;
+	padding: 6rpx 24rpx;
+	.tui-popup-content {
+		padding-top: 30rpx;
+	}
+}
+.tui-popup-btn {
+	width: 100%;
+	height: auto;
+	float: left;
+	box-sizing: border-box;
+	margin-top: 30rpx;
+	.tui-button {
+		width: 600rpx;
+		height: 88rpx;
+		background: $btn-confirm;
+		line-height: 88rpx;
+		text-align: center;
+		color: #ffffff;
+		font-size: $font-size-28;
+		border-radius: 44rpx;
+		margin: 0 auto;
+	}
+	.tui-button-text {
+		width: 600rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		text-align: center;
+		color: #e15616;
+		font-size: $font-size-26;
+		margin: 0 auto;
+		margin-top: 15rpx;
+	}
+}
+</style>

+ 774 - 0
pages/seller/remarks/relation-visitor-list.vue

@@ -0,0 +1,774 @@
+<template>
+	<view class="container product clearfix">
+		<view class="container-fiexd-top">
+			<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="getUserClubRemarksList"
+						placeholder="搜索关键词 / 咨询人 / 机构名称"
+						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>
+		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '216rpx' : '168rpx' }">
+			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
+				<!-- 空白页 -->
+				<view class="empty-container" v-if="isEmpty">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-remarks-empty@2x.png'"></image>
+					<text class="error-text">暂无任何数据~</text>
+				</view>
+				<!-- 列表 -->
+				<view
+					class="tui-remarks-cell  tui-mtop clearfix"
+					v-for="(remark, index) in remarksList"
+					:key="index"
+					:class="{ orange: remark.followup == 1, blue: remark.followup == 2, grey: remark.followup == 3 }"
+					@click.stop="details(remark.remarksId)"
+				>
+					<view class="tui-remarks-title">
+						<view class="tui-remarks-title-bot">
+							<view class="tui-remarks-text-view">
+								<view class="tui-remarks-text h"><text class="iconfont icon-bianji"></text>记录人:{{ remark.recordName }}</view>
+								<view class="tui-remarks-text y" v-if="remark.followup">
+									<text :class="{orange:remark.followup==1,blue:remark.followup==2,grey:remark.followup==3}">
+										{{ remark.followup | followupFilters }}
+									</text>
+								</view>
+							</view>
+							<view class="tui-remarks-text-view">
+								<view class="tui-remarks-text h" v-if="listQuery.manager >= 0">
+									<text class="iconfont icon-guanliyuan"></text>管理员:{{ remark.leaderName ? remark.leaderName : '' }}
+								</view>
+								<view class="tui-remarks-text y">
+									{{ remark.addDate }}
+								</view
+								>
+							</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">
+							咨询类别:{{ remark.consultBack ? remark.consultBack : '无' }}
+						</view>
+					</view>
+					<view class="tui-remarks-name none" v-if="remark.satisfied">
+						<view class="tui-remarks-name-text h">
+							意向程度:<text class="red">{{ remark.satisfied | intenActionsFilters }}</text> 
+						</view>
+						<view class="tui-remarks-name-text y">
+							报备状态:<text>审核通过</text> 
+						</view>
+					</view>
+					<view class="tui-remarks-content">
+						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
+							{{ label.label }}
+						</text>
+					</view>
+					<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
+						<view class="btn edit" @click.stop="handEditRemark(remark.remarksId)">取消关联</view>
+					</view>
+				</view>
+				<!--加载loadding-->
+				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<!--加载loadding-->
+			</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">添加已注册客户记录</view>
+					</view>
+					<view class="tui-flex-1">
+						<view class="tui-button-text" @click="handleAllUnder">未注册客户咨询记录 ></view>
+					</view>
+				</view>
+			</view>
+		</tui-bottom-popup>
+		<!-- 筛选抽屉 -->
+		<cm-screenDrawer ref="screendrawer" :rightDrawer="isScreenDrawer" @handSearchConfirm="handSearchConfirmData">
+		</cm-screenDrawer>
+		<!-- 添加记录 -->
+		<cm-clubpopup
+			ref="clubpopup"
+			v-if="isClubpopupShow"
+			:show="isClubpopupShow"
+			@handleChoiceaClub="handleChoiceaClubData"
+		>
+		</cm-clubpopup>
+		<!-- 弹窗提示 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			@cancel="hideMobel"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
+	</view>
+</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'
+const defaultListQuery = {
+	startAddTime: '',
+	endAddTime: '',
+	consult: '',
+	pinceSensitve: 0, //价格敏感度
+	satisfied: 0, // 意向程度
+	followup: 0, // 跟进状态
+	leaderId: 0,
+	groupId: 0,
+	manager: 0,
+	serviceProviderId: 0,
+	pageNum: 1,
+	pageSize: 10
+}
+export default {
+	components: {
+		cmClubpopup,
+		cmScreenDrawer
+	},
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '确认',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
+					},
+					plain: false
+				}
+			],
+			totalRecord: 0,
+			popupShow: true,
+			popupShow1: false,
+			listQuery: Object.assign({}, defaultListQuery),
+			remarksList: [],
+			scrollTop: 0,
+			isEmpty: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			contentModalText: '', //操作文字提示语句
+			modal: false,
+			handleRemarksId: 0,
+			isClubpopupShow: false,
+			isScreenDrawer: false
+		}
+	},
+	onLoad() {},
+	filters: {
+		NumFormat: function(value) {
+			//处理金额
+			if (!value) return '0.00'
+			let number = Number(value).toFixed(2)
+			return number
+		},
+		followupFilters(value) {
+			// 订单来源
+			const map = {
+				1: '跟进中',
+				2: '跟进完成',
+				3: '已放弃'
+			}
+			return map[value]
+		},
+		intenActionsFilters(value) {
+			// 意向
+			if (value) {
+				const map = {
+					1: '意向强烈',
+					2: '意向一般',
+					3: '意向平淡',
+					4: '随便看看'
+				}
+				return map[value]
+			} else {
+				return ''
+			}
+		}
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login', 'logout']),
+		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.getUserClubRemarksList()
+		},
+		getUserClubRemarksList() {
+			this.remarksList = []
+			this.listQuery.pageNum = 1
+			this.UserService.getUserClubRemarksList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.isEmpty = false
+						this.hasNextPage = data.hasNextPage
+						this.totalRecord = data.totalRecord
+						this.remarksList = data.results
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							if (this.remarksList.length < 8) {
+								this.pullUpOn = true
+							} else {
+								this.pullUpOn = false
+								this.loadding = false
+								this.nomoreText = '已至底部'
+							}
+						}
+					} else {
+						this.isEmpty = true
+					}
+					this.isRequest = true
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		GetOnReachBottomData(index) {
+			//上拉加载
+			this.listQuery.pageNum += 1
+			this.UserService.getUserClubRemarksList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.hasNextPage = data.hasNextPage
+						this.remarksList = this.remarksList.concat(data.results)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							this.pullUpOn = false
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		deleteRemark(remarksId) {
+			this.handleRemarksId = remarksId
+			this.modal = true
+			this.contentModalText = '确定删除这条记录吗?'
+		},
+		handEditRemark(remarksId) {
+			//跳转修改客户咨询记录
+			this.$api.navigateTo(`/pages/seller/remarks/add?type=edit&remarksId=${remarksId}`)
+		},
+		handleAllUnder() {
+			//跳转未注册客户咨询记录也
+			this.$api.navigateTo('/pages/seller/remarks/record-list')
+		},
+		handleShowClubpopup() {
+			//显示已注册机构弹窗
+			this.isClubpopupShow = true
+		},
+		handleChoiceaClubData(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
+			this.listQuery.pinceSensitve = data.pinceSensitve
+			this.listQuery.satisfied = data.satisfied
+			this.listQuery.followup = data.followup
+			
+			this.getUserClubRemarksList()
+		},
+		showScreenDrawer() {
+			//显示筛选抽屉
+			this.isScreenDrawer = true
+		},
+		handleClick(e) {
+			//确认删除
+			if (e.index == 1) {
+				this.handleDeleteUserLike()
+			}
+			this.modal = false
+		},
+		handleDeleteUserLike() {
+			//操作删除资料备注
+			this.UserService.getUserClubRemarksDelete({
+				remarksId: this.handleRemarksId
+			})
+				.then(response => {
+					this.$util.msg('已删除', 2000, true, 'success')
+					setTimeout(() => {
+						this.getUserClubRemarksList()
+					}, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.listQuery.keyWord != '') {
+				this.isShowClose = true
+			} else {
+				this.isShowClose = false
+				this.listQuery.pageNum = 1
+				this.getUserClubRemarksList()
+			}
+		},
+		delInputText() {
+			//清除输入框内容
+			this.listQuery.keyWord = ''
+			this.isShowClose = false
+			this.listQuery.pageNum = 1
+			this.getUserClubRemarksList()
+		},
+		hideMobel() {
+			this.modal = false
+		},
+		details(remarksId) {
+			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
+		}
+	},
+	onPageScroll(e) {
+		//实时获取到滚动的值
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.GetOnReachBottomData()
+		}
+	},
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.listQuery.pageNum = 1
+			uni.stopPullDownRefresh()
+		}, 200)
+	},
+	onShow() {
+		this.initGetStotage()
+	}
+}
+</script>
+
+<style lang="scss">
+@import '@/uni.scss';
+page {
+	background: #f7f7f7;
+}
+.empty-container {
+	z-index: 99;
+}
+.container-fiexd-top{
+	width: 100%;
+	height: 112rpx;
+	background: #F5F5F5;
+	box-sizing: border-box;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 982;
+	.club-search {
+		width: 100%;
+		height: 112rpx;
+		padding: 24rpx;
+		background: #ffffff;
+		box-sizing: border-box;
+		.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;
+			font-size: 28rpx;
+			.icon-gengduo1 {
+				font-size: 30rpx;
+				margin-right: 10rpx;
+			}
+		}
+		.search-from {
+			width: 526rpx;
+			height: 100%;
+			background: #f7f7f7;
+			border-radius: 32rpx;
+			float: left;
+			position: relative;
+			.input {
+				width: 420rpx;
+				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;
+			}
+		}
+	}
+}
+.remarks-content {
+	width: 100%;
+	height: auto;
+	position: relative;
+	padding: 0;
+	box-sizing: border-box;
+	padding: 24rpx;
+	padding-top: 136rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+	.tui-remarks-cell {
+		width: 100%;
+		border-radius: 16rpx;
+		margin-bottom: 24rpx;
+		background: #ffffff;
+		box-sizing: border-box;
+		padding: 0 24rpx 24rpx 24rpx;
+		&.orange {
+			background: #ffffff linear-gradient(180deg, #ffede5 0%, rgba(255, 255, 255, 0) 50%);
+		}
+		&.blue {
+			background: #ffffff linear-gradient(180deg, #deefff 0%, rgba(255, 255, 255, 0) 50%);
+		}
+		&.grey {
+			background: #ffffff linear-gradient(180deg, #ececec 0%, rgba(255, 255, 255, 0) 50%);
+		}
+		.tui-remarks-title {
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 20rpx 0;
+			border-bottom: 1px solid #e1e1e1;
+			float: left;
+			.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;
+						.tags{
+							display: inline-block;
+							padding: 0 10rpx;
+							border-radius: 8rpx;
+							line-height: 36rpx;
+							font-size: 22rpx;
+							background-color: #F94B4B;
+							color: #ffffff;
+							text-align: center;
+							float: left;
+							margin-right: 10rpx;
+							margin-top: 10rpx;
+							font-weight: normal;
+						}
+					}
+					&.sm {
+						width: 40%;
+						font-size: $font-size-26;
+						color: #999999;
+						text-align: right;					
+						.orange {
+							display: inline-block;
+							padding: 0 15rpx;
+							border-radius: 24rpx;
+							line-height: 48rpx;
+							font-size: 24rpx;
+							background-color: #e15616;
+							color: #ffffff;
+							text-align: center;
+						}
+						.blue {
+							display: inline-block;
+							padding: 0 15rpx;
+							border-radius: 24rpx;
+							line-height: 48rpx;
+							font-size: 24rpx;
+							background-color: #1890f9;
+							color: #ffffff;
+							text-align: center;
+						}
+						.grey {
+							display: inline-block;
+							padding: 0 15rpx;
+							border-radius: 24rpx;
+							line-height: 48rpx;
+							font-size: 24rpx;
+							background-color: #e1e1e1;
+							color: #999999;
+							text-align: center;
+						}
+					}
+				}
+			}
+			.tui-remarks-title-bot {
+				width: 100%;
+				height: auto;
+				.tui-remarks-text-view {
+					width: 100%;
+					height: 48rpx;
+					.tui-remarks-text {
+						width: 50%;
+						height: 48rpx;
+						line-height: 48rpx;
+						box-sizing: border-box;
+						text-align: left;
+						font-size: $font-size-26;
+						color: #999999;
+						float: left;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						&.a {
+							width: 100%;
+						}
+						&.y {
+							text-align: right;
+							.orange{
+								display: inline-block;
+								padding: 0 15rpx;
+								border-radius: 24rpx;
+								line-height: 48rpx;
+								font-size: 24rpx;
+								background-color: #E15616;
+								color: #FFFFFF;
+								text-align: center;
+							}
+							.blue{
+								display: inline-block;
+								padding: 0 15rpx;
+								border-radius: 24rpx;
+								line-height: 48rpx;
+								font-size: 24rpx;
+								background-color: #1890F9;
+								color: #FFFFFF;
+								text-align: center;
+							}
+							.grey{
+								display: inline-block;
+								padding: 0 15rpx;
+								border-radius: 24rpx;
+								line-height: 48rpx;
+								font-size: 24rpx;
+								background-color: #E1E1E1;
+								color: #FFFFFF;
+								text-align: center;
+							}
+						}
+					}
+				}
+			}
+		}
+		.tui-remarks-name {
+			width: 100%;
+			height: 48rpx;
+			line-height: 48rpx;
+			font-size: $font-size-26;
+			color: #666666;
+			text-align: left;
+			margin-bottom: 10rpx;
+			margin-top: 20rpx;
+			float: left;
+			&.none {
+				margin-top: 0;
+				margin-bottom: 20rpx;
+			}
+			.tui-remarks-name-text {
+				height: 48rpx;
+				box-sizing: border-box;
+				text-align: left;
+				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;
+				.red{
+					color: #F94B4B;
+				}
+				&.a {
+					width: 100%;
+				}
+				&.h {
+					width: 40%;
+					padding-right: 24rpx;
+				}
+				&.y {
+					width: 60%;
+					padding-left: 24rpx;
+				}
+			}
+		}
+		.tui-remarks-content {
+			width: 100%;
+			height: auto;
+			.tui-remarks-span {
+				height: 48rpx;
+				line-height: 48rpx;
+				text-align: center;
+				padding: 0 20rpx;
+				background-color: #f7f7f7;
+				font-size: $font-size-26;
+				color: #666666;
+				border-radius: 25rpx;
+				display: inline-block;
+				margin-right: 24rpx;
+				margin-bottom: 24rpx;
+				&:nth-child(4n) {
+					margin-right: none;
+				}
+			}
+		}
+		.tui-remarks-button {
+			width: 100%;
+			height: 68rpx;
+			border-top: 1px solid #e1e1e1;
+			padding-top: 20rpx;
+			.btn {
+				width:100%;
+				line-height: 48rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: $font-size-34;
+				float: left;
+				font-weight: bold;
+				&.edit {
+					color: #1890f9;
+				}
+			}
+		}
+	}
+}
+.tui-popup-box {
+	position: relative;
+	box-sizing: border-box;
+	min-height: 100rpx;
+	padding: 6rpx 24rpx;
+	.tui-popup-content {
+		padding-top: 30rpx;
+	}
+}
+.tui-popup-btn {
+	width: 100%;
+	height: auto;
+	float: left;
+	box-sizing: border-box;
+	margin-top: 30rpx;
+	.tui-button {
+		width: 600rpx;
+		height: 88rpx;
+		background: $btn-confirm;
+		line-height: 88rpx;
+		text-align: center;
+		color: #ffffff;
+		font-size: $font-size-28;
+		border-radius: 44rpx;
+		margin: 0 auto;
+	}
+	.tui-button-text {
+		width: 600rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		text-align: center;
+		color: #e15616;
+		font-size: $font-size-26;
+		margin: 0 auto;
+		margin-top: 15rpx;
+	}
+}
+</style>

+ 339 - 0
pages/seller/remarks/report-add.vue

@@ -0,0 +1,339 @@
+<template>
+	<view class="container qualifications" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
+		<view class="remarks-content">
+			<template v-if="handleType === '1'">
+				<view class="list-view-title">
+					<view class="list-view-h1">机构名称:<text class="none">蔡欣欣夕是大街上的按键上的</text></view>
+				</view>
+				<view class="list-view-title">
+					<view class="list-view-h1">联系人:<text class="none">欧特是</text></view>
+				</view>
+			</template>
+			<template v-else>
+				<view class="list-view-title">
+					<view class="list-view-h1">咨询人:<text class="none">阿萨德对方水电费</text></view>
+				</view>
+			</template>
+			<view class="list-view-title"> <view class="list-view-h1">报备商品:</view> </view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-goods-input" v-if="handleGoods.length === 0" @click="handleShowGoodPopup">
+					<view class="input-add"> <text class="iconfont icon-jiahao"></text> </view>
+					<view class="input-text"> 点击添加客户咨询的商品 </view>
+				</view>
+				<view class="tui-remarks-showgoods" v-else>
+					<view class="tui-remarks-goods" v-for="(pros, index) in handleGoods" :key="index">
+						<view class="goods-image"> <image :src="pros.images" mode=""></image> </view>
+						<view class="goods-main">
+							<view class="name"> {{ pros.name }} </view>
+							<view class="shop"> 供应商:{{ pros.shopName }} </view>
+						</view>
+					</view>
+					<view class="tui-remarks-btn">
+						<view class="btn delete" @click="handleClean">删除</view> 
+						<view class="btn update" @click="handleShowGoodPopup">更换</view>
+					</view>
+				</view>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"><text>*</text>报备事由:</view>
+			</view>
+			<view class="remarks-textarea">
+				<textarea
+					class="textarea"
+					v-model="remarksParams.extra"
+					value=""
+					placeholder="请输入其他需要说明的内容"
+					maxlength="200"
+					@input="conInput"
+				/>
+				<text class="limit-text">{{ min }}/{{ max }}</text>
+			</view>
+		</view>
+		<!-- 商品列表弹窗 -->
+		<cm-goodspopup
+			ref="cmgoodspopup"
+			v-if="isGoodspopup"
+			:show="isGoodspopup"
+			@handleChoiceaGoods="handleChoiceaGoodsData"
+		>
+		</cm-goodspopup>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+import authorize from '@/common/config/authorize.js'
+import cmGoodspopup from '@/components/cm-module/cm-seller/cm-goods-popup'
+
+export default {
+	components: {
+		cmGoodspopup
+	},
+	data() {
+		return {
+			isIphoneX: this.$store.state.isIphoneX,
+			min: 0,
+			max: 200,
+			isGoodspopup: false,
+			handleGoods: [],
+			handleType:'',// 1 机构添加报备 2 未注册客户添加报备
+			remarksParams: {},
+			remarksId: 0
+		}
+	},
+	onLoad(option) {
+		console.log(option)
+		this.remarksId = option.remarksId
+		this.handleType = option.type
+		this.getUserRemarksVisitDetail()
+	},
+	methods: {
+		...mapMutations(['login']),
+		getUserRemarksVisitDetail() {
+			//资料详情
+			this.UserService.getUserRemarksVisitDetail({
+				remarksId: this.remarksId
+			})
+				.then(response => {
+					this.remarksParams = response.data
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		handleShowGoodPopup() {
+			// 显示添加商品弹窗
+			this.isGoodspopup = true
+		},
+		handleClean(){//删除选择的商品
+			this.handleGoods = []
+		},
+		handleChoiceaGoodsData(data) {
+			console.log('data', data)
+			this.handleGoods = []
+			this.handleGoods.push(data)
+		},
+		conInput(e) {
+			//备注文字字数限制
+			let value = e.detail.value
+			let len = parseInt(value.length)
+			if (len > this.max) return
+			this.min = len
+			if (this.min == 200) {
+				this.$util.msg('您输入的字数已达上限', 2000)
+			}
+		}
+	},
+	onShow() {}
+}
+</script>
+
+<style lang="scss">
+page {
+	height: auto;
+	background: #ffffff;
+}
+.remarks-content {
+	width: 100%;
+	height: auto;
+	box-sizing: border-box;
+	padding: 0 24rpx;
+	padding-bottom: 80rpx;
+	.list-view-title {
+		width: 100%;
+		height: auto;
+		margin-bottom: 16rpx;
+		margin-top: 40rpx;
+		.list-view-h1 {
+			line-height: 40rpx;
+			font-size: $font-size-30;
+			color: #333333;
+			text-align: left;
+			font-weight: bold;
+			text {
+				color: #ff2a2a;
+				&.none{
+					color: #999999;
+					font-weight: normal;
+				}
+			}
+		}
+	}
+	.remarks-textarea {
+		width: 100%;
+		height: 226rpx;
+		padding: 16rpx;
+		margin: 20rpx 0 0 0;
+		border-radius: 6rpx;
+		position: relative;
+		border: 1px solid #b2b2b2;
+		box-sizing: border-box;
+		.textarea {
+			width: 100%;
+			height: 100%;
+			line-height: 36rpx;
+			font-size: $font-size-26;
+			color: $text-color;
+			z-index: 1;
+		}
+		.limit-text {
+			position: absolute;
+			right: 20rpx;
+			bottom: 16rpx;
+			line-height: 44rpx;
+			font-size: $font-size-24;
+			color: #b2b2b2;
+		}
+	}
+	.tui-remarks-content {
+		width: 100%;
+		height: auto;
+		margin-bottom: 24rpx;
+		.tui-remarks-goods-input {
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			background-color: #f7f7f7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.input-add {
+				width: 128rpx;
+				height: 128rpx;
+				line-height: 128rpx;
+				float: left;
+				text-align: center;
+				box-sizing: border-box;
+				border: 1px dashed #b2b2b2;
+				border-radius: 6rpx;
+				.iconfont {
+					font-size: 44rpx;
+					color: #b2b2b2;
+				}
+			}
+			.input-text {
+				height: 128rpx;
+				box-sizing: border-box;
+				padding: 0 32rpx;
+				line-height: 128rpx;
+				text-align: left;
+				font-size: 26rpx;
+				color: #b2b2b2;
+				float: left;
+			}
+		}
+		.tui-remarks-showgoods {
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			.tui-remarks-btn {
+				width: 90rpx;
+				height: 180rpx;
+				float: right;
+				.btn {
+					width: 100%;
+					height: 90rpx;
+					float: left;
+					line-height: 90rpx;
+					text-align: center;
+					font-size: 26rpx;
+					&.delete {
+						color: #f94b4b;
+					}
+					&.update {
+						color: #1890f9;
+					}
+				}
+			}
+			.tui-remarks-goods {
+				width: 612rpx;
+				height: 180rpx;
+				box-sizing: border-box;
+				background-color: #f7f7f7;
+				padding: 26rpx;
+				border-radius: 6rpx;
+				float: left;
+				.goods-image {
+					width: 128rpx;
+					height: 128rpx;
+					float: left;
+					image {
+						width: 128rpx;
+						height: 128rpx;
+						display: block;
+						border-radius: 4rpx;
+					}
+				}
+				.goods-main {
+					width: 432rpx;
+					height: 128rpx;
+					box-sizing: border-box;
+					padding-left: 32rpx;
+					float: right;
+					.name {
+						width: 100%;
+						height: 60rpx;
+						box-sizing: border-box;
+						line-height: 60rpx;
+						color: #333333;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+					.shop {
+						line-height: 60rpx;
+						color: #999999;
+						font-size: 26rpx;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+		}
+	}
+	.list-view {
+		width: 100%;
+		height: auto;
+		margin-top: 20rpx;
+		.list-view-text {
+			width: 100%;
+			float: left;
+			.input {
+				width: 500rpx;
+				height: 50rpx;
+				box-sizing: border-box;
+				line-height: 50rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
+				float: left;
+				font-size: 26rpx;
+			}
+			.delbtn {
+				width: 96rpx;
+				height: 44rpx;
+				border-radius: 8rpx;
+				font-size: $font-size-24;
+				color: #e15616;
+				line-height: 44rpx;
+				text-align: center;
+				float: left;
+				&.down {
+					color: #1890f9;
+				}
+			}
+		}
+	}
+}
+</style>

+ 233 - 0
pages/seller/remarks/report-details.vue

@@ -0,0 +1,233 @@
+<template>
+	<view class="container qualifications" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
+		<view class="remarks-content">
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>机构名称:<text>{{ remarksParams.questionMan }}</text></view
+				>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>联系人:<text>{{ remarksParams.questionMan }}</text></view
+				>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1">咨询人:{{ remarksParams.questionMan }}</view>
+			</view>
+			<view class="list-view-title"> <view class="list-view-h1">报备时间:2020-08-08</view> </view>
+			<view class="list-view-title"> <view class="list-view-h1">报备商品:</view> </view>
+			<view class="tui-remarks-content">
+				<view class="tui-remarks-goods">
+					<view class="goods-image">
+						<image
+							src="https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg"
+							mode=""
+						></image>
+					</view>
+					<view class="goods-main">
+						<view class="name">
+							易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水
+						</view>
+						<view class="shop"> 供应商:华熙生物 </view>
+					</view>
+				</view>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>报备事由:<text
+						>报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由</text
+					></view
+				>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+import authorize from '@/common/config/authorize.js'
+import { uploadFileImage, uploadFilePdfDocDocx } from '@/services/public.js'
+
+var isPreviewImg
+export default {
+	data() {
+		return {
+			isIphoneX: this.$store.state.isIphoneX,
+			productActions: [],
+			remarksParams: {},
+			remarksId: 0,
+			categorys: '产品,二手,耗材'
+		}
+	},
+	onLoad(option) {
+		console.log(option)
+		this.remarksId = option.remarksId
+		this.getUserRemarksVisitDetail()
+	},
+	filters: {
+		followupFilters(value) {
+			// 订单来源
+			const map = {
+				1: '跟进中',
+				2: '跟进完成',
+				3: '已放弃'
+			}
+			return map[value]
+		},
+		pinceFilters(value) {
+			// 意向
+			const map = {
+				1: '敏感',
+				2: '适中',
+				3: '不敏感',
+				4: '不明确'
+			}
+			return map[value]
+		},
+		intenActionsFilters(value) {
+			// 意向
+			const map = {
+				1: '意向强烈',
+				2: '意向一般',
+				3: '意向平淡',
+				4: '随便看看'
+			}
+			return map[value]
+		}
+	},
+	methods: {
+		...mapMutations(['login']),
+		getUserRemarksVisitDetail() {
+			//资料详情
+			this.UserService.getUserRemarksVisitDetail({
+				remarksId: this.remarksId
+			})
+				.then(response => {
+					this.remarksParams = response.data
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		}
+	},
+	onShow() {}
+}
+</script>
+
+<style lang="scss">
+page {
+	height: auto;
+	background: #ffffff;
+}
+.remarks-content {
+	width: 100%;
+	height: auto;
+	box-sizing: border-box;
+	padding: 0 24rpx;
+	padding-bottom: 80rpx;
+	.list-view-title {
+		width: 100%;
+		height: auto;
+		margin-bottom: 16rpx;
+		margin-top: 40rpx;
+		.list-view-h1 {
+			line-height: 40rpx;
+			font-size: $font-size-30;
+			color: #333333;
+			text-align: left;
+			font-weight: bold;
+			text {
+				color: #666666;
+				font-weight: normal;
+			}
+		}
+	}
+	.tui-remarks-content {
+		width: 100%;
+		height: auto;
+		margin-bottom: 24rpx;
+		.tui-remarks-goods{
+			width: 100%;
+			height: 180rpx;
+			box-sizing: border-box;
+			background-color: #F7F7F7;
+			padding: 26rpx;
+			border-radius: 6rpx;
+			.goods-image{
+				width: 128rpx;
+				height: 128rpx;
+				float: left;
+				image{
+					width: 128rpx;
+					height: 128rpx;
+					display: block;
+					border-radius: 4rpx;
+				}
+			}
+			.goods-main{
+				width: 522rpx;
+				height: 128rpx;
+				box-sizing: border-box;
+				padding: 0 32rpx;
+				float: right;
+				.name{
+					width: 100%;
+					height: 60rpx;
+					box-sizing: border-box;
+					line-height: 60rpx;
+					color: #333333;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					line-clamp: 1;
+					-webkit-box-orient: vertical;
+					font-size: 26rpx;
+				}
+				.shop{
+					line-height: 60rpx;
+					color: #999999;
+					font-size: 26rpx;
+				}
+			}
+		}
+	}
+	.list-view {
+		width: 100%;
+		height: auto;
+		margin-top: 20rpx;
+		.list-view-text {
+			width: 100%;
+			float: left;
+			.input {
+				width: 500rpx;
+				height: 50rpx;
+				box-sizing: border-box;
+				line-height: 50rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
+				float: left;
+				font-size: 26rpx;
+			}
+			.delbtn {
+				width: 96rpx;
+				height: 44rpx;
+				border-radius: 8rpx;
+				font-size: $font-size-24;
+				color: #e15616;
+				line-height: 44rpx;
+				text-align: center;
+				float: left;
+				&.down {
+					color: #1890f9;
+				}
+			}
+		}
+	}
+}
+</style>

+ 727 - 0
pages/seller/remarks/report-list.vue

@@ -0,0 +1,727 @@
+<template>
+	<view class="container product clearfix">
+		<view class="club-search clearfix">
+			<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="getUserClubVisitorRecordlist"
+						placeholder="搜索商品名称 / 报备关键词"
+						maxlength="16"
+					/>
+					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+				</view>
+			</view>
+		</view>
+		<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">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-remarks-empty@2x.png'"></image>
+					<text class="error-text">暂无任何记录~</text>
+				</view>
+				<template v-else>
+					<!-- 列表 -->
+					<view
+						class="tui-remarks-cell  tui-mtop clearfix"
+						v-for="(remark, index) in remarksList"
+						:key="index"
+						@click.stop="details(remark.remarksId)"
+					>
+						<view class="tui-remarks-title">
+							<view class="tui-remarks-title-top">
+								<view class="tui-remarks-time tt"><text class="tags">新分配</text>{{ remark.clubName }}</view>
+							</view>
+							<view class="tui-remarks-title-bot">
+								<view class="tui-remarks-text-view">
+									<view class="tui-remarks-text h"></text>报备人:{{ remark.recordName }}</view>
+									<view class="tui-remarks-text y">
+										{{ remark.addDate }}
+									</view>
+								</view>
+							</view>
+							<view class="tui-remarks-title-icon" :class="{
+										reviewed: remark.type == 1,
+										failed: remark.type == 2,
+										approved: remark.type == 3
+									}">
+							</view>
+						</view> 
+						<view class="tui-remarks-content">
+							<view class="tui-remarks-goods" v-if="remark.product">
+								<view class="goods-image">
+									<image
+										:src="remark.product.images"
+										mode=""
+									></image>
+								</view>
+								<view class="goods-main">
+									<view class="name">
+										{{ remark.product.name }}
+									</view>
+									<view class="shop">{{ remark.reportText }}</view>
+								</view>
+							</view>
+							<view class="tui-remarks-text" v-else>
+								{{ remark.reportText }}
+							</view>
+						</view>
+						<view class="tui-remarks-button">
+							<view class="btn edit" @click.stop="handReportDetails(remark.remarksId)">查看关联咨询记录</view>
+							<view class="btn del" @click.stop="deleteRemark(remark.remarksId)">删除</view>
+						</view>
+					</view>
+					<!--加载loadding-->
+					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+					<!--加载loadding-->
+				</template>
+			</view>
+		</view>
+		<!-- 弹窗提示 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			@cancel="hideMobel"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
+	</view>
+</template>
+<script>
+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'
+
+const defaultListQuery = {
+	startAddTime:'',
+	endAddTime:'',
+	consult:'',
+	pinceSensitve: 0, //价格敏感度
+	satisfied: 0, // 意向程度
+	followup: 0, // 跟进状态
+	leaderId:0,
+	groupId:0,
+	manager:0,
+	serviceProviderId: 0,
+	pageNum: 1,
+	pageSize: 10
+}
+export default {
+	components: {
+		cmRefereepopup,
+		cmClubmodal,
+		cmScreenDrawer
+	},
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '确认',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
+					},
+					plain: false
+				}
+			],
+			totalRecord: 0,
+			popupShow: true,
+			popupShow1: false,
+			listQuery: Object.assign({}, defaultListQuery),
+			remarksList: [
+				{
+					clubName:'采美信息技术有限公司',
+					recordName:'吴小研',
+					addDate:'2022-08-10',
+					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product:{
+						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type:1
+				},
+				{
+					clubName:'采美信息技术有限公司',
+					recordName:'吴小研',
+					addDate:'2022-08-10',
+					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product:{
+						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type:2
+				},
+				{
+					clubName:'采美信息技术有限公司',
+					recordName:'吴小研',
+					addDate:'2022-08-10',
+					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product:null,
+					type:3
+				}
+			],
+			scrollTop: 0,
+			isEmpty: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			contentModalText: '', //操作文字提示语句
+			modal: false,
+			questionMan: '',
+			questionManId: '',
+			handleRemarksId: 0,
+		}
+	},
+	onLoad(option) {
+		
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login', 'logout']),
+		async init() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			// const VisitorInfo = await this.$api.getComStorage('VisitorInfo')
+			// this.questionMan = VisitorInfo.questionMan
+			// this.listQuery.questionManId = VisitorInfo.questionManId
+			// this.getUserClubVisitorRecordlist()
+		},
+		getUserClubVisitorRecordlist() {
+			this.remarksList = []
+			this.listQuery.pageNum = 1
+			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.isEmpty = false
+						this.hasNextPage = data.hasNextPage
+						this.totalRecord = data.totalRecord
+						this.remarksList = data.results
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							if (this.remarksList.length < 8) {
+								this.pullUpOn = true
+							} else {
+								this.pullUpOn = false
+								this.loadding = false
+								this.nomoreText = '已至底部'
+							}
+						}
+					} else {
+						this.isEmpty = true
+					}
+					this.isRequest = true
+				})
+				.catch(error => {
+					console.log('=======>查询列表异常~')
+				})
+		},
+		GetOnReachBottomData(index) {
+			//上拉加载
+			this.listQuery.pageNum += 1
+			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.hasNextPage = data.hasNextPage
+						this.remarksList = this.remarksList.concat(data.results)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							this.pullUpOn = false
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				})
+				.catch(error => {
+					console.log('=======>查询列表异常~')
+				})
+		},
+		deleteRemark(remarksId) {
+			this.handleRemarksId = remarksId
+			this.modal = true
+			this.contentModalText = '确定删除该报备吗?'
+		},
+		handReportDetails(remarksId) {
+			//跳转报备详情
+			this.$api.navigateTo(`/pages/seller/remarks/relation-consult-list?id=${remarksId}`)
+		},
+		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
+			this.listQuery.pinceSensitve = data.pinceSensitve
+			this.listQuery.satisfied = data.satisfied
+			this.listQuery.followup = data.followup
+			console.log('确定筛选',this.listQuery)
+			this.getUserClubVisitorRecordlist()
+		},
+		handleShowClubpopup() {
+			//跳转选择咨询人
+			this.$api.navigateTo('/pages/seller/remarks/customer-list')
+		},
+		handleChoiceaConsultData(data){// 选择咨询人添加记录
+			//跳转添加记录
+			this.$api.navigateTo(`/pages/seller/remarks/add-record?type=add&questionManId=${data.questionManId}&questionMan=${
+					data.questionMan
+				}`)
+		},
+		handleChoiceaTextData(data) {// 新增咨询人监听时间
+			console.log('data',data)
+			this.handleSaveVisitor(data)
+		},
+		handleSaveVisitor(data) {
+			// 添加咨询人
+			this.UserService.getUserClubVisitorSave({
+				name: data,
+				serviceProviderId: this.listQuery.serviceProviderId
+			})
+				.then(response => {
+					setTimeout(() => {
+						this.$api.navigateTo(
+							`/pages/seller/remarks/add-record?questionManId=${response.data.questionManId}&questionMan=${
+								response.data.questionMan
+							}`
+						)
+					}, 1000)
+				})
+				.catch(error => {
+					console.log('=======>添加咨询人失败~')
+				})
+		},
+		handleClick(e) {
+			//取消收藏
+			if (e.index == 1) {
+				this.handleDeleteUserLike()
+			}
+			this.modal = false
+		},
+		handleDeleteUserLike() {
+			//操作删除资料备注
+			this.UserService.getUserRemarksVisitDelete({
+				remarksId: this.handleRemarksId
+			})
+				.then(response => {
+					this.$util.msg('已删除', 2000, true, 'success')
+					setTimeout(() => {
+						this.getUserClubVisitorRecordlist()
+					}, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.listQuery.keyWord != '') {
+				this.isShowClose = true
+			} else {
+				this.isShowClose = false
+				this.listQuery.pageNum = 1
+				this.getUserClubVisitorRecordlist()
+			}
+		},
+		delInputText() {
+			//清除输入框内容
+			this.listQuery.keyWord = ''
+			this.isShowClose = false
+			this.listQuery.pageNum = 1
+			this.getUserClubVisitorRecordlist()
+		},
+		hideMobel() {
+			this.modal = false
+		},
+		details(remarksId) {
+			this.$api.navigateTo(`/pages/seller/remarks/record-details?remarksId=${remarksId}`)
+		}
+	},
+	onPageScroll(e) {
+		//实时获取到滚动的值
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.GetOnReachBottomData()
+		}
+	},
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.listQuery.pageNum = 1
+			uni.stopPullDownRefresh()
+		}, 200)
+	},
+	
+	onShow() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="scss">
+@import '@/uni.scss';
+page {
+	background: #f7f7f7;
+}
+.empty-container {
+	z-index: 99;
+}
+.club-search {
+	width: 100%;
+	height: 112rpx;
+	background: #ffffff;
+	box-sizing: border-box;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 100;
+	.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;
+			position: relative;
+			.input {
+				width: 600rpx;
+				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;
+			}
+		}
+	}
+}
+.remarks-content {
+	width: 100%;
+	height: auto;
+	position: relative;
+	padding: 0;
+	box-sizing: border-box;
+	padding: 24rpx;
+	padding-top: 134rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+	.tui-remarks-cell {
+		width: 100%;
+		border-radius: 16rpx;
+		margin-bottom: 24rpx;
+		background: #FFFFFF;
+		box-sizing: border-box;
+		padding:0 24rpx 24rpx 24rpx;
+		.tui-remarks-title {
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 20rpx 0;
+			position: relative;
+			.tui-remarks-title-icon{
+				width: 128rpx;
+				height: 128rpx;
+				position: absolute;
+				top: 0;
+				right: 32rpx;
+				&.reviewed{
+					background: url(https://static.caimei365.com/app/img/icon/icon-verify1@2x.png);
+					background-size: cover;
+				}
+				&.failed{
+					background: url(https://static.caimei365.com/app/img/icon/icon-verify2@2x.png);
+					background-size: cover;
+				}
+				&.approved{
+					background: url(https://static.caimei365.com/app/img/icon/icon-verify3@2x.png);
+					background-size: cover;
+				}
+			}
+			.tui-remarks-title-top {
+				width: 100%;
+				height: 56rpx;
+				line-height: 56rpx;
+				.tui-remarks-time {
+					float: left;
+					&.tt {
+						width: 70%;
+						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;
+						.tags{
+							display: inline-block;
+							padding: 0 10rpx;
+							border-radius: 8rpx;
+							line-height: 36rpx;
+							font-size: 22rpx;
+							background-color: #F94B4B;
+							color: #ffffff;
+							text-align: center;
+							float: left;
+							margin-right: 10rpx;
+							margin-top: 10rpx;
+							font-weight: normal;
+						}
+					}
+				}
+			}
+			.tui-remarks-title-bot {
+				width: 100%;
+				height: auto;
+				.tui-remarks-text-view{
+					width: 100%;
+					height: 48rpx;
+					.tui-remarks-text {
+						width: 50%;
+						height: 48rpx;
+						line-height: 48rpx;
+						box-sizing: border-box;
+						text-align: left;
+						font-size: $font-size-26;
+						color: #999999;
+						float: left;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						&.a{
+							width: 100%;
+						}
+						&.y {
+							text-align: right;
+						}
+					}
+				}
+			}
+		}
+		.tui-remarks-content {
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding-bottom: 32rpx;
+			.tui-remarks-text{
+				width: 100%;
+				height: 180rpx;
+				box-sizing: border-box;
+				background-color: #F7F7F7;
+				padding: 26rpx;
+				border-radius: 6rpx;
+				line-height: 42rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 3;
+				line-clamp: 3;
+				-webkit-box-orient: vertical;
+				font-size: 30rpx;
+			}
+			.tui-remarks-goods{
+				width: 100%;
+				height: 180rpx;
+				box-sizing: border-box;
+				background-color: #F7F7F7;
+				padding: 26rpx;
+				border-radius: 6rpx;
+				.goods-image{
+					width: 128rpx;
+					height: 128rpx;
+					float: left;
+					image{
+						width: 128rpx;
+						height: 128rpx;
+						display: block;
+						border-radius: 4rpx;
+					}
+				}
+				.goods-main{
+					width: 475rpx;
+					height: 128rpx;
+					box-sizing: border-box;
+					padding-left: 24rpx;
+					float: right;
+					.name{
+						width: 100%;
+						height: 48rpx;
+						box-sizing: border-box;
+						line-height: 48rpx;
+						color: #333333;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+					.shop{
+						line-height: 36rpx;
+						color: #999999;
+						font-size: 26rpx;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						line-clamp: 2;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+				}
+			}
+		}
+		.tui-remarks-button {
+			width: 100%;
+			height: 68rpx;
+			border-top: 1px solid #E1E1E1;
+			padding-top: 20rpx;
+			.btn {
+				width: 50%;
+				line-height: 48rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: $font-size-34;
+				float: left;
+				font-weight: bold;
+				&.edit{
+					color: #1890F9;
+					border-right: 1px solid #E1E1E1;
+				}
+				&.del{
+					color: #F94B4B;
+				}
+			}
+		}
+	}
+}
+.tui-popup-box {
+	position: relative;
+	box-sizing: border-box;
+	min-height: 100rpx;
+	padding: 6rpx 24rpx;
+	.tui-popup-content {
+		padding-top: 30rpx;
+	}
+}
+.tui-popup-btn {
+	width: 100%;
+	height: auto;
+	float: left;
+	box-sizing: border-box;
+	margin-top: 30rpx;
+	.tui-flex-1 {
+		width: 100%;
+		height: 84rpx;
+		display: flex;
+		.tui-button {
+			flex: 1;
+			line-height: 84rpx;
+			font-size: $font-size-28;
+			text-align: center;
+			border-radius: 42rpx;
+			padding: 0;
+			margin: 0 15rpx;
+			box-sizing: border-box;
+			&.cancel {
+				background: #ffe6dc;
+				color: #e15616;
+			}
+			&.disabled {
+				background: #e1e1e1;
+				color: #ffffff;
+			}
+			&.confirm {
+				background: $btn-confirm;
+				color: #ffffff;
+			}
+		}
+		.tui-button-text{
+			width: 600rpx;
+			height: 48rpx;
+			line-height: 48rpx;
+			text-align: center;
+			color: #E15616;
+			font-size: $font-size-26;
+			margin: 0 auto;
+			margin-top: 15rpx;
+		}
+	}
+}
+</style>

+ 727 - 0
pages/seller/remarks/report-visitor-list.vue

@@ -0,0 +1,727 @@
+<template>
+	<view class="container product clearfix">
+		<view class="club-search clearfix">
+			<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="getUserClubVisitorRecordlist"
+						placeholder="搜索商品名称 / 报备关键词"
+						maxlength="16"
+					/>
+					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+				</view>
+			</view>
+		</view>
+		<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">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-remarks-empty@2x.png'"></image>
+					<text class="error-text">暂无任何记录~</text>
+				</view>
+				<template v-else>
+					<!-- 列表 -->
+					<view
+						class="tui-remarks-cell  tui-mtop clearfix"
+						v-for="(remark, index) in remarksList"
+						:key="index"
+						@click.stop="details(remark.remarksId)"
+					>
+						<view class="tui-remarks-title">
+							<view class="tui-remarks-title-top">
+								<view class="tui-remarks-time tt">{{ remark.clubName }}</view>
+							</view>
+							<view class="tui-remarks-title-bot">
+								<view class="tui-remarks-text-view">
+									<view class="tui-remarks-text h"></text>报备人:{{ remark.recordName }}</view>
+									<view class="tui-remarks-text y">
+										{{ remark.addDate }}
+									</view>
+								</view>
+							</view>
+							<view class="tui-remarks-title-icon" :class="{
+										reviewed: remark.type == 1,
+										failed: remark.type == 2,
+										approved: remark.type == 3
+									}">
+							</view>
+						</view> 
+						<view class="tui-remarks-content">
+							<view class="tui-remarks-goods" v-if="remark.product">
+								<view class="goods-image">
+									<image
+										:src="remark.product.images"
+										mode=""
+									></image>
+								</view>
+								<view class="goods-main">
+									<view class="name">
+										{{ remark.product.name }}
+									</view>
+									<view class="shop">{{ remark.reportText }}</view>
+								</view>
+							</view>
+							<view class="tui-remarks-text" v-else>
+								{{ remark.reportText }}
+							</view>
+						</view>
+						<view class="tui-remarks-button">
+							<view class="btn edit" @click.stop="handReportDetails(remark.remarksId)">查看关联咨询记录</view>
+							<view class="btn del" @click.stop="deleteRemark(remark.remarksId)">删除</view>
+						</view>
+					</view>
+					<!--加载loadding-->
+					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+					<!--加载loadding-->
+				</template>
+			</view>
+		</view>
+		<!-- 弹窗提示 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			@cancel="hideMobel"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
+	</view>
+</template>
+<script>
+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'
+
+const defaultListQuery = {
+	startAddTime:'',
+	endAddTime:'',
+	consult:'',
+	pinceSensitve: 0, //价格敏感度
+	satisfied: 0, // 意向程度
+	followup: 0, // 跟进状态
+	leaderId:0,
+	groupId:0,
+	manager:0,
+	serviceProviderId: 0,
+	pageNum: 1,
+	pageSize: 10
+}
+export default {
+	components: {
+		cmRefereepopup,
+		cmClubmodal,
+		cmScreenDrawer
+	},
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '确认',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
+					},
+					plain: false
+				}
+			],
+			totalRecord: 0,
+			popupShow: true,
+			popupShow1: false,
+			listQuery: Object.assign({}, defaultListQuery),
+			remarksList: [
+				{
+					clubName:'采美信息技术有限公司',
+					recordName:'吴小研',
+					addDate:'2022-08-10',
+					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product:{
+						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type:1
+				},
+				{
+					clubName:'采美信息技术有限公司',
+					recordName:'吴小研',
+					addDate:'2022-08-10',
+					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product:{
+						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
+						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
+					},
+					type:2
+				},
+				{
+					clubName:'采美信息技术有限公司',
+					recordName:'吴小研',
+					addDate:'2022-08-10',
+					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
+					product:null,
+					type:3
+				}
+			],
+			scrollTop: 0,
+			isEmpty: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			contentModalText: '', //操作文字提示语句
+			modal: false,
+			questionMan: '',
+			questionManId: '',
+			handleRemarksId: 0,
+		}
+	},
+	onLoad(option) {
+		
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login', 'logout']),
+		async init() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			// const VisitorInfo = await this.$api.getComStorage('VisitorInfo')
+			// this.questionMan = VisitorInfo.questionMan
+			// this.listQuery.questionManId = VisitorInfo.questionManId
+			// this.getUserClubVisitorRecordlist()
+		},
+		getUserClubVisitorRecordlist() {
+			this.remarksList = []
+			this.listQuery.pageNum = 1
+			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.isEmpty = false
+						this.hasNextPage = data.hasNextPage
+						this.totalRecord = data.totalRecord
+						this.remarksList = data.results
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							if (this.remarksList.length < 8) {
+								this.pullUpOn = true
+							} else {
+								this.pullUpOn = false
+								this.loadding = false
+								this.nomoreText = '已至底部'
+							}
+						}
+					} else {
+						this.isEmpty = true
+					}
+					this.isRequest = true
+				})
+				.catch(error => {
+					console.log('=======>查询列表异常~')
+				})
+		},
+		GetOnReachBottomData(index) {
+			//上拉加载
+			this.listQuery.pageNum += 1
+			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.hasNextPage = data.hasNextPage
+						this.remarksList = this.remarksList.concat(data.results)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							this.pullUpOn = false
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				})
+				.catch(error => {
+					console.log('=======>查询列表异常~')
+				})
+		},
+		deleteRemark(remarksId) {
+			this.handleRemarksId = remarksId
+			this.modal = true
+			this.contentModalText = '确定删除该报备吗?'
+		},
+		handReportDetails(remarksId) {
+			//跳转报备详情
+			this.$api.navigateTo(`/pages/seller/remarks/relation-visitor-list?id=${remarksId}`)
+		},
+		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
+			this.listQuery.pinceSensitve = data.pinceSensitve
+			this.listQuery.satisfied = data.satisfied
+			this.listQuery.followup = data.followup
+			console.log('确定筛选',this.listQuery)
+			this.getUserClubVisitorRecordlist()
+		},
+		handleShowClubpopup() {
+			//跳转选择咨询人
+			this.$api.navigateTo('/pages/seller/remarks/customer-list')
+		},
+		handleChoiceaConsultData(data){// 选择咨询人添加记录
+			//跳转添加记录
+			this.$api.navigateTo(`/pages/seller/remarks/add-record?type=add&questionManId=${data.questionManId}&questionMan=${
+					data.questionMan
+				}`)
+		},
+		handleChoiceaTextData(data) {// 新增咨询人监听时间
+			console.log('data',data)
+			this.handleSaveVisitor(data)
+		},
+		handleSaveVisitor(data) {
+			// 添加咨询人
+			this.UserService.getUserClubVisitorSave({
+				name: data,
+				serviceProviderId: this.listQuery.serviceProviderId
+			})
+				.then(response => {
+					setTimeout(() => {
+						this.$api.navigateTo(
+							`/pages/seller/remarks/add-record?questionManId=${response.data.questionManId}&questionMan=${
+								response.data.questionMan
+							}`
+						)
+					}, 1000)
+				})
+				.catch(error => {
+					console.log('=======>添加咨询人失败~')
+				})
+		},
+		handleClick(e) {
+			//取消收藏
+			if (e.index == 1) {
+				this.handleDeleteUserLike()
+			}
+			this.modal = false
+		},
+		handleDeleteUserLike() {
+			//操作删除资料备注
+			this.UserService.getUserRemarksVisitDelete({
+				remarksId: this.handleRemarksId
+			})
+				.then(response => {
+					this.$util.msg('已删除', 2000, true, 'success')
+					setTimeout(() => {
+						this.getUserClubVisitorRecordlist()
+					}, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.listQuery.keyWord != '') {
+				this.isShowClose = true
+			} else {
+				this.isShowClose = false
+				this.listQuery.pageNum = 1
+				this.getUserClubVisitorRecordlist()
+			}
+		},
+		delInputText() {
+			//清除输入框内容
+			this.listQuery.keyWord = ''
+			this.isShowClose = false
+			this.listQuery.pageNum = 1
+			this.getUserClubVisitorRecordlist()
+		},
+		hideMobel() {
+			this.modal = false
+		},
+		details(remarksId) {
+			this.$api.navigateTo(`/pages/seller/remarks/record-details?remarksId=${remarksId}`)
+		}
+	},
+	onPageScroll(e) {
+		//实时获取到滚动的值
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.GetOnReachBottomData()
+		}
+	},
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.listQuery.pageNum = 1
+			uni.stopPullDownRefresh()
+		}, 200)
+	},
+	
+	onShow() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="scss">
+@import '@/uni.scss';
+page {
+	background: #f7f7f7;
+}
+.empty-container {
+	z-index: 99;
+}
+.club-search {
+	width: 100%;
+	height: 112rpx;
+	background: #ffffff;
+	box-sizing: border-box;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 100;
+	.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;
+			position: relative;
+			.input {
+				width: 600rpx;
+				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;
+			}
+		}
+	}
+}
+.remarks-content {
+	width: 100%;
+	height: auto;
+	position: relative;
+	padding: 0;
+	box-sizing: border-box;
+	padding: 24rpx;
+	padding-top: 134rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+	.tui-remarks-cell {
+		width: 100%;
+		border-radius: 16rpx;
+		margin-bottom: 24rpx;
+		background: #FFFFFF;
+		box-sizing: border-box;
+		padding:0 24rpx 24rpx 24rpx;
+		.tui-remarks-title {
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 20rpx 0;
+			position: relative;
+			.tui-remarks-title-icon{
+				width: 128rpx;
+				height: 128rpx;
+				position: absolute;
+				top: 0;
+				right: 32rpx;
+				&.reviewed{
+					background: url(https://static.caimei365.com/app/img/icon/icon-verify1@2x.png);
+					background-size: cover;
+				}
+				&.failed{
+					background: url(https://static.caimei365.com/app/img/icon/icon-verify2@2x.png);
+					background-size: cover;
+				}
+				&.approved{
+					background: url(https://static.caimei365.com/app/img/icon/icon-verify3@2x.png);
+					background-size: cover;
+				}
+			}
+			.tui-remarks-title-top {
+				width: 100%;
+				height: 56rpx;
+				line-height: 56rpx;
+				.tui-remarks-time {
+					float: left;
+					&.tt {
+						width: 70%;
+						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;
+						.tags{
+							display: inline-block;
+							padding: 0 10rpx;
+							border-radius: 8rpx;
+							line-height: 36rpx;
+							font-size: 22rpx;
+							background-color: #F94B4B;
+							color: #ffffff;
+							text-align: center;
+							float: left;
+							margin-right: 10rpx;
+							margin-top: 10rpx;
+							font-weight: normal;
+						}
+					}
+				}
+			}
+			.tui-remarks-title-bot {
+				width: 100%;
+				height: auto;
+				.tui-remarks-text-view{
+					width: 100%;
+					height: 48rpx;
+					.tui-remarks-text {
+						width: 50%;
+						height: 48rpx;
+						line-height: 48rpx;
+						box-sizing: border-box;
+						text-align: left;
+						font-size: $font-size-26;
+						color: #999999;
+						float: left;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						&.a{
+							width: 100%;
+						}
+						&.y {
+							text-align: right;
+						}
+					}
+				}
+			}
+		}
+		.tui-remarks-content {
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding-bottom: 32rpx;
+			.tui-remarks-text{
+				width: 100%;
+				height: 180rpx;
+				box-sizing: border-box;
+				background-color: #F7F7F7;
+				padding: 26rpx;
+				border-radius: 6rpx;
+				line-height: 42rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 3;
+				line-clamp: 3;
+				-webkit-box-orient: vertical;
+				font-size: 30rpx;
+			}
+			.tui-remarks-goods{
+				width: 100%;
+				height: 180rpx;
+				box-sizing: border-box;
+				background-color: #F7F7F7;
+				padding: 26rpx;
+				border-radius: 6rpx;
+				.goods-image{
+					width: 128rpx;
+					height: 128rpx;
+					float: left;
+					image{
+						width: 128rpx;
+						height: 128rpx;
+						display: block;
+						border-radius: 4rpx;
+					}
+				}
+				.goods-main{
+					width: 475rpx;
+					height: 128rpx;
+					box-sizing: border-box;
+					padding-left: 24rpx;
+					float: right;
+					.name{
+						width: 100%;
+						height: 48rpx;
+						box-sizing: border-box;
+						line-height: 48rpx;
+						color: #333333;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+					.shop{
+						line-height: 36rpx;
+						color: #999999;
+						font-size: 26rpx;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						line-clamp: 2;
+						-webkit-box-orient: vertical;
+						font-size: 26rpx;
+					}
+				}
+			}
+		}
+		.tui-remarks-button {
+			width: 100%;
+			height: 68rpx;
+			border-top: 1px solid #E1E1E1;
+			padding-top: 20rpx;
+			.btn {
+				width: 50%;
+				line-height: 48rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: $font-size-34;
+				float: left;
+				font-weight: bold;
+				&.edit{
+					color: #1890F9;
+					border-right: 1px solid #E1E1E1;
+				}
+				&.del{
+					color: #F94B4B;
+				}
+			}
+		}
+	}
+}
+.tui-popup-box {
+	position: relative;
+	box-sizing: border-box;
+	min-height: 100rpx;
+	padding: 6rpx 24rpx;
+	.tui-popup-content {
+		padding-top: 30rpx;
+	}
+}
+.tui-popup-btn {
+	width: 100%;
+	height: auto;
+	float: left;
+	box-sizing: border-box;
+	margin-top: 30rpx;
+	.tui-flex-1 {
+		width: 100%;
+		height: 84rpx;
+		display: flex;
+		.tui-button {
+			flex: 1;
+			line-height: 84rpx;
+			font-size: $font-size-28;
+			text-align: center;
+			border-radius: 42rpx;
+			padding: 0;
+			margin: 0 15rpx;
+			box-sizing: border-box;
+			&.cancel {
+				background: #ffe6dc;
+				color: #e15616;
+			}
+			&.disabled {
+				background: #e1e1e1;
+				color: #ffffff;
+			}
+			&.confirm {
+				background: $btn-confirm;
+				color: #ffffff;
+			}
+		}
+		.tui-button-text{
+			width: 600rpx;
+			height: 48rpx;
+			line-height: 48rpx;
+			text-align: center;
+			color: #E15616;
+			font-size: $font-size-26;
+			margin: 0 auto;
+			margin-top: 15rpx;
+		}
+	}
+}
+</style>