资料备注修改

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

@@ -150,6 +150,9 @@ export default {
 				consult:'',
 				leaderId:0,
 				groupId:0,
+				pinceSensitve:0,//价格敏感度
+				satisfied:0,// 意向程度
+				followup:0,// 跟进状态
 			},
 			priceActions:[
 				{name:'敏感',value:1},
@@ -282,16 +285,15 @@ export default {
 			switch(type){
 				case 1:
 					this.priceFlagText = this.priceActions[e.target.value].name
-					this.listQuery.validFlag = this.statusActions[e.target.value].value
+					this.queryData.pinceSensitve = this.priceActions[e.target.value].value
 					break
 				case 2:
 					this.intenFlagText = this.intenActions[e.target.value].name
-					this.listQuery.featuredFlag = this.recommendActions[e.target.value].value
+					this.queryData.satisfied = this.intenActions[e.target.value].value
 					break
 				case 3:			
 					this.followStateText = this.stateActions[e.target.value].name
-					this.listQuery.bigTypeId = this.classificationFirstList[e.target.value].value
-					this.GetPrimarySecondaryClassification(this.listQuery.bigTypeId)
+					this.queryData.followup = this.stateActions[e.target.value].value
 					break
 			}
 		},

pages/second/form/form-seller.vue

@@ -193,7 +193,7 @@
 				 </view>
 			 </view>
 			<view class="row none" v-if="secondParams.publishIdentity === 1">
-				<view class="label-im"><text class="red">*</text>身份证照片：</view>
+				<view class="label-im">身份证照片：</view>
 				<view class="label-em">个人请上传身份证正反面照片(图片大小不超过5M)</view>
 				<view class="release-input upload image uploadGoodsImages" >
 					<view class="upload-file-view">
@@ -221,7 +221,7 @@
 				</view>
 			 </view>
 			<view class="row none" v-if="secondParams.publishIdentity === 2">
-			 	<view class="label-im"><text class="red">*</text>营业执照：</view>
+			 	<view class="label-im">营业执照：</view>
 			 	<view class="label-em">请上传营业执照照片(图片大小不超过5M)</view>
 			 	<view class="release-input upload image uploadGoodsImages" >
 			 		<view class="upload-file" v-if="secondParams.licenseImage == ''">

pages/second/form/form.vue

@@ -193,7 +193,7 @@
 				 </view>
 			 </view>
 			<view class="row none" v-if="secondParams.publishIdentity === 1">
-				<view class="label-im"><text class="red">*</text>身份证照片：</view>
+				<view class="label-im">身份证照片：</view>
 				<view class="label-em">个人请上传身份证正反面照片(图片大小不超过5M)</view>
 				<view class="release-input upload image uploadGoodsImages" >
 					<view class="upload-file-view">
@@ -221,7 +221,7 @@
 				</view>
 			 </view>
 			<view class="row none" v-if="secondParams.publishIdentity === 2">
-			 	<view class="label-im"><text class="red">*</text>营业执照：</view>
+			 	<view class="label-im">营业执照：</view>
 			 	<view class="label-em">请上传营业执照照片(图片大小不超过5M)</view>
 			 	<view class="release-input upload image uploadGoodsImages" >
 			 		<view class="upload-file" v-if="secondParams.licenseImage == ''">

pages/seller/remarks/add-record.vue

@@ -20,16 +20,116 @@
 					{{ category.className }}
 				</view>
 			</view>
+			<view class="list-view-title"> <view class="list-view-h1">机构类型：</view> </view>
+			<view class="remarks-input">
+				<input
+					class="input"
+					type="text"
+					v-model="remarksParams.clubType"
+					value=""
+					placeholder="如美甲店，医院"
+					maxlength="15"
+				/>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"><text>*</text>关键词记录：</view>
+				<view class="list-view-p"
+					>(请总结客户的咨询内容，以商品或者服务的关键词形式填写，不需要填口语化的内容。）</view
+				>
+			</view>
+			<view class="list-view-list-main">
+				<view class="list-view-list" v-for="(item, index) in remarksList" :key="index">
+					<view class="list-view-input">
+						<input
+							class="input"
+							type="text"
+							v-model="item.label"
+							placeholder="请输入关键词，不超过10个汉字"
+							maxlength="10"
+							@input="bindRemarkAction(index, $event)"
+						/>
+						<view class="list-view-assAction" v-if="item.isAssociation">
+							<scroll-view class="tui-popup-scroll train" scroll-y="true">
+								<view
+									class="ass-list"
+									v-for="(ass, assIndex) in assActionList"
+									:key="assIndex"
+									@click="SelectAssociationFn(ass.remarks,item)"
+									>{{ ass.remarks }}</view
+								>
+							</scroll-view>
+						</view>
+					</view>
+					<view class="list-view-btn">
+						<text
+							class="iconfont icon-zengjia"
+							v-if="remarksList.length < 9 && index === remarksList.length - 1"
+							@click="addListFn(item, index)"
+						></text>
+						<text
+							class="iconfont icon-shanchu4"
+							v-if="remarksList.length > 1 && index !== remarksList.length - 1"
+							@click="deleteLogistItemFn(item, index)"
+						></text>
+					</view>
+				</view>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"><text>*</text>价格敏感度：</view>
+			</view>
+			<view class="list-view-radio">
+				<picker @change="bindPickerChange(1, $event)" :value="index" :range="priceActions" range-key="name">
+					<input
+						class="input"
+						type="text"
+						disabled="false"
+						v-model="priceFlagText"
+						value=""
+						placeholder="请选择"
+					/>
+					<text class="iconfont icon-xiangyou"></text>
+				</picker>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"><text>*</text>意向程度：</view>
 			</view>
+			<view class="list-view-radio">
+				<picker @change="bindPickerChange(2, $event)" :value="index" :range="intenActions" range-key="name">
+					<input
+						class="input"
+						type="text"
+						disabled="false"
+						v-model="intenFlagText"
+						value=""
+						placeholder="请选择"
+					/>
+					<text class="iconfont icon-xiangyou"></text>
+				</picker>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"><text>*</text>跟进状态：</view>
+			</view>
+			<view class="list-view-radio">
+				<picker @change="bindPickerChange(3, $event)" :value="index" :range="stateActions" range-key="name">
+					<input
+						class="input"
+						type="text"
+						disabled="false"
+						v-model="followStateText"
+						value=""
+						placeholder="请选择"
+					/>
+					<text class="iconfont icon-xiangyou"></text>
+				</picker>
+			</view>
+			<view class="list-view-title"> <view class="list-view-h1">额外说明：</view> </view>
 			<view class="remarks-textarea">
 				<textarea
 					class="textarea"
-					v-model="remarksParams.remarks"
+					v-model="remarksParams.extra"
 					value=""
-					placeholder="请总结你和客户的聊天内容，以关键词形式填入框内，关键词之间用中文逗号隔开"
-					maxlength="500"
+					placeholder="请输入其他需要说明的内容"
+					maxlength="200"
 					@input="conInput"
 				/>
 				<text class="limit-text">{{ min }}/{{ max }}</text>
@@ -92,22 +192,51 @@ export default {
 			logisticsBatchId: 0,
 			productActions: [],
 			remarksParams: {
-				remarks: '',
+				clubType:'', //机构类型
+				remarks:[], // 关键词
+				extra: '',//额外说明
 				fileList: [],
 				imageList: [],
 				questionManId: 0,
 				serviceProviderId: 0,
-				consult:''
+				consult:'',
+				pinceSensitve:0,//价格敏感度
+				satisfied:0,// 意向程度
+				followup:0,// 跟进状态
 			},
 			min: 0,
-			max: 500,
+			max: 200,
 			handleType:'',
 			questionMan:'',
 			clubUserId:0,
 			clubInfo:{},
 			userInfo:{},
 			checkedCategorysList:[],
-			categorys:[]
+			categorys:[],
+			priceFlagText: '',
+			intenFlagText: '',
+			followStateText: '',
+			priceActions: [
+				{ name: '敏感', value: 1 },
+				{ name: '适中', value: 2 },
+				{ name: '不敏感', value: 3 },
+				{ name: '不明确', value: 4 }
+			],
+			intenActions: [
+				{ name: '意向强烈', value: 1 },
+				{ name: '意向一般', value: 2 },
+				{ name: '意向平淡', value: 3 },
+				{ name: '随便看看', value: 4 }
+			],
+			stateActions: [{ name: '跟进中', value: 1 }, { name: '跟进完成', value: 2 }, { name: '已放弃', value: 3 }],
+			remarksList: [
+				{
+					label: '',
+					isAssociation:false
+				}
+			],
+			checkRemarkIndex:0,
+			assActionList: []
 		}
 	},
 	onLoad(option) {
@@ -138,9 +267,17 @@ export default {
 			.then(response => {
 				let data = response.data
 				this.questionMan = data.questionMan
+				this.remarksList = data.remarks.map((el, index) => {
+					el.isAssociation = false
+					return el
+				})
 				this.remarksParams.questionManId = data.questionManId
-				this.remarksParams.remarks = data.remarks.join('，')
 				this.remarksParams.remarksId = data.remarksId
+				this.remarksParams.extra = data.extra
+				this.remarksParams.clubType = data.clubType
+				this.remarksParams.pinceSensitve = data.pinceSensitve
+				this.remarksParams.satisfied = data.satisfied
+				this.remarksParams.followup = data.followup
 				this.remarksParams.fileList = data.fileList
 				this.remarksParams.imageList = data.imageList
 				this.remarksParams.consult = data.consult
@@ -153,6 +290,9 @@ export default {
 					}
 					return el
 				})
+				this.priceFlagText = this.pinceFilters(data.pinceSensitve)
+				this.intenFlagText = this.intenActionsFilters(data.satisfied)
+				this.followStateText = this.followupFilters(data.followup)
 				this.initGetStotage()
 			})
 			.catch(error => {
@@ -172,16 +312,68 @@ export default {
 					console.log('=========>获取咨询类别列表失败')
 				})
 		},
+		bindRemarkAction(index, event) {
+			this.checkRemarkIndex = index
+			if (event.detail.value != '') {
+				this.UserService.getCmremarkslist({remarks : event.detail.value}).then(response => {
+					if(response.data&&response.data.length>0){
+						this.assActionList = response.data
+						this.remarksList[index].isAssociation = true
+					}else{
+						this.assActionList = []
+						this.remarksList[index].isAssociation = false
+					}
+				})
+				.catch(error => {
+					console.log('=========>获取关键词联想失败')
+				})
+			} else {
+				this.remarksList[index].isAssociation = false
+			}
+		},
+		SelectAssociationFn(ass,item) {
+			//选择关键词
+			item.isAssociation = false
+			item.label = ass
+		},
+		addListFn() {
+			//添加
+			let obj = { label: '',isAssociation:false}
+			this.remarksList.push(obj)
+		},
+		deleteLogistItemFn(item, index) {
+			this.remarksList.splice(index, 1)
+		},
+		bindPickerChange(type, e) {
+			//选择筛选条件
+			switch (type) {
+				case 1:
+					this.priceFlagText = this.priceActions[e.target.value].name
+					this.remarksParams.pinceSensitve = this.priceActions[e.target.value].value
+					break
+				case 2:
+					this.intenFlagText = this.intenActions[e.target.value].name
+					this.remarksParams.satisfied = this.intenActions[e.target.value].value
+					break
+				case 3:
+					this.followStateText = this.stateActions[e.target.value].name
+					this.remarksParams.followup = this.stateActions[e.target.value].value
+					break
+			}
+		},
 		editButtonConfim() {
 			//保存资料备注
-			if (this.remarksParams.remarks == '') {
-				this.$util.msg('请输入关键词记录', 2000)
-				return
-			}
 			if (this.remarksParams.consult == '') {
 				this.$util.msg('请选择咨询类别', 2000)
 				return
 			}
+			//统一处理关键词
+			let remarksList = []
+			for (const el of this.remarksList) {
+				remarksList.push(el.label)
+			}
+			this.remarksParams.remarks = JSON.stringify(remarksList)
+			console.log('remarksParams',this.remarksParams)
 			if (this.remarksParams.remarks == '') {
 				this.$util.msg('请输入关键词记录', 2000)
 				return
@@ -278,6 +470,35 @@ export default {
 				this.$util.msg('您输入的字数已达上限', 2000)
 			}
 		},
+		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]
+		}
 	},
 	onShow() {}
 }
@@ -314,6 +535,119 @@ page {
 			font-size: $font-size-20;
 		}
 	}
+	.list-view-radio {
+		width: 100%;
+		height: 90rpx;
+		box-sizing: border-box;
+		padding: 0 10rpx;
+		border: 1px solid #b2b2b2;
+		border-radius: 6rpx;
+		margin-bottom: 30rpx;
+		position: relative;
+		&.btn {
+			border: none;
+			margin-top: 40rpx;
+		}
+		.input {
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			float: left;
+			box-sizing: border-box;
+			font-size: $font-size-24;
+			color: #333333;
+			padding: 0 10rpx;
+			padding-right: 90rpx;
+		}
+		.iconfont {
+			width: 50rpx;
+			height: 90rpx;
+			display: block;
+			line-height: 90rpx;
+			text-align: center;
+			font-size: 30rpx;
+			color: #999999;
+			position: absolute;
+			right: 0;
+			top: 0;
+		}
+	}
+	.list-view-list-main {
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		margin-bottom: 30rpx;
+		position: relative;
+		.list-view-list {
+			width: 100%;
+			height: 90rpx;
+			box-sizing: border-box;
+			margin-bottom: 30rpx;
+			.list-view-input {
+				width: 614rpx;
+				height: 90rpx;
+				float: left;
+				position: relative;
+				.input {
+					width: 614rpx;
+					height: 90rpx;
+					box-sizing: border-box;
+					padding: 0 20rpx;
+					border: 1px solid #b2b2b2;
+					border-radius: 6rpx;
+					font-size: $font-size-24;
+					color: #333333;
+				}
+				.list-view-assAction {
+					width: 614rpx;
+					min-height: 270rpx;
+					box-sizing: border-box;
+					padding: 10rpx 0;
+					background: rgba(255, 255, 255, 1);
+					box-shadow: 0px 2px 20px rgba(0, 0, 0, 0.15);
+					border-radius: 6rpx;
+					position: absolute;
+					top: -288rpx;
+					left: 0;
+					z-index: 999;
+					overflow: hidden;
+					.tui-popup-scroll {
+						width: 100%;
+						height: 270rpx;
+					}
+					.ass-list {
+						width: 100%;
+						height: 90rpx;
+						box-sizing: border-box;
+						padding: 0 24rpx;
+						line-height: 90rpx;
+						font-size: $font-size-26;
+						color: #666666;
+						text-align: left;
+						border-bottom: 1px solid #e1e1e1;
+						&:last-child{
+							border-bottom: none;
+						}
+					}
+				}
+			}
+			.list-view-btn {
+				width: 88rpx;
+				height: 90rpx;
+				float: right;
+				text-align: center;
+				line-height: 90rpx;
+				.icon-zengjia {
+					color: #1890f9;
+					font-size: $font-size-48;
+				}
+				.icon-shanchu4 {
+					color: #e15616;
+					font-size: $font-size-48;
+				}
+			}
+		}
+	}
 	.remarks-category{
 		width: 100%;
 		float: left;
@@ -343,20 +677,28 @@ page {
 			line-height: 50rpx;
 		}
 	}
-	.remarks-input{
+	.remarks-input {
 		width: 100%;
-		height: 48rpx;
-		padding:0 16rpx;
+		height: 90rpx;
+		line-height: 90rpx;
 		margin: 20rpx 0 0 0;
-		position: relative;
 		box-sizing: border-box;
-		line-height: 48rpx;
-		font-size: $font-size-26;
-		color: $text-color;
+		.input {
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			font-size: $font-size-26;
+			color: $text-color;
+			z-index: 1;
+			box-sizing: border-box;
+			border: 1px solid #b2b2b2;
+			padding: 0 16rpx;
+			border-radius: 6rpx;
+		}
 	}
 	.remarks-textarea {
 		width: 100%;
-		height: 340rpx;
+		height: 226rpx;
 		padding: 16rpx;
 		margin: 20rpx 0 0 0;
 		border-radius: 6rpx;

pages/seller/remarks/add.vue

@@ -52,7 +52,7 @@
 				<input
 					class="input"
 					type="text"
-					v-model="remarksParams.questionMan"
+					v-model="remarksParams.clubType"
 					value=""
 					placeholder="如美甲店，医院"
 					maxlength="15"
@@ -65,7 +65,7 @@
 				>
 			</view>
 			<view class="list-view-list-main">
-				<view class="list-view-list" v-for="(item, index) in logisticsList" :key="index">
+				<view class="list-view-list" v-for="(item, index) in remarksList" :key="index">
 					<view class="list-view-input">
 						<input
 							class="input"
@@ -81,8 +81,8 @@
 									class="ass-list"
 									v-for="(ass, assIndex) in assActionList"
 									:key="assIndex"
-									@click="SelectAssociationFn(ass.name,item)"
-									>{{ ass.name }}</view
+									@click="SelectAssociationFn(ass.remarks,item)"
+									>{{ ass.remarks }}</view
 								>
 							</scroll-view>
 						</view>
@@ -90,12 +90,12 @@
 					<view class="list-view-btn">
 						<text
 							class="iconfont icon-zengjia"
-							v-if="logisticsList.length < 9 && index === logisticsList.length - 1"
+							v-if="remarksList.length < 9 && index === remarksList.length - 1"
 							@click="addListFn(item, index)"
 						></text>
 						<text
 							class="iconfont icon-shanchu4"
-							v-if="logisticsList.length > 1 && index !== logisticsList.length - 1"
+							v-if="remarksList.length > 1 && index !== remarksList.length - 1"
 							@click="deleteLogistItemFn(item, index)"
 						></text>
 					</view>
@@ -222,11 +222,16 @@ export default {
 			remarksParams: {
 				clubId: 0,
 				questionMan: '',
-				extra: '',
+				clubType:'', //机构类型
+				remarks:[], // 关键词
+				extra: '',//额外说明
 				fileList: [],
 				imageList: [],
 				serviceProviderId: 0,
-				consult: ''
+				consult: '', // 咨询类别
+				pinceSensitve:0,//价格敏感度
+				satisfied:0,// 意向程度
+				followup:0,// 跟进状态
 			},
 			min: 0,
 			max: 200,
@@ -253,32 +258,14 @@ export default {
 				{ name: '随便看看', value: 4 }
 			],
 			stateActions: [{ name: '跟进中', value: 1 }, { name: '跟进完成', value: 2 }, { name: '已放弃', value: 3 }],
-			logisticsList: [
+			remarksList: [
 				{
 					label: '',
-					number: '',
-					value: '',
 					isAssociation:false
 				}
 			],
 			checkRemarkIndex:0,
-			assActionList: [
-				{ name: '氨基酸的骄傲是件大事' },
-				{ name: '11111111111111' },
-				{ name: '22222222222' },
-				{ name: '33333333333333333' },
-				{ name: '4444444444444' },
-				{ name: '5555555' },
-				{ name: '6666666' },
-				{ name: '77777777' },
-				{ name: '88888888' },
-				{ name: '89999999' },
-				{ name: '101010101010' },
-				{ name: '11111111111111' },
-				{ name: '32432342342' },
-				{ name: 'sdfsdfsdfsdfs' },
-				{ name: '峰大厦水电费水电费' }
-			]
+			assActionList: []
 		}
 	},
 	onLoad(option) {
@@ -319,8 +306,16 @@ export default {
 				.then(response => {
 					let data = response.data
 					this.clubUserId = data.userId
-					this.remarksParams.remarks = data.remarks.join('，')
+					this.remarksList = data.remarks.map((el, index) => {
+						el.isAssociation = false
+						return el
+					})
 					this.remarksParams.remarksId = data.remarksId
+					this.remarksParams.extra = data.extra
+					this.remarksParams.clubType = data.clubType
+					this.remarksParams.pinceSensitve = data.pinceSensitve
+					this.remarksParams.satisfied = data.satisfied
+					this.remarksParams.followup = data.followup
 					this.remarksParams.fileList = data.fileList
 					this.remarksParams.imageList = data.imageList
 					if (this.handleType == 'edit') {
@@ -336,6 +331,9 @@ export default {
 							return el
 						})
 					}
+					this.priceFlagText = this.pinceFilters(data.pinceSensitve)
+					this.intenFlagText = this.intenActionsFilters(data.satisfied)
+					this.followStateText = this.followupFilters(data.followup)
 					this.getCulbInfo()
 				})
 				.catch(error => {
@@ -358,21 +356,20 @@ export default {
 		bindRemarkAction(index, event) {
 			this.checkRemarkIndex = index
 			if (event.detail.value != '') {
-				this.logisticsList[index].isAssociation = true
-				// this.UserService.getCmremarkslist({remarks : event.detail.value}).then(response => {
-				// 	if(response.data&&response.data.length>0){
-				// 		this.assActionList = response.data
-				// 		this.isAssociation = true
-				// 	}else{
-				// 		this.assActionList = []
-				// 		this.isAssociation = false
-				// 	}
-				// })
-				// .catch(error => {
-				// 	console.log('=========>获取咨询类别列表失败')
-				// })
+				this.UserService.getCmremarkslist({remarks : event.detail.value}).then(response => {
+					if(response.data&&response.data.length>0){
+						this.assActionList = response.data
+						this.remarksList[index].isAssociation = true
+					}else{
+						this.assActionList = []
+						this.remarksList[index].isAssociation = false
+					}
+				})
+				.catch(error => {
+					console.log('=========>获取关键词联想失败')
+				})
 			} else {
-				this.logisticsList[index].isAssociation = false
+				this.remarksList[index].isAssociation = false
 			}
 		},
 		SelectAssociationFn(ass,item) {
@@ -382,33 +379,30 @@ export default {
 		},
 		addListFn() {
 			//添加
-			this.isShowRemarks = false
-			let obj = { label: '', number: '', value: '',isAssociation:false}
-			this.logisticsList.push(obj)
+			let obj = { label: '',isAssociation:false}
+			this.remarksList.push(obj)
 		},
 		deleteLogistItemFn(item, index) {
-			this.logisticsList.splice(index, 1)
+			this.remarksList.splice(index, 1)
 		},
 		bindPickerChange(type, e) {
 			//选择筛选条件
 			switch (type) {
 				case 1:
 					this.priceFlagText = this.priceActions[e.target.value].name
-					this.listQuery.validFlag = this.statusActions[e.target.value].value
+					this.remarksParams.pinceSensitve = this.priceActions[e.target.value].value
 					break
 				case 2:
 					this.intenFlagText = this.intenActions[e.target.value].name
-					this.listQuery.featuredFlag = this.recommendActions[e.target.value].value
+					this.remarksParams.satisfied = this.intenActions[e.target.value].value
 					break
 				case 3:
 					this.followStateText = this.stateActions[e.target.value].name
-					this.listQuery.bigTypeId = this.classificationFirstList[e.target.value].value
-					this.GetPrimarySecondaryClassification(this.listQuery.bigTypeId)
+					this.remarksParams.followup = this.stateActions[e.target.value].value
 					break
 			}
 		},
-		async editButtonConfim() {
-			//保存资料备注
+		async editButtonConfim() {//保存资料备注
 			if (this.isConfirmLoding) {
 				return
 			}
@@ -421,6 +415,13 @@ export default {
 				this.$util.msg('请选择咨询类别', 2000)
 				return
 			}
+			//统一处理关键词
+			let remarksList = []
+			for (const el of this.remarksList) {
+				remarksList.push(el.label)
+			}
+			this.remarksParams.remarks = JSON.stringify(remarksList)
+			console.log('remarksParams',this.remarksParams)
 			if (this.remarksParams.remarks == '') {
 				this.$util.msg('请输入关键词记录', 2000)
 				return
@@ -527,6 +528,35 @@ export default {
 			} else if (this.userInfo.userIdentity === 4) {
 				this.$api.navigateTo(`/pages/seller/login/information?userID=${this.userInfo.userId}`)
 			}
+		},
+		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]
 		}
 	},
 	onShow() {}
@@ -661,20 +691,20 @@ page {
 				}
 				.list-view-assAction {
 					width: 614rpx;
-					height: 560rpx;
+					min-height: 270rpx;
 					box-sizing: border-box;
 					padding: 10rpx 0;
 					background: rgba(255, 255, 255, 1);
 					box-shadow: 0px 2px 20px rgba(0, 0, 0, 0.15);
 					border-radius: 6rpx;
 					position: absolute;
-					top: -540rpx;
+					top: -288rpx;
 					left: 0;
 					z-index: 999;
 					overflow: hidden;
 					.tui-popup-scroll {
 						width: 100%;
-						height: 540rpx;
+						height: 270rpx;
 					}
 					.ass-list {
 						width: 100%;

pages/seller/remarks/details.vue

@@ -11,20 +11,50 @@
 				</view>
 				<view class="club-le-text">
 					<text class="label">地址：</text>
-					<text class="text" v-if="clubInfo.provincialAddress">{{ clubInfo.provincialAddress }}{{ clubInfo.address }}</text>
+					<text class="text" v-if="clubInfo.provincialAddress"
+						>{{ clubInfo.provincialAddress }}{{ clubInfo.address }}</text
+					>
 				</view>
 			</view>
 			<view class="content-club-ri"> <text class="iconfont icon-xiayibu"></text> </view>
 		</view>
 		<view class="remarks-content clearfix">
-			<view class="list-view-title"> <view class="list-view-h1">咨询人：{{ remarksParams.questionMan }}</view> </view>
-			<view class="list-view-title"> <view class="list-view-h1">咨询类别：{{ remarksParams.consultBack ? remarksParams.consultBack : '无' }}</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">
+					咨询类别：<text>{{ remarksParams.consultBack ? remarksParams.consultBack : '无' }}</text>
+				</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.label }}
 				</text>
 			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>价格敏感度：<text>{{ remarksParams.pinceSensitve | pinceFilters }}</text>
+				</view>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>意向程度：<text>{{ remarksParams.satisfied | intenActionsFilters }}</text></view
+				>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>跟进状态：<text>{{ remarksParams.followup | statusText }}</text></view
+				>
+			</view>
+			<view class="list-view-title">
+				<view class="list-view-h1"
+					>额外说明：<text>{{ remarksParams.extra }}</text></view
+				>
+			</view>
 			<view class="list-view-title" v-if="remarksParams.imageList.length > 0">
 				<view class="list-view-h1">图片</view>
 			</view>
@@ -72,7 +102,7 @@ export default {
 			clubUserId: 0,
 			clubInfo: {},
 			userInfo: {},
-			categorys:''
+			categorys: ''
 		}
 	},
 	onLoad(option) {
@@ -80,6 +110,37 @@ export default {
 		this.remarksId = option.remarksId
 		this.getUserClubRemarksDetail()
 	},
+	filters: {
+		statusText(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']),
 		getUserClubRemarksDetail() {
@@ -123,7 +184,7 @@ export default {
 		},
 		openDocument(file) {
 			// 打开文档
-			uni.showLoading({title: '加载中'})
+			uni.showLoading({ title: '加载中' })
 			// 获取文件后缀
 			const index = file.fileName.lastIndexOf('.')
 			const suffix = file.fileName.substring(index + 1)
@@ -155,7 +216,7 @@ export default {
 							uni.hideLoading()
 						}
 					})
-		 	},
+				},
 				fail(err) {
 					uni.showToast({
 						title: JSON.stringify(err),
@@ -170,22 +231,22 @@ export default {
 			let self = this
 			// 下载文件
 			wx.downloadFile({
-			    url: file.fileUrl,
-			    success (res) {
-					console.log('保存文件路勁============>',res.tempFilePath)
-			        wx.saveFile({
-			            tempFilePath: res.tempFilePath,
-			            success (res) {
+				url: file.fileUrl,
+				success(res) {
+					console.log('保存文件路勁============>', res.tempFilePath)
+					wx.saveFile({
+						tempFilePath: res.tempFilePath,
+						success(res) {
 							self.$util.msg('下载成功', 2000)
-							setTimeout(()=>{
+							setTimeout(() => {
 								self.openDocument(file)
-							},2000)
-			            },
-			            fail(error){
-			                self.$util.msg('下载失败', 2000)
-			            }
-			        })
-			    }
+							}, 2000)
+						},
+						fail(error) {
+							self.$util.msg('下载失败', 2000)
+						}
+					})
+				}
 			})
 		},
 		handleClickClunInfo() {
@@ -248,31 +309,36 @@ page {
 		width: 100%;
 		height: auto;
 		margin-bottom: 16rpx;
-		margin-top: 40rpx;
+		margin-top: 30rpx;
 		.list-view-h1 {
 			line-height: 40rpx;
-			font-size: $font-size-28;
+			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-span{
+		.tui-remarks-span {
 			height: 48rpx;
 			line-height: 48rpx;
 			text-align: center;
 			padding: 0 20rpx;
-			background-color: #FEF6F3;
+			background-color: #f7f7f7;
 			font-size: $font-size-26;
-			color: #E15616;
+			color: #666666;
 			border-radius: 25rpx;
 			display: inline-block;
-			margin-right:24rpx;
+			margin-right: 24rpx;
 			margin-bottom: 24rpx;
-			&:nth-child(4n){
+			&:nth-child(4n) {
 				margin-right: none;
 			}
 		}

pages/seller/remarks/list.vue

@@ -31,28 +31,37 @@
 					class="tui-remarks-cell  tui-mtop clearfix"
 					v-for="(remark, index) in remarksList"
 					:key="index"
-					:class="{orange:remark.status==1,blue:remark.status==2,grey:remark.status==3}"
+					: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">
-								<text :class="{orange:remark.status==1,blue:remark.status==2,grey:remark.status==3}">{{ remark.status | statusText }}</text>
+							<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 class="tui-remarks-text a"
+									><text class="iconfont icon-bianji"></text>记录人：{{ remark.recordName }}</view
+								>
 							</view>
 							<view class="tui-remarks-text-view">
-								<view class="tui-remarks-text h"><text class="iconfont icon-guanliyuan"></text>管理员：{{ remark.leaderName ? remark.leaderName : '' }}</view>
-								<!-- <view class="tui-remarks-text y" v-if="listQuery.manager >= 0" -->
-								<view class="tui-remarks-text y"
-									>{{ remark.addTime }}</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.addTime }}</view>
 							</view>
-							
 						</view>
 					</view>
 					<view class="tui-remarks-name">
@@ -63,9 +72,14 @@
 							咨询类别：{{ remark.consultBack ? remark.consultBack : '无' }}
 						</view>
 					</view>
+					<view class="tui-remarks-name none" v-if="remark.satisfied">
+						<view class="tui-remarks-name-text a">
+							意向程度：{{ remark.satisfied | intenActionsFilters }}
+						</view>
+					</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
-							{{ label }}
+							{{ label.label }}
 						</text>
 					</view>
 					<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
@@ -127,6 +141,9 @@ const defaultListQuery = {
 	startAddTime: '',
 	endAddTime: '',
 	consult: '',
+	pinceSensitve: 0, //价格敏感度
+	satisfied: 0, // 意向程度
+	followup: 0, // 跟进状态
 	leaderId: 0,
 	groupId: 0,
 	manager: 0,
@@ -186,13 +203,28 @@ export default {
 			let number = Number(value).toFixed(2)
 			return number
 		},
-		statusText(value) {// 订单来源
-		    const map = {
-		        1: '跟进中',
-		        2: '跟进完成',
-		        3: '已放弃',
-		    }
-		    return map[value]
+		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: {
@@ -217,10 +249,6 @@ export default {
 						this.hasNextPage = data.hasNextPage
 						this.totalRecord = data.totalRecord
 						this.remarksList = data.results
-						this.remarksList = data.results.map((pros, index) => {
-							pros.status = 2
-							return pros
-						})
 						this.pullFlag = false
 						setTimeout(() => {
 							this.pullFlag = true
@@ -301,6 +329,9 @@ export default {
 			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.getUserClubRemarksList()
 		},
@@ -352,8 +383,7 @@ export default {
 		},
 		details(remarksId) {
 			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
-		},
-
+		}
 	},
 	onPageScroll(e) {
 		//实时获取到滚动的值
@@ -468,16 +498,17 @@ page {
 		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%);
+		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%);
+		&.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%);
+		&.grey {
+			background: #ffffff linear-gradient(180deg, #ececec 0%, rgba(255, 255, 255, 0) 50%);
 		}
 		.tui-remarks-title {
 			width: 100%;
@@ -510,34 +541,34 @@ page {
 						font-size: $font-size-26;
 						color: #999999;
 						text-align: right;
-						.orange{
+						.orange {
 							display: inline-block;
 							padding: 0 15rpx;
 							border-radius: 24rpx;
 							line-height: 48rpx;
 							font-size: 24rpx;
-							background-color: #E15616;
-							color: #FFFFFF;
+							background-color: #e15616;
+							color: #ffffff;
 							text-align: center;
 						}
-						.blue{
+						.blue {
 							display: inline-block;
 							padding: 0 15rpx;
 							border-radius: 24rpx;
 							line-height: 48rpx;
 							font-size: 24rpx;
-							background-color: #1890F9;
-							color: #FFFFFF;
+							background-color: #1890f9;
+							color: #ffffff;
 							text-align: center;
 						}
-						.grey{
+						.grey {
 							display: inline-block;
 							padding: 0 15rpx;
 							border-radius: 24rpx;
 							line-height: 48rpx;
 							font-size: 24rpx;
-							background-color: #E1E1E1;
-							color: #FFFFFF;
+							background-color: #e1e1e1;
+							color: #999999;
 							text-align: center;
 						}
 					}
@@ -546,7 +577,7 @@ page {
 			.tui-remarks-title-bot {
 				width: 100%;
 				height: auto;
-				.tui-remarks-text-view{
+				.tui-remarks-text-view {
 					width: 100%;
 					height: 48rpx;
 					.tui-remarks-text {
@@ -564,6 +595,9 @@ page {
 						-webkit-line-clamp: 1;
 						line-clamp: 1;
 						-webkit-box-orient: vertical;
+						&.a {
+							width: 100%;
+						}
 						&.y {
 							text-align: right;
 						}
@@ -578,9 +612,13 @@ page {
 			font-size: $font-size-26;
 			color: #666666;
 			text-align: left;
-			margin-bottom: 20rpx;
+			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;
@@ -594,6 +632,9 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
+				&.a {
+					width: 100%;
+				}
 				&.h {
 					width: 40%;
 					padding-right: 24rpx;
@@ -612,9 +653,9 @@ page {
 				line-height: 48rpx;
 				text-align: center;
 				padding: 0 20rpx;
-				background-color: #fef6f3;
+				background-color: #f7f7f7;
 				font-size: $font-size-26;
-				color: #e15616;
+				color: #666666;
 				border-radius: 25rpx;
 				display: inline-block;
 				margin-right: 24rpx;

pages/seller/remarks/record-details.vue

@@ -2,9 +2,8 @@
 	<view class="container qualifications" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
 		<view class="remarks-content">
 			<view class="list-view-title">
-				<view class="list-view-h1">咨询人:</view>
+				<view class="list-view-h1">咨询人:<text>{{ remarksParams.questionMan }}</text></view>
 			</view>
-			<view class="remarks-input">{{ remarksParams.questionMan }}</view>
 			<view class="list-view-title"> <view class="list-view-h1">咨询类别：{{ remarksParams.consultBack ? remarksParams.consultBack : '无' }}</view> </view>
 			<view class="list-view-title"> <view class="list-view-h1">关键词记录：</view> </view>
 			<view class="tui-remarks-content">
@@ -12,6 +11,10 @@
 					{{ label }}
 				</text>
 			</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">意向程度：<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">额外说明：<text>{{ remarksParams.questionMan }}</text></view> </view>			
 			<view class="list-view-title" v-if="remarksParams.imageList.length>0"> <view class="list-view-h1">图片</view> </view>
 			<view class="list-view-upload clearfix" v-if="remarksParams.imageList.length>0">
 				<view class="photo-item" v-for="(image, imageIndex) in remarksParams.imageList" :key="imageIndex">
@@ -152,9 +155,14 @@ page {
 		margin-top: 40rpx;
 		.list-view-h1 {
 			line-height: 40rpx;
-			font-size: $font-size-28;
+			font-size: $font-size-30;
 			color: #333333;
 			text-align: left;
+			font-weight: bold;
+			text{
+				color: #666666;
+				font-weight: normal;
+			}
 		}
 	}
 	.tui-remarks-content {
@@ -166,9 +174,9 @@ page {
 			line-height: 48rpx;
 			text-align: center;
 			padding: 0 20rpx;
-			background-color: #FEF6F3;
+			background-color: #F7F7F7;
 			font-size: $font-size-26;
-			color: #E15616;
+			color: #666666;
 			border-radius: 25rpx;
 			display: inline-block;
 			margin-right:24rpx;

pages/seller/remarks/record-list.vue

@@ -32,20 +32,33 @@
 				<template v-else>
 					<!-- 列表 -->
 					<view
-						class="tui-remarks-cell  tui-mtop"
+						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.recordName }}</view>
-								<view class="tui-remarks-time sm">{{ remark.addDate }}</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 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 class="tui-remarks-title-bot" v-if="listQuery.manager > 0">
-								<view class="tui-remarks-text y">管理员：{{ remark.leaderName ? remark.leaderName : '' }}</view>
-							</view>
-						</view>
+						</view> 
 						<view class="tui-remarks-name">
 							<view class="tui-remarks-name-text h">
 								咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
@@ -54,13 +67,14 @@
 								咨询类别：{{ remark.consultBack ? remark.consultBack : '无' }}
 							</view>
 						</view>
+						<view class="tui-remarks-name none" v-if="remark.satisfied">
+							<view class="tui-remarks-name-text a">
+								意向程度：{{ remark. satisfied | intenActionsFilters	 }}
+							</view>
+						</view>
 						<view class="tui-remarks-content">
-							<text
-								class="tui-remarks-span"
-								v-for="(label, labelIndex) in remark.remarks"
-								:key="labelIndex"
-							>
-								{{ label }}
+							<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">
@@ -139,6 +153,9 @@ const defaultListQuery = {
 	startAddTime:'',
 	endAddTime:'',
 	consult:'',
+	pinceSensitve: 0, //价格敏感度
+	satisfied: 0, // 意向程度
+	followup: 0, // 跟进状态
 	leaderId:0,
 	groupId:0,
 	manager:0,
@@ -203,7 +220,29 @@ export default {
 			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'])
@@ -299,6 +338,9 @@ export default {
 			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()
 		},
@@ -511,25 +553,36 @@ page {
 	.tui-remarks-cell {
 		width: 100%;
 		border-radius: 16rpx;
-		background: #ffffff;
 		margin-bottom: 24rpx;
+		background: #FFFFFF;
 		box-sizing: border-box;
-		padding: 0 24rpx 24rpx 24rpx;
-		.tui-remarks-title{
+		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%);
+			color: #999999;
+		}
+		.tui-remarks-title {
 			width: 100%;
 			height: auto;
 			box-sizing: border-box;
 			padding: 20rpx 0;
-			border-bottom: 1px solid #E1E1E1;
-			.tui-remarks-title-top{
+			border-bottom: 1px solid #e1e1e1;
+			float: left;
+			.tui-remarks-title-top {
 				width: 100%;
 				height: 56rpx;
 				line-height: 56rpx;
 				.tui-remarks-time {
 					float: left;
-					&.tt{
+					&.tt {
 						width: 50%;
-						font-size: $font-size-26;
+						font-size: $font-size-32;
 						color: #333333;
 						text-align: left;
 						text-overflow: ellipsis;
@@ -538,46 +591,122 @@ page {
 						-webkit-line-clamp: 1;
 						line-clamp: 1;
 						-webkit-box-orient: vertical;
+						font-weight: bold;
 					}
-					&.sm{
+					&.sm {
 						width: 50%;
 						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{
+			.tui-remarks-title-bot {
 				width: 100%;
-				height: 48rpx;
-				line-height: 48rpx;
-				.tui-remarks-text{
-					width: 50%;
+				height: auto;
+				.tui-remarks-text-view{
+					width: 100%;
 					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;
+					.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{
+		}
+		.tui-remarks-name {
 			width: 100%;
 			height: 48rpx;
 			line-height: 48rpx;
 			font-size: $font-size-26;
 			color: #666666;
 			text-align: left;
-			margin-bottom: 20rpx;
+			margin-bottom: 10rpx;
 			margin-top: 20rpx;
-			.tui-remarks-name-text{
+			float: left;
+			&.none{
+				margin-top: 0;
+				margin-bottom: 20rpx;
+			}
+			.tui-remarks-name-text {
 				height: 48rpx;
 				box-sizing: border-box;
 				text-align: left;
@@ -590,11 +719,14 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
-				&.h{
+				&.a{
+					width: 100%;
+				}
+				&.h {
 					width: 40%;
 					padding-right: 24rpx;
 				}
-				&.y{
+				&.y {
 					width: 60%;
 					padding-left: 24rpx;
 				}
@@ -608,9 +740,9 @@ page {
 				line-height: 48rpx;
 				text-align: center;
 				padding: 0 20rpx;
-				background-color: #fef6f3;
+				background-color: #F7F7F7;
 				font-size: $font-size-26;
-				color: #e15616;
+				color: #666666;
 				border-radius: 25rpx;
 				display: inline-block;
 				margin-right: 24rpx;