Explorar el Código

commit -m 资料备注增加新功能

zhengjinyi hace 3 años
padre
commit
0cbab60644

+ 19 - 3
common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/font_1519039_w6mj588b15f.woff2?t=1647943328937') format('woff2'),
-       url('//at.alicdn.com/t/font_1519039_w6mj588b15f.woff?t=1647943328937') format('woff'),
-       url('//at.alicdn.com/t/font_1519039_w6mj588b15f.ttf?t=1647943328937') format('truetype');
+  src: url('//at.alicdn.com/t/font_1519039_qqxj9d6x9m.woff2?t=1652683528270') format('woff2'),
+       url('//at.alicdn.com/t/font_1519039_qqxj9d6x9m.woff?t=1652683528270') format('woff'),
+       url('//at.alicdn.com/t/font_1519039_qqxj9d6x9m.ttf?t=1652683528270') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shanchu4:before {
+  content: "\e738";
+}
+
+.icon-zengjia:before {
+  content: "\e739";
+}
+
+.icon-bianji:before {
+  content: "\e736";
+}
+
+.icon-guanliyuan:before {
+  content: "\e737";
+}
+
 .icon-fuzhi_o:before {
   content: "\eb4e";
 }

+ 108 - 1
components/cm-module/cm-seller/cm-screen-drawer.vue

@@ -72,6 +72,33 @@
 								</view>
 							</view>
 						</template>
+						<view class="drawer-main-name">价格敏感度:</view>
+						<view class="drawer-main-radiov">
+							<view class="drawer-main-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>
+						<view class="drawer-main-name">意向程度:</view>
+						<view class="drawer-main-radiov">
+							<view class="drawer-main-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>
+						<view class="drawer-main-name">跟进状态:</view>
+						<view class="drawer-main-radiov">
+							<view class="drawer-main-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>
 					</view>
 				</scroll-view>
 				<view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
@@ -114,13 +141,33 @@ export default {
 			checkedCategorysList:[],
 			groups:[],
 			members:[],
+			priceFlagText:'',
+			intenFlagText:'',
+			followStateText:'',
 			queryData:{
 				startAddTime:'',
 				endAddTime:'',
 				consult:'',
 				leaderId:0,
 				groupId:0,
-			}
+			},
+			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},
+			],
 		}
 	},
 	created() {
@@ -231,6 +278,23 @@ export default {
 				}
 			})
 		},
+		bindPickerChange(type,e) {//选择筛选条件
+			switch(type){
+				case 1:
+					this.priceFlagText = this.priceActions[e.target.value].name
+					this.listQuery.validFlag = this.statusActions[e.target.value].value
+					break
+				case 2:
+					this.intenFlagText = this.intenActions[e.target.value].name
+					this.listQuery.featuredFlag = this.recommendActions[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)
+					break
+			}
+		},
 		closeDrawer(){
 			this.$parent.isScreenDrawer = false
 		},
@@ -389,6 +453,49 @@ export default {
 				}
 			}
 		}
+		.drawer-main-radiov{
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			.drawer-main-radio{
+				width: 100%;
+				height: 80rpx;
+				box-sizing: border-box;
+				padding: 0 10rpx;
+				border: 1px solid rgba(0,0,0,0.2);
+				border-radius: 6rpx;
+				margin-bottom: 30rpx;
+				position: relative;
+				&.btn{
+					border: none;
+					margin-top: 40rpx;
+				}
+				.input{
+					width: 100%;
+					height: 80rpx;
+					line-height: 80rpx;
+					float: left;
+					box-sizing: border-box;
+					font-size: $font-size-24;
+					color: #333333;
+					padding: 0 10rpx;
+					padding-right: 68rpx;
+				}
+				.iconfont{
+					width: 50rpx;
+					height: 80rpx;
+					display: block;
+					line-height: 80rpx;
+					text-align: center;
+					font-size: 30rpx;
+					color: #999999;
+					position: absolute;
+					right: 0;
+					top: 0;
+				}
+			}
+		}
 	}
 	.drawer-input {
 		width: 100%;

+ 339 - 26
pages/seller/remarks/add.vue

@@ -11,7 +11,9 @@
 				</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>
@@ -45,16 +47,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.questionMan"
+					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 logisticsList" :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.name,item)"
+									>{{ ass.name }}</view
+								>
+							</scroll-view>
+						</view>
+					</view>
+					<view class="list-view-btn">
+						<text
+							class="iconfont icon-zengjia"
+							v-if="logisticsList.length < 9 && index === logisticsList.length - 1"
+							@click="addListFn(item, index)"
+						></text>
+						<text
+							class="iconfont icon-shanchu4"
+							v-if="logisticsList.length > 1 && index !== logisticsList.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>
@@ -112,6 +214,7 @@ var isPreviewImg
 export default {
 	data() {
 		return {
+			hideButton: true,
 			isIphoneX: this.$store.state.isIphoneX,
 			shopOrderId: 0,
 			logisticsBatchId: 0,
@@ -119,21 +222,63 @@ export default {
 			remarksParams: {
 				clubId: 0,
 				questionMan: '',
-				remarks: '',
+				extra: '',
 				fileList: [],
 				imageList: [],
 				serviceProviderId: 0,
-				consult:''
+				consult: ''
 			},
 			min: 0,
-			max: 500,
+			max: 200,
 			handleType: '',
 			clubUserId: 0,
 			clubInfo: {},
 			userInfo: {},
-			checkedCategorysList:[],
-			categorys:[],
-			isConfirmLoding:false
+			checkedCategorysList: [],
+			categorys: [],
+			isConfirmLoding: false,
+			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 }],
+			logisticsList: [
+				{
+					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: '峰大厦水电费水电费' }
+			]
 		}
 	},
 	onLoad(option) {
@@ -158,7 +303,7 @@ export default {
 					this.clubInfo = response.data.club
 					this.userInfo = response.data.user
 					this.remarksParams.clubId = this.clubInfo.clubId
-					if(this.handleType != 'edit'){
+					if (this.handleType != 'edit') {
 						this.remarksParams.questionMan = this.clubInfo.linkMan
 					}
 				})
@@ -178,14 +323,14 @@ export default {
 					this.remarksParams.remarksId = data.remarksId
 					this.remarksParams.fileList = data.fileList
 					this.remarksParams.imageList = data.imageList
-					if(this.handleType == 'edit'){
+					if (this.handleType == 'edit') {
 						this.remarksParams.questionMan = data.questionMan
 						this.remarksParams.consult = data.consult
 						this.checkedCategorysList = data.consult.split(',').map(i => parseInt(i, 0))
 						this.categorys = this.categorys.map((el, index) => {
-							if(data.consult.includes(el.id)){
+							if (data.consult.includes(el.id)) {
 								el.isChecked = true
-							}else{
+							} else {
 								el.isChecked = false
 							}
 							return el
@@ -210,9 +355,63 @@ export default {
 					console.log('=========>获取咨询类别列表失败')
 				})
 		},
+		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('=========>获取咨询类别列表失败')
+				// })
+			} else {
+				this.logisticsList[index].isAssociation = false
+			}
+		},
+		SelectAssociationFn(ass,item) {
+			//选择关键词
+			item.isAssociation = false
+			item.label = ass
+		},
+		addListFn() {
+			//添加
+			this.isShowRemarks = false
+			let obj = { label: '', number: '', value: '',isAssociation:false}
+			this.logisticsList.push(obj)
+		},
+		deleteLogistItemFn(item, index) {
+			this.logisticsList.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
+					break
+				case 2:
+					this.intenFlagText = this.intenActions[e.target.value].name
+					this.listQuery.featuredFlag = this.recommendActions[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)
+					break
+			}
+		},
 		async editButtonConfim() {
 			//保存资料备注
-			if(this.isConfirmLoding){return}
+			if (this.isConfirmLoding) {
+				return
+			}
 			const userInfo = await this.$api.getStorage()
 			if (this.remarksParams.questionMan == '') {
 				this.$util.msg('请输入咨询人姓名', 2000)
@@ -245,19 +444,20 @@ export default {
 					this.isConfirmLoding = false
 				})
 		},
-		choiceCategorys(category,index){
+		choiceCategorys(category, index) {
 			// 选择类别
 			category.isChecked = !category.isChecked
 			if (category.isChecked) {
-				if(!this.contains(this.checkedCategorysList,category.id)){
+				if (!this.contains(this.checkedCategorysList, category.id)) {
 					this.checkedCategorysList.push(category.id)
 				}
 			} else {
-				this.checkedCategorysList.splice(this.checkedCategorysList.indexOf(category.id),1)
+				this.checkedCategorysList.splice(this.checkedCategorysList.indexOf(category.id), 1)
 			}
 			this.remarksParams.consult = this.checkedCategorysList.join(',')
 		},
-		contains(arr, val) {// 校验
+		contains(arr, val) {
+			// 校验
 			return arr.some(item => item === val)
 		},
 		uploadFile(array) {
@@ -396,7 +596,120 @@ page {
 			font-size: $font-size-20;
 		}
 	}
-	.remarks-category{
+	.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;
+					height: 560rpx;
+					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;
+					left: 0;
+					z-index: 999;
+					overflow: hidden;
+					.tui-popup-scroll {
+						width: 100%;
+						height: 540rpx;
+					}
+					.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;
 		.checkbox-list {
@@ -408,19 +721,19 @@ page {
 			margin-bottom: 10rpx;
 			box-sizing: border-box;
 			float: left;
-			.icon-yixuanze{
+			.icon-yixuanze {
 				margin-right: 10rpx;
-				color: #E15616;
+				color: #e15616;
 			}
-			.icon-weixuanze{ 
+			.icon-weixuanze {
 				margin-right: 10rpx;
-				color: #B2B2B2;
+				color: #b2b2b2;
 			}
 		}
 		.item-text {
 			display: inline-block;
 			font-size: 26rpx;
-			color: #333333; 
+			color: #333333;
 			border-radius: 28rpx;
 			line-height: 50rpx;
 		}
@@ -445,7 +758,7 @@ page {
 	}
 	.remarks-textarea {
 		width: 100%;
-		height: 340rpx;
+		height: 226rpx;
 		padding: 16rpx;
 		margin: 20rpx 0 0 0;
 		border-radius: 6rpx;

+ 175 - 107
pages/seller/remarks/list.vue

@@ -3,19 +3,20 @@
 		<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"/>
+				<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>
-				筛选
+				<text class="iconfont icon-gengduo1"></text> 筛选
 			</view>
 		</view>
 		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '216rpx' : '168rpx' }">
@@ -26,15 +27,32 @@
 					<text class="error-text">暂无任何数据~</text>
 				</view>
 				<!-- 列表 -->
-				<view class="tui-remarks-cell  tui-mtop" v-for="(remark, index) in remarksList" :key="index" @click.stop="details(remark.remarksId)">
+				<view
+					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}"
+					@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">{{ remark.addTime }}</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>
 						</view>
 						<view class="tui-remarks-title-bot">
-							<view class="tui-remarks-text h">记录人:{{ remark.recordName }}</view>
-							<view class="tui-remarks-text y" v-if="listQuery.manager > 0">管理员:{{ remark.leaderName ? remark.leaderName : '' }}</view>
+							<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">
+								<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>
+							
 						</view>
 					</view>
 					<view class="tui-remarks-name">
@@ -51,7 +69,7 @@
 						</text>
 					</view>
 					<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
-						<view class="btn edit"  @click.stop="handEditRemark(remark.remarksId)">修改</view> 
+						<view class="btn edit" @click.stop="handEditRemark(remark.remarksId)">修改</view>
 						<view class="btn del" @click.stop="deleteRemark(remark.remarksId)">删除</view>
 					</view>
 				</view>
@@ -75,15 +93,15 @@
 			</view>
 		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
-		<cm-screenDrawer ref="screendrawer"
-						 :rightDrawer="isScreenDrawer"
-						 @handSearchConfirm="handSearchConfirmData">
+		<cm-screenDrawer ref="screendrawer" :rightDrawer="isScreenDrawer" @handSearchConfirm="handSearchConfirmData">
 		</cm-screenDrawer>
 		<!-- 添加记录 -->
-		<cm-clubpopup ref="clubpopup" 
-					v-if="isClubpopupShow"
-					:show="isClubpopupShow"
-					@handleChoiceaClub="handleChoiceaClubData">
+		<cm-clubpopup
+			ref="clubpopup"
+			v-if="isClubpopupShow"
+			:show="isClubpopupShow"
+			@handleChoiceaClub="handleChoiceaClubData"
+		>
 		</cm-clubpopup>
 		<!-- 弹窗提示 -->
 		<tui-modal
@@ -104,19 +122,17 @@
 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:'',
-	leaderId:0,
-	groupId:0,
-	manager:0,
+	startAddTime: '',
+	endAddTime: '',
+	consult: '',
+	leaderId: 0,
+	groupId: 0,
+	manager: 0,
 	serviceProviderId: 0,
 	pageNum: 1,
 	pageSize: 10
-	
 }
 export default {
 	components: {
@@ -157,20 +173,26 @@ export default {
 			nomoreText: '上拉显示更多',
 			contentModalText: '', //操作文字提示语句
 			modal: false,
-			handleRemarksId:0,
-			isClubpopupShow:false,
-			isScreenDrawer:false,
+			handleRemarksId: 0,
+			isClubpopupShow: false,
+			isScreenDrawer: false
 		}
 	},
-	onLoad() {
-		
-	},
+	onLoad() {},
 	filters: {
 		NumFormat: function(value) {
 			//处理金额
 			if (!value) return '0.00'
 			let number = Number(value).toFixed(2)
 			return number
+		},
+		statusText(value) {// 订单来源
+		    const map = {
+		        1: '跟进中',
+		        2: '跟进完成',
+		        3: '已放弃',
+		    }
+		    return map[value]
 		}
 	},
 	computed: {
@@ -195,6 +217,10 @@ 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
@@ -252,7 +278,7 @@ export default {
 			this.modal = true
 			this.contentModalText = '确定删除这条记录吗?'
 		},
-		handEditRemark(remarksId){
+		handEditRemark(remarksId) {
 			//跳转修改客户咨询记录
 			this.$api.navigateTo(`/pages/seller/remarks/add?type=edit&remarksId=${remarksId}`)
 		},
@@ -260,25 +286,25 @@ export default {
 			//跳转未注册客户咨询记录也
 			this.$api.navigateTo('/pages/seller/remarks/record-list')
 		},
-		handleShowClubpopup(){ 
+		handleShowClubpopup() {
 			//显示已注册机构弹窗
 			this.isClubpopupShow = true
 		},
-		handleChoiceaClubData(data){
+		handleChoiceaClubData(data) {
 			//跳转添加记录
 			this.$api.navigateTo(`/pages/seller/remarks/add?userId=${data.userId}`)
 		},
-		handSearchConfirmData(data){
+		handSearchConfirmData(data) {
 			//确定筛选
 			this.listQuery.startAddTime = data.startAddTime
 			this.listQuery.endAddTime = data.endAddTime
 			this.listQuery.consult = data.consult
 			this.listQuery.leaderId = data.leaderId
 			this.listQuery.groupId = data.groupId
-			console.log('确定筛选',this.listQuery)
+			console.log('确定筛选', this.listQuery)
 			this.getUserClubRemarksList()
 		},
-		showScreenDrawer(){
+		showScreenDrawer() {
 			//显示筛选抽屉
 			this.isScreenDrawer = true
 		},
@@ -304,19 +330,21 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		onShowClose () {//输入框失去焦点时触发
-			if(this.listQuery.keyWord != ''){
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.listQuery.keyWord != '') {
 				this.isShowClose = true
-			}else{					
+			} else {
 				this.isShowClose = false
-				this.listQuery.pageNum=1
+				this.listQuery.pageNum = 1
 				this.getUserClubRemarksList()
 			}
 		},
-		delInputText(){//清除输入框内容
+		delInputText() {
+			//清除输入框内容
 			this.listQuery.keyWord = ''
 			this.isShowClose = false
-			this.listQuery.pageNum=1
+			this.listQuery.pageNum = 1
 			this.getUserClubRemarksList()
 		},
 		hideMobel() {
@@ -324,7 +352,8 @@ export default {
 		},
 		details(remarksId) {
 			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
-		}
+		},
+
 	},
 	onPageScroll(e) {
 		//实时获取到滚动的值
@@ -356,17 +385,17 @@ page {
 .empty-container {
 	z-index: 99;
 }
-.club-search{
+.club-search {
 	width: 100%;
 	height: 112rpx;
 	padding: 24rpx;
-	background: #FFFFFF;
+	background: #ffffff;
 	box-sizing: border-box;
 	position: fixed;
 	top: 0;
 	left: 0;
 	z-index: 982;
-	.search-screen{
+	.search-screen {
 		width: 152rpx;
 		height: 64rpx;
 		float: right;
@@ -378,19 +407,19 @@ page {
 		color: #333333;
 		text-align: center;
 		font-size: 28rpx;
-		.icon-gengduo1{
+		.icon-gengduo1 {
 			font-size: 30rpx;
 			margin-right: 10rpx;
 		}
 	}
-	.search-from{
+	.search-from {
 		width: 526rpx;
 		height: 100%;
-		background: #F7F7F7;
+		background: #f7f7f7;
 		border-radius: 32rpx;
 		float: left;
 		position: relative;
-		.input{
+		.input {
 			width: 420rpx;
 			height: 64rpx;
 			float: left;
@@ -398,7 +427,7 @@ page {
 			color: $text-color;
 			font-size: $font-size-24;
 		}
-		.icon-iconfonticonfontsousuo1{
+		.icon-iconfonticonfontsousuo1 {
 			width: 64rpx;
 			height: 64rpx;
 			line-height: 64rpx;
@@ -408,7 +437,7 @@ page {
 			float: left;
 			color: #999999;
 		}
-		.icon-shanchu1{
+		.icon-shanchu1 {
 			font-size: $font-size-32;
 			color: #999999;
 			position: absolute;
@@ -438,24 +467,32 @@ page {
 	.tui-remarks-cell {
 		width: 100%;
 		border-radius: 16rpx;
-		background: #ffffff;
 		margin-bottom: 24rpx;
 		box-sizing: border-box;
-		padding: 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%);
+		}
+		.tui-remarks-title {
 			width: 100%;
-			height: 144rpx;
-			line-height: 144rpx;
+			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-32;
 						color: #333333;
@@ -468,43 +505,73 @@ page {
 						-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: #FFFFFF;
+							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;
-					&.h{
-						padding-right: 24rpx;
-					}
-					&.y{
-						padding-left: 24rpx;
-						border-left: 1px solid #E1E1E1;
+					.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;
+						&.y {
+							text-align: right;
+						}
 					}
 				}
 			}
-		}	
-		.tui-remarks-name{
+		}
+		.tui-remarks-name {
 			width: 100%;
 			height: 48rpx;
 			line-height: 48rpx;
@@ -513,7 +580,8 @@ page {
 			text-align: left;
 			margin-bottom: 20rpx;
 			margin-top: 20rpx;
-			.tui-remarks-name-text{
+			float: left;
+			.tui-remarks-name-text {
 				height: 48rpx;
 				box-sizing: border-box;
 				text-align: left;
@@ -526,11 +594,11 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
-				&.h{
+				&.h {
 					width: 40%;
 					padding-right: 24rpx;
 				}
-				&.y{
+				&.y {
 					width: 60%;
 					padding-left: 24rpx;
 				}
@@ -539,19 +607,19 @@ page {
 		.tui-remarks-content {
 			width: 100%;
 			height: auto;
-			.tui-remarks-span{
+			.tui-remarks-span {
 				height: 48rpx;
 				line-height: 48rpx;
 				text-align: center;
 				padding: 0 20rpx;
-				background-color: #FEF6F3;
+				background-color: #fef6f3;
 				font-size: $font-size-26;
-				color: #E15616;
+				color: #e15616;
 				border-radius: 25rpx;
 				display: inline-block;
-				margin-right:24rpx;
+				margin-right: 24rpx;
 				margin-bottom: 24rpx;
-				&:nth-child(4n){
+				&:nth-child(4n) {
 					margin-right: none;
 				}
 			}
@@ -559,7 +627,7 @@ page {
 		.tui-remarks-button {
 			width: 100%;
 			height: 68rpx;
-			border-top: 1px solid #E1E1E1;
+			border-top: 1px solid #e1e1e1;
 			padding-top: 20rpx;
 			.btn {
 				width: 50%;
@@ -569,12 +637,12 @@ page {
 				font-size: $font-size-34;
 				float: left;
 				font-weight: bold;
-				&.edit{
-					color: #1890F9;
-					border-right: 1px solid #E1E1E1;
+				&.edit {
+					color: #1890f9;
+					border-right: 1px solid #e1e1e1;
 				}
-				&.del{
-					color: #F94B4B;
+				&.del {
+					color: #f94b4b;
 				}
 			}
 		}
@@ -606,12 +674,12 @@ page {
 		border-radius: 44rpx;
 		margin: 0 auto;
 	}
-	.tui-button-text{
+	.tui-button-text {
 		width: 600rpx;
 		height: 48rpx;
 		line-height: 48rpx;
 		text-align: center;
-		color: #E15616;
+		color: #e15616;
 		font-size: $font-size-26;
 		margin: 0 auto;
 		margin-top: 15rpx;

+ 325 - 314
services/user.service.js

@@ -2,148 +2,148 @@
  * 这是用户业务逻辑的服务
  */
 export default class UserService {
-	constructor(AjaxService) {
-		Object.assign(this, {
-			AjaxService
-		})
-		this.name = 'UserService'
-	}
-	/* 初始化授权登录 */
-	UserLoginAuthApplets(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/auth/applets',
-			data,
-			isLoading: false,
-
-		})
-	}
-	/* 邀请码授权登录 */
-	InvitationCodeLogin(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/auth/invitation',
-			data,
-			isLoading: true,
-			isStatus: false,
-
-		})
-	}
-	/* 个人机构注册 */
-	UserRegisterClub(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/register/club',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 供应商注册 */
-	SupplierAppletsRegistered(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/register/shop',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/**
+    constructor(AjaxService) {
+        Object.assign(this, {
+            AjaxService
+        })
+        this.name = 'UserService'
+    }
+    /* 初始化授权登录 */
+    UserLoginAuthApplets(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/auth/applets',
+            data,
+            isLoading: false,
+
+        })
+    }
+    /* 邀请码授权登录 */
+    InvitationCodeLogin(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/auth/invitation',
+            data,
+            isLoading: true,
+            isStatus: false,
+
+        })
+    }
+    /* 个人机构注册 */
+    UserRegisterClub(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/register/club',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 供应商注册 */
+    SupplierAppletsRegistered(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/register/shop',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /**
 	 * 账号登录
 	 * @param mobileOrEmail 邮箱或手机
 	 * @param password	密码
 	 * @param source 来源 PC与小程序传:'www'crm就传'crm'
 	 */
-	AorganizationLogin(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/password',
-			data,
-			isLoading: true,
-			isStatus: true,
-
-		})
-	}
-	/* 查询机构资料*/
-	OrganizationUpdateModifyInfo(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/club/info',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 协销拉机构上线(查询暂时数据)*/
-	UseRregisterTemporaryInfo(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/register/temporary/data',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 机构升级资质机构 */
-	OrganizationRegister(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/register/club/upgrade',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 机构提交资料修改 */
-	OrganizationUpdate(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/club/info/update',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 供应商资料信息-数据回显 */
-	SupplierShopInfo(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/shop/info',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 供应商修改申请信息保存 */
-	SupplierUpdateCompanyInfo(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/register/shop/apply',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 供应商资料信息-提交修改 */
-	SupplierModifiedData(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/shop/info/update',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/**
+    AorganizationLogin(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/password',
+            data,
+            isLoading: true,
+            isStatus: true,
+
+        })
+    }
+    /* 查询机构资料*/
+    OrganizationUpdateModifyInfo(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/club/info',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 协销拉机构上线(查询暂时数据)*/
+    UseRregisterTemporaryInfo(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/register/temporary/data',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 机构升级资质机构 */
+    OrganizationRegister(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/register/club/upgrade',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 机构提交资料修改 */
+    OrganizationUpdate(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/club/info/update',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 供应商资料信息-数据回显 */
+    SupplierShopInfo(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/shop/info',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 供应商修改申请信息保存 */
+    SupplierUpdateCompanyInfo(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/register/shop/apply',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 供应商资料信息-提交修改 */
+    SupplierModifiedData(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/shop/info/update',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /**
 	 *运营人员绑定微信
 	 */
-	BindingWechat(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/auth/bind',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/*个人机构取消提示*/
-	CancelPrompt(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/register/guide',
-			data,
-			isLoading: false,
-
-		})
-	}
-	/**
+    BindingWechat(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/auth/bind',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /*个人机构取消提示*/
+    CancelPrompt(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/register/guide',
+            data,
+            isLoading: false,
+
+        })
+    }
+    /**
 	 * 找回密码&修改密码
 	 * @param: mobileOrEmail	手机号或邮箱	
 	 * @param: password			密码
@@ -151,15 +151,15 @@ export default class UserService {
 	 * @param: smsCode			短信验证码
 	 * @param: status			1:手机号找回,2:邮箱找回
 	 */
-	ModifyMobilePassword(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/update/password',
-			data,
-			isLoading: true,
+    ModifyMobilePassword(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/update/password',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * 更换手机号
 	 * @param: mobile			原手机号	
 	 * @param: newMobile		新手机号
@@ -167,164 +167,164 @@ export default class UserService {
 	 * @param: newSmsCode		新手机号验证码
 	 * @param: userId			用户userId
 	 */
-	UserUpdateMobile(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/update/mobile',
-			data,
-			isLoading: true,
+    UserUpdateMobile(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/update/mobile',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * @机构-地址列表
 	 * @param:userId 用户ID(必传),
 	 * @param:pageNum 页码
 	 * @param:pageSize 每页条数
 	 */
-	QueryAddressList(data = {}) {
-		return this.AjaxService.get({
-			url: '/order/address/list',
-			data,
-			isLoading: true,
+    QueryAddressList(data = {}) {
+        return this.AjaxService.get({
+            url: '/order/address/list',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * @机构-添加&&修改地址
 	 * @param:userId 用户ID(必传),
 	 * @param:地址信息,
 	 */
-	AddressSave(data = {}) {
-		return this.AjaxService.post({
-			url: '/order/address/save',
-			data,
-			isLoading: true,
+    AddressSave(data = {}) {
+        return this.AjaxService.post({
+            url: '/order/address/save',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * @机构-删除地址
 	 * @param:userId 用户ID(必传),
 	 * @param:地址信息,
 	 */
-	DeleteAddress(data = {}) {
-		return this.AjaxService.post({
-			url: '/order/address/delete',
-			data,
-			isLoading: true,
+    DeleteAddress(data = {}) {
+        return this.AjaxService.post({
+            url: '/order/address/delete',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 * @机构-个人中心
 	 * @param:userId 用户ID(必传),
 	 */
-	PersonalInfo(data = {}) {
-		return this.AjaxService.get({
-			url: '/personalCenter/myCentre',
-			data,
-			isLoading: false,
-		})
-	}
-	/**
+    PersonalInfo(data = {}) {
+        return this.AjaxService.get({
+            url: '/personalCenter/myCentre',
+            data,
+            isLoading: false,
+        })
+    }
+    /**
 	 * @机构-获取账户余额明细
 	 * @param:userId 用户ID(必传),
 	 */
-	GetAccountInfo(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/center/balance',
-			data,
-			isLoading: true,
-		})
-	}
-	/* 运营人员管理-列表 */
-	QueryOperatorList(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/operation/list',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 运营人员管理-添加 */
-	PostAddOperator(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/operation/save',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 运营人员管理-删除 */
-	PostDeleteOperator(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/operation/delete',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/* 运营人员管理-更新邀请码 */
-	PostUpdateOperatorCode(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/operation/code/update',
-			data,
-			isLoading: true,
-
-		})
-	}
-	/**
+    GetAccountInfo(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/center/balance',
+            data,
+            isLoading: true,
+        })
+    }
+    /* 运营人员管理-列表 */
+    QueryOperatorList(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/operation/list',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 运营人员管理-添加 */
+    PostAddOperator(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/operation/save',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 运营人员管理-删除 */
+    PostDeleteOperator(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/operation/delete',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /* 运营人员管理-更新邀请码 */
+    PostUpdateOperatorCode(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/operation/code/update',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /**
 	 *@协销帮机构注册 待注册列表
 	 *@param userId	协销用户userId
 	 *@param searchName 关键词
 	 *@param pageNum 页码
 	 *@param pageSize 条数
 	 */
-	SellerUserTemporaryClub(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/seller/temporary/club',
-			data,
-			isLoading: true,
+    SellerUserTemporaryClub(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/seller/temporary/club',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@协销待注册列表 删除操作
 	 *@param ID
 	 */
-	SellerDeleteUserTemporaryClub(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/seller/delete/temporary/club',
-			data,
-			isLoading: true,
+    SellerDeleteUserTemporaryClub(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/seller/delete/temporary/club',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@获取采美豆状态 
 	 *@userId userId
 	 */
-	GetHomeObtainBeans(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/club/obtain/beans',
-			data,
-			isLoading: false,
+    GetHomeObtainBeans(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/club/obtain/beans',
+            data,
+            isLoading: false,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@获取机构个人中心
 	 *@userId userId
 	 */
-	GetClubObtainCenter(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/club/home',
-			data,
-			isLoading: false,
+    GetClubObtainCenter(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/club/home',
+            data,
+            isLoading: false,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@机构采美豆收支明细 
 	 *@param userId	机构用户userId
 	 *@param year 年份
@@ -333,53 +333,64 @@ export default class UserService {
 	 *@param pageNum 页码
 	 *@param pageSize 条数
 	 */
-	GetUserClubBeansList(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/club/beans/history',
-			data,
-			isLoading: false,
+    GetUserClubBeansList(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/club/beans/history',
+            data,
+            isLoading: false,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@机构资料备注列表 
 	 *@param clubId	机构用户clubId
 	 *@param pageNum 页码
 	 *@param pageSize 条数
 	 */
-	getUserClubRemarksList(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/club/remarks/list',
-			data,
-			isLoading: true,
+    getUserClubRemarksList(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/club/remarks/list',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@机构资料备注保存
 	 *@param clubId	机构用户clubId
 	 */
-	getUserClubRemarksSave(data = {}) {
-		return this.AjaxService.post({
-			url: '/user/club/remarks/save',
-			data,
-			isLoading: true,
+    getUserClubRemarksSave(data = {}) {
+        return this.AjaxService.post({
+            url: '/user/club/remarks/save',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
+	 *@备注关键词库联想查询
+	 *@param remarks 联想词
+	 */
+    getCmremarkslist(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/club/remarks/cmremarkslist',
+            data,
+            isLoading: false,
+        })
+    }
+    /**
 	 *@机构资料备注详情
 	 *@param remarksId	备注Id
 	 */
-	getUserClubRemarksDetail(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/club/remarks/detail',
-			data,
-			isLoading: true,
+    getUserClubRemarksDetail(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/club/remarks/detail',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@机构资料备注删除
 	 *@param remarksId	备注Id
 	 */
@@ -531,37 +542,37 @@ export default class UserService {
 	 *@会员中心
 	 *@param userId	用户Id
 	 */
-	getUserSuperCenter(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/super/center',
-			data,
-			isLoading: false,
+    getUserSuperCenter(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/super/center',
+            data,
+            isLoading: false,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@会员购买记录
 	 *@param userId	用户Id
 	 *@param pageNum	页码
 	 *@param pageSize	条数
 	 */
-	getUserSuperHistory(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/super/history',
-			data,
-			isLoading: true,
+    getUserSuperHistory(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/super/history',
+            data,
+            isLoading: true,
 
-		})
-	}
-	/**
+        })
+    }
+    /**
 	 *@超级会员套餐
 	 */
-	getUserSuperPackage(data = {}) {
-		return this.AjaxService.get({
-			url: '/user/super/package',
-			data,
-			isLoading: true,
+    getUserSuperPackage(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/super/package',
+            data,
+            isLoading: true,
 
-		})
-	}
+        })
+    }
 }