报备记录接口添加

components/cm-module/cm-seller/cm-goods-popup.vue

@@ -11,7 +11,7 @@
 							class="input"
 							type="text"
 							confirm-type="search"
-							v-model="listQuery.name"
+							v-model="listQuery.keyWord"
 							@input="onShowClose"
 							@confirm="initclubList()"
 							placeholder="搜索商品名称"
@@ -73,12 +73,9 @@ export default {
 			checkedIndex: 0,
 			isShowClose: false,
 			listQuery: {
-				userIdentity: '',
-				name: '',
+				keyWord:'',
 				pageNum: 1,
 				pageSize: 200,
-				spId: this.serviceProviderId,
-				status: 66
 			},
 			dataList: [
 				{
@@ -116,26 +113,23 @@ export default {
 		}
 	},
 	created() {
-		// this.initclubList()
+		this.userReportProductList()
 	},
 	methods: {
-		async initclubList() {
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.spId = userInfo.serviceProviderId
-			this.SellerService.GetSellerClubList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						 this.dataList = data.list.map((el,index)=>{
-							el.ischecked = false
-							return el
-						})
-					}
-					
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+		async userReportProductList() {
+			this.UserService.userReportProductList(this.listQuery)
+			.then(response => {
+				let data = response.data
+				if (data.list && data.list.length > 0) {
+					 this.dataList = data.list.map((el,index)=>{
+						el.ischecked = false
+						return el
+					})
+				}
+			})
+			.catch(error => {
+				this.$util.msg(error.msg, 2000)
+			})
 		},
 		checkedCoupon(idx) {
 			// 选择商品

components/cm-module/cm-seller/cm-report-popup.vue

@@ -4,65 +4,72 @@
 		<tui-bottom-popup :radius="true" :show="show" @close="hidePopup">
 			<view class="tui-popup-box clearfix">
 				<view class="title">选择关联报备</view>
-				<view class="title-search">
-					<view class="search-from name">
-						<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-						<input
-							class="input"
-							type="text"
-							confirm-type="search"
-							v-model="listQuery.name"
-							@input="onShowClose"
-							@confirm="initclubList()"
-							placeholder="搜索商品名称  / 报备关键词"
-							maxlength="16"
-						/>
-						<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+				<template v-if="dataList.length > 0">
+					<view class="title-search">
+						<view class="search-from name">
+							<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+							<input
+								class="input"
+								type="text"
+								confirm-type="search"
+								v-model="listQuery.keyWord"
+								@input="onShowClose"
+								@confirm="initclubList()"
+								placeholder="搜索商品名称 / 报备关键词"
+								maxlength="16"
+							/>
+							<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+						</view>
 					</view>
-				</view>
-				<view class="tui-popup-main coupon">
-					<scroll-view class="tui-popup-scroll" scroll-y="true">
-						<view
-							v-for="(remark, index) in dataList"
-							:key="index"
-							class="list clearfix"
-							@click.stop="checkedCoupon(index)"
-						>
+					<view class="tui-popup-main coupon">
+						<scroll-view class="tui-popup-scroll" scroll-y="true">
 							<view
-								class="list-cell-icon"
-								:class="{
-									reviewed: remark.type == 1,
-									failed: remark.type == 2,
-									approved: remark.type == 3
-								}"
+								v-for="(remark, index) in dataList"
+								:key="index"
+								class="list clearfix"
+								@click.stop="checkedCoupon(index)"
 							>
-							</view>
-							<view class="list-cell-title">
-								<view class="list-cell-h1">{{ remark.clubName }}</view>
-								<view class="list-cell-p"> {{ remark.addDate }} </view>
-							</view>
-							<view class="list-cell-content clearfix">
-								<view class="tui-remarks-goods" v-if="remark.product">
-									<view class="goods-image">
-										<image :src="remark.product.images" mode=""></image>
-									</view>
-									<view class="goods-main">
-										<view class="name"> {{ remark.product.name }} </view>
-										<view class="shop">{{ remark.reportText }}</view>
-									</view>
+								<view
+									class="list-cell-icon"
+									:class="{
+										reviewed: remark.type == 1,
+										failed: remark.type == 2,
+										approved: remark.type == 3
+									}"
+								>
+								</view>
+								<view class="list-cell-title">
+									<view class="list-cell-h1">{{ remark.clubName }}</view>
+									<view class="list-cell-p"> {{ remark.addDate }} </view>
 								</view>
-								<view class="tui-remarks-text" v-else> {{ remark.reportText }} </view>
-								<view class="list-cell-btn">
-									<view
-										class="checkbox iconfont"
-										:class="[remark.ischecked ? 'icon-yixuanze' : 'icon-weixuanze']"
-									>
+								<view class="list-cell-content clearfix">
+									<view class="tui-remarks-goods" v-if="remark.product">
+										<view class="goods-image">
+											<image :src="remark.product.images" mode=""></image>
+										</view>
+										<view class="goods-main">
+											<view class="name"> {{ remark.product.name }} </view>
+											<view class="shop">{{ remark.reportText }}</view>
+										</view>
+									</view>
+									<view class="tui-remarks-text" v-else> {{ remark.reportText }} </view>
+									<view class="list-cell-btn">
+										<view
+											class="checkbox iconfont"
+											:class="[remark.ischecked ? 'icon-yixuanze' : 'icon-weixuanze']"
+										>
+										</view>
 									</view>
 								</view>
 							</view>
-						</view>
-					</scroll-view>
-				</view>
+						</scroll-view>
+					</view>
+				</template>
+				<template v-else>
+					<view class="tui-remarks-empty">
+						暂无任何数据，请新建报备~
+					</view>
+				</template>
 				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 					<view class="tui-flex-1"> <view class="tui-button" @click="hidePopup">确定</view> </view>
 					<view class="tui-flex-1">
@@ -84,6 +91,10 @@ export default {
 		},
 		popupType:{
 			type:Number,
+		},
+		reportInfo:{
+			type:Object,
+			default: {}
 		}
 	},
 	data() {
@@ -92,12 +103,11 @@ export default {
 			checkedIndex: 0,
 			isShowClose: false,
 			listQuery: {
-				userIdentity: '',
-				name: '',
+				keyWord: '',
 				pageNum: 1,
 				pageSize: 200,
-				spId: this.serviceProviderId,
-				status: 66
+				clubId: 0,
+				serviceProviderId: 0
 			},
 			dataList: [
 				{
@@ -174,26 +184,26 @@ export default {
 		}
 	},
 	created() {
-		console.log('22222222',this.popupType)
-		// this.initclubList()
+		this.listQuery.clubId = this.reportInfo.clubId
+		this.userClubReportList()
 	},
 	methods: {
-		async initclubList() {
+		async userClubReportList() {
 			const userInfo = await this.$api.getStorage()
-			this.listQuery.spId = userInfo.serviceProviderId
-			this.SellerService.GetSellerClubList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.dataList = data.list.map((el, index) => {
-							el.ischecked = false
-							return el
-						})
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId
+			this.UserService.userClubReportList(this.listQuery)
+			.then(response => {
+				let data = response.data
+				if (data.list && data.list.length > 0) {
+					 this.dataList = data.list.map((el,index)=>{
+						el.ischecked = false
+						return el
+					})
+				}
+			})
+			.catch(error => {
+				this.$util.msg(error.msg, 2000)
+			})
 		},
 		checkedCoupon(idx) {
 			// 选择商品
@@ -209,7 +219,7 @@ export default {
 		handleAddReport(){
 			// 跳转新建报备
 			this.$parent.isReportpopup = false
-			this.$api.navigateTo(`/pages/seller/remarks/report-add?type=${this.popupType}`)
+			this.$api.navigateTo(`/pages/seller/remarks/report-add?type=${this.popupType}&reportInfo=${JSON.stringify(this.reportInfo)}`)
 		},
 		onShowClose() {
 			//输入框失去焦点时触发
@@ -295,6 +305,14 @@ export default {
 		box-sizing: border-box;
 		padding: 0 24rpx;
 	}
+	.tui-remarks-empty{
+		width: 100%;
+		height: 400rpx;
+		line-height: 400rpx;
+		font-size: 26rpx;
+		color: #999999;
+		text-align: center;
+	}
 	.title-search {
 		width: 100%;
 		height: 66rpx;

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

@@ -108,15 +108,17 @@
 								</picker>
 							</view>
 						</view>
-						<view class="drawer-main-name">新增分配机构：</view>
-						<view class="drawer-main-radiov">
-							<view class="drawer-main-radio">
-								<picker @change="bindPickerChange(5,$event)" :value="index" :range="clubActions" range-key="name">
-									<input class="input" type="text" disabled="false" v-model="clubStateText" value="" placeholder="请选择"/>
-									<text class="iconfont icon-xiangyou"></text>
-								</picker>
+						<template v-if="popupType === 1">
+							<view class="drawer-main-name">新增分配机构：</view>
+							<view class="drawer-main-radiov">
+								<view class="drawer-main-radio">
+									<picker @change="bindPickerChange(5,$event)" :value="index" :range="clubActions" range-key="name">
+										<input class="input" type="text" disabled="false" v-model="clubStateText" value="" placeholder="请选择"/>
+										<text class="iconfont icon-xiangyou"></text>
+									</picker>
+								</view>
 							</view>
-						</view>
+						</template>
 					</view>
 				</scroll-view>
 				<view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
@@ -135,7 +137,10 @@ export default {
 		rightDrawer: {
 			type: Boolean,
 			default: false
-		}
+		},
+		popupType:{
+			type:Number,
+		},
 	},
 	data() {
 		const currentDate = this.getDate({
@@ -331,11 +336,11 @@ export default {
 					break
 				case 4:			
 					this.reportText = this.reportActions[e.target.value].name
-					this.queryData.followup = this.reportActions[e.target.value].value
+					this.queryData.status = this.reportActions[e.target.value].value
 					break
 				case 5:			
 					this.clubStateText = this.clubActions[e.target.value].name
-					this.queryData.followup = this.clubActions[e.target.value].value
+					this.queryData.newDeal = this.clubActions[e.target.value].value
 					break
 			}
 		},

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

@@ -1,78 +1,120 @@
 <template>
 	<view class="container user clearfix">
-		<cm-custom :navbar-data='nvabarData'></cm-custom>
+		<cm-custom :navbar-data="nvabarData"></cm-custom>
 		<view class="user-section">
-			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
+			<view
+				class="header"
+				:style="{
+					height: CustomBar + 90 - StatusBar + 'px',
+					paddingTop: CustomBar + 'px',
+					background: 'url(' + bgImgUrl + ')',
+					backgroundSize: 'cover'
+				}"
+			>
 				<view class="header-main" v-if="hasLogin">
 					<view class="header-text">
 						<view class="user-item">
-							<text class="u-h1">{{name}}</text>
-						</view>
-						<view class="user-item">
-							<text class="u-tips">协销人员</text>
+							<text class="u-h1">{{ name }}</text>
 						</view>
+						<view class="user-item"> <text class="u-tips">协销人员</text> </view>
 					</view>
-					<view class="header-icon" @click="TestZHIboFn()"><image src="https://static.caimei365.com/app/img/icon/icon-seller@3x.png" mode=""></image></view>
+					<view class="header-icon" @click="TestZHIboFn()"
+						><image src="https://static.caimei365.com/app/img/icon/icon-seller@3x.png" mode=""></image
+					></view>
 				</view>
 				<!-- 订单 -->
 				<view class="user-order">
 					<view class="tab-title" @click="navigator('/pages/seller/order/order-list?listType=0')">
-						<text class="cell-tit">我的订单</text>
-						<text class="cell-more">全部订单</text>
+						<text class="cell-tit">我的订单</text> <text class="cell-more">全部订单</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<view class="order-section">
-						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
+						<view
+							class="order-item"
+							@click="navigator('/pages/seller/order/order-list?listType=1')"
+							hover-class="common-hover"
+							:hover-stay-time="50"
+						>
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
-								<text 	v-if="beforeConfirmCount>0" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[beforeConfirmCount < 10 ? 'goleft':'']">
-										{{beforeConfirmCount >= 99? '99+' : beforeConfirmCount}}
+								<text
+									v-if="beforeConfirmCount > 0"
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+									:class="[beforeConfirmCount < 10 ? 'goleft' : '']"
+								>
+									{{ beforeConfirmCount >= 99 ? '99+' : beforeConfirmCount }}
 								</text>
 							</view>
 							<text class="order-t">待确认</text>
 						</view>
-						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
+						<view
+							class="order-item"
+							@click="navigator('/pages/seller/order/order-list?listType=2')"
+							hover-class="common-hover"
+							:hover-stay-time="50"
+						>
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
-								<text  v-if="beforePayCount >0" 
-									   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
-									   :class="[beforePayCount < 10 ? 'goleft':'']">
-									   {{beforePayCount >= 99? '99+' : beforePayCount}}
+								<text
+									v-if="beforePayCount > 0"
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num "
+									:class="[beforePayCount < 10 ? 'goleft' : '']"
+								>
+									{{ beforePayCount >= 99 ? '99+' : beforePayCount }}
 								</text>
 							</view>
 							<text class="order-t">待付款</text>
 						</view>
-						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
+						<view
+							class="order-item"
+							@click="navigator('/pages/seller/order/order-list?listType=3')"
+							hover-class="common-hover"
+							:hover-stay-time="50"
+						>
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order2@3x.png" mode=""></image>
-								<text   v-if="beforeShipCount >0" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[beforeShipCount < 10 ? 'goleft':'']">
-										{{beforeShipCount >= 99? '99+' : beforeShipCount}}
+								<text
+									v-if="beforeShipCount > 0"
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+									:class="[beforeShipCount < 10 ? 'goleft' : '']"
+							>
+										{{ beforeShipCount >= 99 ? '99+' : beforeShipCount }}
 								</text>
 							</view>
 							<text class="order-t">待发货</text>
 						</view>
-						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
+						<view
+							class="order-item"
+							@click="navigator('/pages/seller/order/order-list?listType=4')"
+							hover-class="common-hover"
+							:hover-stay-time="50"
+						>
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order3@3x.png" mode=""></image>
-								<text 	v-if="shippedCount>0" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[shippedCount < 10 ? 'goleft':'']">
-										{{shippedCount >= 99? '99+' : shippedCount}}
+								<text
+									v-if="shippedCount > 0"
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+									:class="[shippedCount < 10 ? 'goleft' : '']"
+								>
+									{{ shippedCount >= 99 ? '99+' : shippedCount }}
 								</text>
 							</view>
 							<text class="order-t">已发货</text>
 						</view>
-						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
+						<view
+							class="order-item"
+							@click="navigator('/pages/seller/order/order-list?listType=5')"
+							hover-class="common-hover"
+							:hover-stay-time="50"
+						>
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order4@3x.png" mode=""></image>
-								<text 	v-if="refundsCount >0"
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[refundsCount < 10 ? 'goleft':'']">
-										{{refundsCount >= 99 ? '99+' : refundsCount}}
+								<text
+									v-if="refundsCount > 0"
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+									:class="[refundsCount < 10 ? 'goleft' : '']"
+								>
+									{{ refundsCount >= 99 ? '99+' : refundsCount }}
 								</text>
 							</view>
 							<text class="order-t">退货/款</text>
@@ -89,551 +131,576 @@
 					</view>
 				</view> -->
 				<view class="list-cell-item">
-					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
+					<view
+						class="list-cell"
+						v-for="(item, index) in firstList"
+						:key="index"
+						@click="navigator(item.path)"
+						hover-class="cell-hover"
+						:hover-stay-time="50"
+					>
 						<view class="cell-icon">
 							<image class="cell-icon-image" :src="item.icon" mode=""></image>
 						</view>
-						<text class="cell-tit">{{item.name}}</text>
-						<text 	v-if="index == 1 && orderNum >0"
-								class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
-								{{orderNum == 99 ? '99+' : orderNum}}
+						<text class="cell-tit">{{ item.name }}</text>
+						<text
+							v-if="index == 1 && orderNum > 0"
+							class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+						>
+							{{ orderNum == 99 ? '99+' : orderNum }}
 						</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
 				</view>
 				<view class="list-cell-item">
-					<view class="list-cell"  v-for="(item, index) in twoList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
+					<view
+						class="list-cell"
+						v-for="(item, index) in twoList"
+						:key="index"
+						@click="navigator(item.path)"
+						hover-class="cell-hover"
+						:hover-stay-time="50"
+					>
 						<view class="cell-icon">
 							<image class="cell-icon-image" :src="item.icon" mode=""></image>
 						</view>
-						<text class="cell-tit">{{item.name}}</text>
+						<text class="cell-tit">{{ item.name }}</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
 				</view>
 			</view>
-		</view>	
+		</view>
 	</view>
 </template>
 <script>
-	import authorize from '@/common/config/authorize.js'
-	import uniBadge from '@/components/uni-badge/uni-badge.vue'
-	import { mapState,mapMutations } from 'vuex'
-	
-	export default{
-		components: {
-			uniBadge,
-		},
-		data() {
-			return{	
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '账户中心', // 导航栏 中间的标题
-					haveBack:false,
-					textLeft:this.$store.state.isIphone,
-					textColor:'#FFFFFF',
-					bgColor:''
+import authorize from '@/common/config/authorize.js'
+import uniBadge from '@/components/uni-badge/uni-badge.vue'
+import { mapState, mapMutations } from 'vuex'
+
+export default {
+	components: {
+		uniBadge
+	},
+	data() {
+		return {
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+				showSearch: 0,
+				title: '账户中心', // 导航栏 中间的标题
+				haveBack: false,
+				textLeft: this.$store.state.isIphone,
+				textColor: '#FFFFFF',
+				bgColor: ''
+			},
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			StatusBar: this.StatusBar,
+			bgImgUrl: 'https://static.caimei365.com/app/img/bg/home_cumres@2x.png',
+			name: '',
+			headpic: '',
+			userId: '',
+			serviceProviderId: '',
+			skeletonShow: true,
+			orderNum: 0, //未查看订单数量
+			beforeConfirmCount: 0, //待确认角标
+			beforePayCount: 0, //待付款角标
+			beforeShipCount: 0, //待发货角标
+			shippedCount: 0, //已发货角标
+			refundsCount: '', //退货/款角标
+			institutionsCont: 120,
+			firstList: [
+				{
+					name: '待注册机构',
+					path: '/pages/seller/club/stayClub-list',
+					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png'
 				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				StatusBar: this.StatusBar,
-				bgImgUrl:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
-				name:'',
-				headpic:'',
-				userId:'',
-                serviceProviderId: '',
-				skeletonShow:true,
-				orderNum:0,//未查看订单数量
-				beforeConfirmCount:0,//待确认角标
-				beforePayCount:0, 	//待付款角标
-				beforeShipCount:0, //待发货角标
-				shippedCount:0,   //已发货角标
-				refundsCount:'', //退货/款角标
-				institutionsCont:120,
-				firstList:[
-					{
-						name:'待注册机构',
-						path:'/pages/seller/club/stayClub-list',
-						icon:'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png',
-					},
-					{
-						name:'机构列表',
-						path:'/pages/seller/club/list',
-						icon:'https://static.caimei365.com/app/img/icon/icon_seller_2@2x.png',
-					},
-					{
-						name:'拉机构上线',
-						path:'/pages/seller/login/register-select',
-						icon:'https://static.caimei365.com/app/img/icon/icon_seller_3@2x.png',
-					},
-					{
-						name:'邀请运营人员',
-						path:'/pages/seller/club/allClub-list',
-						icon:'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png',
-					}
-				],
-				twoList:[
-					{
-						name:'帮机构下单',
-						path:'/pages/seller/club/club-list',
-						icon:'https://static.caimei365.com/app/img/icon/icon_seller_5@2x.png',
-					},
-					{
-						name:'发布二手商品',
-						path:'/pages/second/form/form-select',
-						icon:'https://static.caimei365.com/app/img/icon/icon_seller_6@2x.png',
-					},
-					{
-						name:'客户咨询记录',
-						path:'/pages/seller/remarks/list',
-						icon:'https://static.caimei365.com/app/img/icon/icon_seller_7@2x.png',
-					}
-				]
-			}
-		},
-		created() {
-			this.initData()
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
+				{
+					name: '机构列表',
+					path: '/pages/seller/club/list',
+					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_2@2x.png'
+				},
+				{
+					name: '拉机构上线',
+					path: '/pages/seller/login/register-select',
+					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_3@2x.png'
+				},
+				{
+					name: '邀请运营人员',
+					path: '/pages/seller/club/allClub-list',
+					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png'
+				}
+			],
+			twoList: [
+				{
+					name: '帮机构下单',
+					path: '/pages/seller/club/club-list',
+					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_5@2x.png'
+				},
+				{
+					name: '发布二手商品',
+					path: '/pages/second/form/form-select',
+					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_6@2x.png'
+				},
+				{
+					name: '客户咨询记录',
+					path: '/pages/seller/remarks/list',
+					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_7@2x.png'
+				}
+			]
+		}
+	},
+	created() {
+		this.initData()
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login', 'logout']),
+		async initData() {
+			const wechatCode = await authorize.getCode('weixin') // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+			const getUserInfo = await authorize.getUserInfo('weixin')
+			const params = { code: wechatCode, encryptedData: getUserInfo.encryptedData, iv: getUserInfo.iv }
+			this.UserService.UserLoginAuthApplets(params).then(response => {
+				if (response.code == 0 || response.code == 4) {
+					this.isLogin = true
+					this.userID = response.data.userId
+					this.userIdentity = response.data.userIdentity
+					this.clubStatus = response.data.clubStatus
+					this.serviceProviderId = response.data.serviceProviderId
+					this.$store.commit('updateStatus', response.data)
+					this.login(response.data)
+					uni.setStorageSync('token', response.data.token)
+					uni.setStorageSync('unionId', response.data.unionId)
+					this.getUserSellerHome()
+					this.getOrderCount()
+				} else {
+					this.isLogin = false
+					this.logout()
+					uni.setStorageSync('unionId', response.data.unionId)
+					this.$store.commit('updateStatus', response.data)
+					this.$api.navigateTo('/pages/seller/login/login')
+				}
+			})
 		},
-		methods:{
-			...mapMutations(['login','logout']),
-			async initData(){
-				const wechatCode = await authorize.getCode('weixin')// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-				const getUserInfo = await authorize.getUserInfo('weixin')
-				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
-				this.UserService.UserLoginAuthApplets(params).then(response =>{
-					if(response.code == 0 || response.code == 4){
-						this.isLogin = true
-						this.userID = response.data.userId						
-						this.userIdentity = response.data.userIdentity						
-						this.clubStatus = response.data.clubStatus
-                        this.serviceProviderId = response.data.serviceProviderId
-						this.$store.commit('updateStatus',response.data)
-						this.login(response.data)
-						uni.setStorageSync('token',response.data.token)
-						uni.setStorageSync('unionId',response.data.unionId)
-						this.getUserSellerHome()
-                        this.getOrderCount()
-					}else{
-						this.isLogin = false
-						this.logout()
-						uni.setStorageSync('unionId',response.data.unionId)
-						this.$store.commit('updateStatus',response.data)
-						this.$api.navigateTo('/pages/seller/login/login')
-					}
-				})
-			},	
-			getUserSellerHome(){
-				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userId ? resolve.userId : 0
-					this.SellerService.GetSellerHome({userId:this.userId}).then(response =>{
+		getUserSellerHome() {
+			this.$api.getStorage().then(resolve => {
+				this.userId = resolve.userId ? resolve.userId : 0
+				this.SellerService.GetSellerHome({ userId: this.userId })
+					.then(response => {
 						let sellerData = response.data
-						this.name = sellerData.linkMan ?sellerData.linkMan : '' 	//协销名称
+						this.name = sellerData.linkMan ? sellerData.linkMan : '' //协销名称
 						this.headpic = sellerData.logo //会所头像
 						this.skeletonShow = false
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
 					})
-				})	
-			},
-            getOrderCount(){
-                this.SellerService.GetOrderCount({serviceProviderId: this.serviceProviderId}).then(response=>{
-                    let data = response.data
-                    this.beforeConfirmCount = this.showBadge(data.confirmedCount)//待确认
-                    this.beforePayCount = this.showBadge(data.paymentCount)//待付款
-                    this.beforeShipCount = this.showBadge(data.waitShipmentsCount)//待发货		
-                    this.shippedCount = this.showBadge(data.shipmentsCount)//已发货	
-                    this.refundsCount = this.showBadge(data.salesReturnCount)//退货/款	
-                    this.orderNum = this.showBadge(data.uncheckedOrderCount)//未查看订单数量
-                })
-            },
-			TestZHIboFn(){//测试跳转直播小程序
-				// uni.navigateToMiniProgram({
-				// 	appId: 'wx92d650b253f8f2e3',
-				// 	path: '/pages/index/index',
-				// 	extraData: {
-				// 		'data1': 'test'
-				// 	},
-				// 	envVersion: 'develop',
-				// 	success(res) {
-				// 		// 打开成功
-				// 		console.log(res)
-				// 	}
-				// })
-			},
-			navigator(url){
-				this.$api.navigateTo(url)
-			},			
-			showBadge(n){
-				let num =''
-				if(n>100){num = 99}else{num = n}
-				return num
-			},
-			onPullDownRefresh() {//下拉刷新
-				this.initData()
-				uni.stopPullDownRefresh()
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		getOrderCount() {
+			this.SellerService.GetOrderCount({ serviceProviderId: this.serviceProviderId }).then(response => {
+				let data = response.data
+				this.beforeConfirmCount = this.showBadge(data.confirmedCount) //待确认
+				this.beforePayCount = this.showBadge(data.paymentCount) //待付款
+				this.beforeShipCount = this.showBadge(data.waitShipmentsCount) //待发货
+				this.shippedCount = this.showBadge(data.shipmentsCount) //已发货
+				this.refundsCount = this.showBadge(data.salesReturnCount) //退货/款
+				this.orderNum = this.showBadge(data.uncheckedOrderCount) //未查看订单数量
+			})
+		},
+		TestZHIboFn() {
+			//测试跳转直播小程序
+			// uni.navigateToMiniProgram({
+			// 	appId: 'wx92d650b253f8f2e3',
+			// 	path: '/pages/index/index',
+			// 	extraData: {
+			// 		'data1': 'test'
+			// 	},
+			// 	envVersion: 'develop',
+			// 	success(res) {
+			// 		// 打开成功
+			// 		console.log(res)
+			// 	}
+			// })
+		},
+		navigator(url) {
+			this.$api.navigateTo(url)
+		},
+		showBadge(n) {
+			let num = ''
+			if (n > 100) {
+				num = 99
+			} else {
+				num = n
 			}
+			return num
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+			this.initData()
+			uni.stopPullDownRefresh()
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7;
-	}
-	.user{
-		width: 100%;
-		height: 100%;
-		position:relative;
-		background: rgba(247, 247, 247, 1);
-	}	
-	.header{
-		width: 100%;
-		position: relative;
-		background-size: cover;
-	}	
-	.header-main{
-		width: 702rpx;
-		height: 130rpx;
-		padding: 12rpx 24rpx;
+@import '@/uni.scss';
+page {
+	background-color: #f7f7f7;
+}
+.user {
+	width: 100%;
+	height: 100%;
+	position: relative;
+	background: rgba(247, 247, 247, 1);
+}
+.header {
+	width: 100%;
+	position: relative;
+	background-size: cover;
+}
+.header-main {
+	width: 702rpx;
+	height: 130rpx;
+	padding: 12rpx 24rpx;
+	display: flex;
+	.header-text {
+		flex: 8;
 		display: flex;
-		.header-text{
-			flex: 8;
-			display: flex;
-			flex-direction: column;
-			.user-item{
-				flex: 1;
-				height: 64rpx;
+		flex-direction: column;
+		.user-item {
+			flex: 1;
+			height: 64rpx;
+			line-height: 64rpx;
+			.u-tips {
+				display: inline-block;
+				float: left;
+				width: 98rpx;
+				height: 30rpx;
+				border: 1px solid #ffffff;
+				background: linear-gradient(128deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
+				border-radius: 16rpx;
+				line-height: 30rpx;
+				font-size: $font-size-20;
+				text-align: center;
+				color: #ffffff;
+				margin-left: 10rpx;
+			}
+			.u-viptips {
+				display: inline-block;
+				float: left;
+				width: 98rpx;
+				height: 30rpx;
+				border: 1px solid #ffe600;
+				background: linear-gradient(128deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
+				border-radius: 16rpx;
+				line-height: 30rpx;
+				font-size: $font-size-20;
+				text-align: center;
+				color: #ffe600;
+				margin-left: 10rpx;
+				margin-top: 17rpx;
+			}
+			.u-h1 {
+				float: left;
+				font-size: $font-size-36;
+				color: #ffffff;
+				text-align: left;
+				-o-text-overflow: ellipsis;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				word-break: break-all;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+			}
+			.u-p {
+				font-size: $font-size-24;
 				line-height: 64rpx;
-				.u-tips{
-					display: inline-block;
-					float: left;
-					width: 98rpx;
-					height: 30rpx;
-					border: 1px solid #FFFFFF;
-					background: linear-gradient(128deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-					border-radius: 16rpx;
-					line-height: 30rpx;
-					font-size: $font-size-20;
-					text-align: center;
-					color: #FFFFFF;
-					margin-left: 10rpx;
-				}
-				.u-viptips{
-					display: inline-block;
-					float: left;
-					width: 98rpx;
-					height: 30rpx;
-					border: 1px solid #FFE600;
-					background: linear-gradient(128deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-					border-radius: 16rpx;
-					line-height: 30rpx;
-					font-size: $font-size-20;
-					text-align: center;
-					color: #FFE600;
-					margin-left: 10rpx;
-					margin-top: 17rpx;
-				}
-				.u-h1{
-					float: left;
-					font-size: $font-size-36;
-					color: #FFFFFF;
-					text-align: left;
-					-o-text-overflow: ellipsis;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 1;
-					overflow: hidden;
-				}
-				.u-p{
-					font-size: $font-size-24;
-					line-height: 64rpx;
-					color: #FFFFFF;
-					text-align: left;
-				}
+				color: #ffffff;
+				text-align: left;
 			}
 		}
-		.header-icon{
-			flex: 2;
-			margin-right: 20rpx;
-			image{
-				float: right;
-				width: 128rpx;
-				height: 128rpx;
-				border-radius: 100%;
-				border: 2rpx solid #FFFFFF;
-			}
+	}
+	.header-icon {
+		flex: 2;
+		margin-right: 20rpx;
+		image {
+			float: right;
+			width: 128rpx;
+			height: 128rpx;
+			border-radius: 100%;
+			border: 2rpx solid #ffffff;
 		}
 	}
-	.header-main-none{
-		width: 702rpx;
-		height: 152rpx;
-		padding: 0 24rpx;
+}
+.header-main-none {
+	width: 702rpx;
+	height: 152rpx;
+	padding: 0 24rpx;
+	display: flex;
+	.header-text {
+		flex: 8;
 		display: flex;
-		.header-text{
-			flex: 8;
-			display: flex;
-			flex-direction: column;
-			.user-item{
-				flex: 1;
-				height: 50rpx;
+		flex-direction: column;
+		.user-item {
+			flex: 1;
+			height: 50rpx;
+			line-height: 50rpx;
+			.line {
+				margin: 0 10rpx;
+			}
+			.u-h1 {
+				float: left;
+				font-size: $font-size-36;
+				color: #ffffff;
+				text-align: left;
+				-o-text-overflow: ellipsis;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				word-break: break-all;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+			}
+			.u-p {
+				font-size: $font-size-24;
 				line-height: 50rpx;
-				.line{
-					margin: 0 10rpx;
-				}
-				.u-h1{
-					float: left;
-					font-size: $font-size-36;
-					color: #FFFFFF;
-					text-align: left;
-					-o-text-overflow: ellipsis;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 1;
-					overflow: hidden;
-				}
-				.u-p{
-					font-size: $font-size-24;
-					line-height: 50rpx;
-					color: #EFEFEF;
-					text-align: left;
-				}
-				.u-btn{
-					width: 160rpx;
-					height: 40rpx;
-					background: rgba(255,255,255,.5);
-					border-radius: 5rpx;
-					line-height: 40rpx;
-					text-align: center;
+				color: #efefef;
+				text-align: left;
+			}
+			.u-btn {
+				width: 160rpx;
+				height: 40rpx;
+				background: rgba(255, 255, 255, 0.5);
+				border-radius: 5rpx;
+				line-height: 40rpx;
+				text-align: center;
+				font-size: $font-size-24;
+				color: #ffffff;
+				display: block;
+				margin-top: 5rpx;
+				padding-left: 6rpx;
+				.icon-xiangyouhuabeifen {
 					font-size: $font-size-24;
-					color: #FFFFFF;
-					display: block;
-					margin-top: 5rpx;
-					padding-left: 6rpx;
-					.icon-xiangyouhuabeifen{
-						font-size: $font-size-24;
-					}
 				}
 			}
 		}
-		.header-icon{
-			flex: 2;
-			display: flex;
-			margin-right: 20rpx;
-			align-items: center;
-			justify-content: center;
-			image{
-				float: right;
-				width: 128rpx;
-				height: 128rpx;
-				border-radius: 100%;
-				border: 2rpx solid #FFFFFF;
-			}
+	}
+	.header-icon {
+		flex: 2;
+		display: flex;
+		margin-right: 20rpx;
+		align-items: center;
+		justify-content: center;
+		image {
+			float: right;
+			width: 128rpx;
+			height: 128rpx;
+			border-radius: 100%;
+			border: 2rpx solid #ffffff;
 		}
 	}
-	.user-order{
-		width: 654rpx;
-		height: auto;
-		padding: 0 24rpx;
-		background-color: $bg-color;
-		margin-bottom: 24rpx;
-		position: absolute;
-		bottom: -170rpx;
-		left: 24rpx;
-		border-radius: 20rpx;
-	}	
-	.tab-title{
+}
+.user-order {
+	width: 654rpx;
+	height: auto;
+	padding: 0 24rpx;
+	background-color: $bg-color;
+	margin-bottom: 24rpx;
+	position: absolute;
+	bottom: -170rpx;
+	left: 24rpx;
+	border-radius: 20rpx;
+}
+.tab-title {
+	font-size: $font-size-28;
+	line-height: 80rpx;
+	color: #333333;
+	text-align: left;
+	border-bottom: 1px solid #f8f8f8;
+	position: relative;
+	.cell-tit {
 		font-size: $font-size-28;
+		color: $text-color;
+	}
+	.cell-more {
+		float: right;
 		line-height: 80rpx;
-		color: #333333;
-		text-align:left;
-		border-bottom: 1px solid #F8F8F8;
-		position: relative;
-		.cell-tit{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-		.cell-more{
-			float: right;
-			line-height: 80rpx;
-			font-size: $font-size-24;
-			color: #666666;
-			padding-right: 30rpx;
-		}
-		.iconfont{
-			width: 30rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			position: absolute;
-			right: 0;
-			top: 0;
-			display: block;
-			font-size: $font-size-28;
-		}
+		font-size: $font-size-24;
+		color: #666666;
+		padding-right: 30rpx;
 	}
-	.order-section{
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		flex-wrap:wrap;
-		height: 99rpx;
-		padding: 24rpx 0;
+	.iconfont {
+		width: 30rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		position: absolute;
+		right: 0;
+		top: 0;
+		display: block;
+		font-size: $font-size-28;
 	}
-	.order-item{
-		flex:1;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
+}
+.order-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	height: 99rpx;
+	padding: 24rpx 0;
+}
+.order-item {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	position: relative;
+	&:last-child {
+		margin-right: 0;
+	}
+	.order-icon {
+		width: 52rpx;
+		height: 52rpx;
 		position: relative;
-		&:last-child{
-			margin-right: 0;
-		}
-		.order-icon{
+		image {
 			width: 52rpx;
 			height: 52rpx;
-			position: relative;
-			image{
-				width: 52rpx;
-				height: 52rpx;
-			}
-			.icon-num{
-				position: absolute;
-				right:-24rpx;
-				top: -9rpx;
-			}
-			.icon-num.goleft{
-				right: -12rpx;
-			}
 		}
-		.order-t{
-			line-height: 50rpx;
-			font-size: $font-size-24;
-			color: $text-color;
+		.icon-num {
+			position: absolute;
+			right: -24rpx;
+			top: -9rpx;
+		}
+		.icon-num.goleft {
+			right: -12rpx;
 		}
 	}
-	.foot-list{
-		width: 702rpx;
-		padding: 0 24rpx;
-		padding-top: 168rpx;
-	}	
-	.list-cell-image{
+	.order-t {
+		line-height: 50rpx;
+		font-size: $font-size-24;
+		color: $text-color;
+	}
+}
+.foot-list {
+	width: 702rpx;
+	padding: 0 24rpx;
+	padding-top: 168rpx;
+}
+.list-cell-image {
+	width: 100%;
+	height: 168rpx;
+	background: url(https://static.caimei365.com/app/meibohui/app/activity-small-banner@2x.png);
+	background-size: cover;
+	box-sizing: border-box;
+	margin-bottom: 24rpx;
+	.text {
 		width: 100%;
-		height: 168rpx;
-		background: url(https://static.caimei365.com/app/meibohui/app/activity-small-banner@2x.png);
-		background-size: cover;
+		height: 100%;
 		box-sizing: border-box;
-		margin-bottom: 24rpx;
-		.text{
-			width: 100%;
-			height: 100%;
-			box-sizing: border-box;
-			padding:38rpx 56rpx;
-			.h1{
-				line-height: 50rpx;
-				font-size: $font-size-36;
-				color: #FFFFFF;
-			}
-			.p{
-				line-height: 34rpx;
-				font-size: $font-size-30;
-				color: #FFFFFF;
-			}
+		padding: 38rpx 56rpx;
+		.h1 {
+			line-height: 50rpx;
+			font-size: $font-size-36;
+			color: #ffffff;
+		}
+		.p {
+			line-height: 34rpx;
+			font-size: $font-size-30;
+			color: #ffffff;
 		}
 	}
-	.list-cell-item{
-		width: 654rpx;
-		height: auto;
-		margin-bottom: 24rpx;
-		padding:0 24rpx;
-		background: $bg-color;
-		border-radius: 20rpx;
+}
+.list-cell-item {
+	width: 654rpx;
+	height: auto;
+	margin-bottom: 24rpx;
+	padding: 0 24rpx;
+	background: $bg-color;
+	border-radius: 20rpx;
+}
+.list-cell {
+	width: 100%;
+	line-height: 100rpx;
+	position: relative;
+	background: $bg-color;
+	border-bottom: 1px solid #ebebeb;
+	height: 100rpx;
+	&:last-child {
+		border-bottom: none;
 	}
-	.list-cell{
-		width: 100%;
-		line-height:100rpx;
-		position:relative;
-		background: $bg-color;
-		border-bottom: 1px solid #EBEBEB;
+	&.cell-hover {
+		background: #fafafa;
+	}
+	.cell-icon {
+		width: 60rpx;
 		height: 100rpx;
-		&:last-child{
-			border-bottom: none;
-		}
-		&.cell-hover{
-			background:#fafafa;
-		}
-		.cell-icon{
-			width: 60rpx;
-			height: 100rpx;
-			text-align: center;
-			box-sizing: border-box;
-			padding: 32rpx 12rpx;
-			float: left;
-			.cell-icon-image{
-				width: 36rpx;
-				height: 36rpx;
-				display: block;
-			}
-		}
-		.cell-more{
-			width: 60rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: right;
-			position: absolute;
-			right: 0;
-			top: 0;
-			font-size:$font-size-28;
-			color:#666666;
-			.txt{
-				color: #FB4343;
-				padding-right: 10rpx;
-			}
-		}
-		.cell-tit{
-			width: 465rpx;
+		text-align: center;
+		box-sizing: border-box;
+		padding: 32rpx 12rpx;
+		float: left;
+		.cell-icon-image {
+			width: 36rpx;
+			height: 36rpx;
 			display: block;
-			float: left;
-			font-size: $font-size-28;
-			color: #666666;
-			margin-right:10rpx;
-		}
-		.cell-tip{
-			font-size: $font-size-28;
-			color: $text-color;
 		}
-	}	
-	.list-cell.last{
-		border-bottom: none;
 	}
-	.uni-badge--small {
-		-webkit-transform: scale(.8);
-		-ms-transform: scale(.8);
-		transform: scale(.8);
-		-webkit-transform-origin: center center;
-		-ms-transform-origin: center center;
-		transform-origin: center center;
+	.cell-more {
+		width: 60rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: right;
+		position: absolute;
+		right: 0;
+		top: 0;
+		font-size: $font-size-28;
+		color: #666666;
+		.txt {
+			color: #fb4343;
+			padding-right: 10rpx;
+		}
 	}
-	.uni-badge {
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		font-size: 12px;
-		line-height: 1;
-		display: inline-block;
-		padding: 3px 6px;
-		color: #333;
-		border-radius: 100px;
-		background-color: #f1f1f1;
+	.cell-tit {
+		width: 465rpx;
+		display: block;
+		float: left;
+		font-size: $font-size-28;
+		color: #666666;
+		margin-right: 10rpx;
 	}
-	.uni-badge-error {
-		color: #fff;
-		background-color: #dd524d;
+	.cell-tip {
+		font-size: $font-size-28;
+		color: $text-color;
 	}
+}
+.list-cell.last {
+	border-bottom: none;
+}
+.uni-badge--small {
+	-webkit-transform: scale(0.8);
+	-ms-transform: scale(0.8);
+	transform: scale(0.8);
+	-webkit-transform-origin: center center;
+	-ms-transform-origin: center center;
+	transform-origin: center center;
+}
+.uni-badge {
+	font-family: 'Helvetica Neue', Helvetica, sans-serif;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	font-size: 12px;
+	line-height: 1;
+	display: inline-block;
+	padding: 3px 6px;
+	color: #333;
+	border-radius: 100px;
+	background-color: #f1f1f1;
+}
+.uni-badge-error {
+	color: #fff;
+	background-color: #dd524d;
+}
 </style>

pages/seller/club/list.vue

@@ -59,6 +59,7 @@
 								{{ club.userIdentity === 2 ? club.name : club.linkMan }}
 								<text class="tags" v-if="club.vipFlag == 0 && club.userIdentity === 2 ">VIP</text>
 								<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
+								<text class="tags xf">新分配</text>
 							</view>
 							<view class="list-ntel">
 								<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
@@ -472,19 +473,25 @@ page,
 				color: #333333;
 				.tags {
 					display: inline-block;
-					width: 60rpx;
-					height: 32rpx;
+					height: 36rpx;
+					box-sizing: border-box;
+					padding: 0 15rpx;
 					border-radius: 8rpx;
 					background: #f0cb72;
 					font-size: $font-size-22;
 					color: #4e4539;
 					text-align: center;
-					line-height: 32rpx;
+					line-height: 36rpx;
 					margin-left: 20rpx;
+					margin-top: 7rpx;
 					&.sv {
 						background: #333333;
 						color: #f0cb72;
 					}
+					&.xf {
+						background-color: #F94B4B;
+						color: #ffffff;
+					}
 				}
 			}
 			.list-ntel {

pages/seller/remarks/add-record.vue

@@ -228,6 +228,7 @@
 			v-if="isReportpopup"
 			:show="isReportpopup"
 			:popupType ="2"
+			:reportInfo="reportInfo"
 			@handleChoiceaReport="handleChoiceaReportData"
 		>
 		</cm-reportpopup>
@@ -271,7 +272,6 @@ export default {
 			handleType:'',
 			questionMan:'',
 			clubUserId:0,
-			clubInfo:{},
 			userInfo:{},
 			checkedCategorysList:[],
 			categorys:[],
@@ -301,7 +301,11 @@ export default {
 			assActionList: [],
 			isGoodspopup:false,
 			isReportpopup:false,
-			handleGoods: []
+			handleGoods: [],
+			reportInfo:{
+				questionMan:'',
+				questionManId:0
+			}
 		}
 	},
 	onLoad(option) {
@@ -314,6 +318,8 @@ export default {
 		} else {
 			this.questionMan = option.questionMan
 			this.remarksParams.questionManId = option.questionManId
+			this.reportInfo.questionMan = option.questionMan
+			this.reportInfo.questionManId = option.questionManId
 			this.initGetStotage(option)
 			this.getUserClubConsults()
 		}
@@ -331,6 +337,8 @@ export default {
 			})
 			.then(response => {
 				let data = response.data
+				this.reportInfo.questionMan = data.questionMan
+				this.reportInfo.questionManId = data.questionManId
 				this.questionMan = data.questionMan
 				this.remarksList = data.remarks.map((el, index) => {
 					el.isAssociation = false
@@ -508,12 +516,12 @@ export default {
 		handleChoiceaGoodsData(data) {
 			console.log('data', data)
 			this.handleGoods = []
+			this.remarksParams.productId = data.productId
 			this.handleGoods.push(data)
 		},
 		handleChoiceaReportData(data) {
 			console.log('data', data)
-			this.handleGoods = []
-			this.handleGoods.push(data)
+			this.remarksParams.reportId = data.reportId
 		},
 		contains(arr, val) {// 校验
 			return arr.some(item => item === val)

pages/seller/remarks/add.vue

@@ -255,6 +255,7 @@
 			v-if="isReportpopup"
 			:show="isReportpopup"
 			:popupType ="1"
+			:reportInfo="reportInfo"
 			@handleChoiceaReport="handleChoiceaReportData"
 		>
 		</cm-reportpopup>
@@ -294,6 +295,8 @@ export default {
 				pinceSensitve:0,//价格敏感度
 				satisfied:0,// 意向程度
 				followup:0,// 跟进状态
+				productId:0,// 商品Id
+				reportId:0, // 报备Id
 			},
 			min: 0,
 			max: 200,
@@ -330,7 +333,13 @@ export default {
 			assActionList: [],
 			isGoodspopup:false,
 			isReportpopup:false,
-			handleGoods: []
+			handleGoods: [],
+			reportInfo:{
+				clubId:0,
+				name:'',
+				linkMan:''
+			}
+			
 		}
 	},
 	onLoad(option) {
@@ -354,7 +363,9 @@ export default {
 				.then(response => {
 					this.clubInfo = response.data.club
 					this.userInfo = response.data.user
-					this.remarksParams.clubId = this.clubInfo.clubId
+					this.reportInfo.name = this.clubInfo.name
+					this.reportInfo.linkMan = this.clubInfo.linkMan
+					this.remarksParams.clubId = this.reportInfo.clubId = this.clubInfo.clubId
 					if (this.handleType != 'edit') {
 						this.remarksParams.questionMan = this.clubInfo.linkMan
 					}
@@ -555,12 +566,12 @@ export default {
 		handleChoiceaGoodsData(data) {
 			console.log('data', data)
 			this.handleGoods = []
+			this.remarksParams.productId = data.productId
 			this.handleGoods.push(data)
 		},
 		handleChoiceaReportData(data) {
 			console.log('data', data)
-			this.handleGoods = []
-			this.handleGoods.push(data)
+			this.remarksParams.reportId = data.reportId
 		},
 		contains(arr, val) {
 			// 校验

pages/seller/remarks/list.vue

@@ -46,7 +46,9 @@
 				>
 					<view class="tui-remarks-title">
 						<view class="tui-remarks-title-top">
-							<view class="tui-remarks-time tt"><text class="tags">新分配</text>{{ remark.clubName }}</view>
+							<view class="tui-remarks-time tt"
+								><text class="tags">新分配</text>{{ remark.clubName }}</view
+							>
 							<view class="tui-remarks-time sm" v-if="remark.followup">
 								<text
 									:class="{
@@ -84,11 +86,9 @@
 					</view>
 					<view class="tui-remarks-name none" v-if="remark.satisfied">
 						<view class="tui-remarks-name-text h">
-							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text> 
-						</view>
-						<view class="tui-remarks-name-text y">
-							报备状态：<text>审核通过</text> 
+							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text>
 						</view>
+						<view class="tui-remarks-name-text y"> 报备状态：<text>审核通过</text> </view>
 					</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
@@ -120,7 +120,12 @@
 			</view>
 		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
-		<cm-screenDrawer ref="screendrawer" :rightDrawer="isScreenDrawer" @handSearchConfirm="handSearchConfirmData">
+		<cm-screenDrawer
+			ref="screendrawer"
+			:popupType="1"
+			:rightDrawer="isScreenDrawer"
+			@handSearchConfirm="handSearchConfirmData"
+		>
 		</cm-screenDrawer>
 		<!-- 添加记录 -->
 		<cm-clubpopup
@@ -160,6 +165,8 @@ const defaultListQuery = {
 	leaderId: 0,
 	groupId: 0,
 	manager: 0,
+	newDeal: 0, // 新增分配机构
+	status: 0, // 报备状态
 	serviceProviderId: 0,
 	pageNum: 1,
 	pageSize: 10
@@ -346,7 +353,8 @@ export default {
 			this.listQuery.pinceSensitve = data.pinceSensitve
 			this.listQuery.satisfied = data.satisfied
 			this.listQuery.followup = data.followup
-			
+			this.listQuery.newDeal = data.newDeal
+			this.listQuery.status = data.status
 			this.getUserClubRemarksList()
 		},
 		showScreenDrawer() {
@@ -398,7 +406,7 @@ export default {
 		details(remarksId) {
 			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
 		},
-		handlerGoReportList(){
+		handlerGoReportList() {
 			this.$api.navigateTo(`/pages/seller/remarks/report-list`)
 		}
 	},
@@ -432,10 +440,10 @@ page {
 .empty-container {
 	z-index: 99;
 }
-.container-fiexd-top{
+.container-fiexd-top {
 	width: 100%;
 	height: 208rpx;
-	background: #F5F5F5;
+	background: #f5f5f5;
 	box-sizing: border-box;
 	position: fixed;
 	top: 0;
@@ -503,23 +511,23 @@ page {
 			}
 		}
 	}
-	.fiexd-top-title{
+	.fiexd-top-title {
 		width: 100%;
 		height: 96rpx;
 		box-sizing: border-box;
 		padding: 24rpx;
-		.top-left{
+		.top-left {
 			float: left;
 			line-height: 48rpx;
 			font-size: 26rpx;
 			color: #666666;
-			text{
+			text {
 				color: #e15616;
 			}
 		}
-		.top-right{
+		.top-right {
 			float: right;
-			.top-right-btn{
+			.top-right-btn {
 				height: 48rpx;
 				padding: 0 20rpx;
 				box-sizing: border-box;
@@ -587,13 +595,13 @@ page {
 						line-clamp: 1;
 						-webkit-box-orient: vertical;
 						font-weight: bold;
-						.tags{
+						.tags {
 							display: inline-block;
 							padding: 0 10rpx;
 							border-radius: 8rpx;
 							line-height: 36rpx;
 							font-size: 22rpx;
-							background-color: #F94B4B;
+							background-color: #f94b4b;
 							color: #ffffff;
 							text-align: center;
 							float: left;
@@ -606,7 +614,7 @@ page {
 						width: 40%;
 						font-size: $font-size-26;
 						color: #999999;
-						text-align: right;					
+						text-align: right;
 						.orange {
 							display: inline-block;
 							padding: 0 15rpx;
@@ -698,8 +706,8 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
-				.red{
-					color: #F94B4B;
+				.red {
+					color: #f94b4b;
 				}
 				&.a {
 					width: 100%;

pages/seller/remarks/record-list.vue

@@ -120,8 +120,9 @@
 		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
 		<cm-screenDrawer ref="screendrawer"
-						 :rightDrawer="isScreenDrawer"
-						 @handSearchConfirm="handSearchConfirmData">
+						:popupType="2"
+						:rightDrawer="isScreenDrawer"
+						@handSearchConfirm="handSearchConfirmData">
 		</cm-screenDrawer>
 		</cm-clubpopup>
 		<!-- 咨询人列表弹窗 -->

pages/seller/remarks/relation-consult-list.vue

@@ -10,7 +10,7 @@
 						confirm-type="search"
 						v-model="listQuery.keyWord"
 						@input="onShowClose"
-						@confirm="getUserClubRemarksList"
+						@confirm="userClubReportAssociatedList"
 						placeholder="搜索关键词 / 咨询人 / 机构名称"
 						maxlength="16"
 					/>
@@ -76,11 +76,9 @@
 					</view>
 					<view class="tui-remarks-name none" v-if="remark.satisfied">
 						<view class="tui-remarks-name-text h">
-							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text> 
-						</view>
-						<view class="tui-remarks-name-text y">
-							报备状态：<text>审核通过</text> 
+							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text>
 						</view>
+						<view class="tui-remarks-name-text y"> 报备状态：<text>审核通过</text> </view>
 					</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
@@ -111,7 +109,12 @@
 			</view>
 		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
-		<cm-screenDrawer ref="screendrawer" :rightDrawer="isScreenDrawer" @handSearchConfirm="handSearchConfirmData">
+		<cm-screenDrawer
+			ref="screendrawer"
+			:popupType="1"
+			:rightDrawer="isScreenDrawer"
+			@handSearchConfirm="handSearchConfirmData"
+		>
 		</cm-screenDrawer>
 		<!-- 添加记录 -->
 		<cm-clubpopup
@@ -142,16 +145,7 @@ import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
-	startAddTime: '',
-	endAddTime: '',
-	consult: '',
-	pinceSensitve: 0, //价格敏感度
-	satisfied: 0, // 意向程度
-	followup: 0, // 跟进状态
-	leaderId: 0,
-	groupId: 0,
-	manager: 0,
-	serviceProviderId: 0,
+	reportId: 0,
 	pageNum: 1,
 	pageSize: 10
 }
@@ -240,12 +234,12 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 			this.listQuery.manager = userInfo.manager ? userInfo.manager : 0
-			this.getUserClubRemarksList()
+			this.userClubReportAssociatedList()
 		},
-		getUserClubRemarksList() {
+		userClubReportAssociatedList() {
 			this.remarksList = []
 			this.listQuery.pageNum = 1
-			this.UserService.getUserClubRemarksList(this.listQuery)
+			this.UserService.userClubReportAssociatedList(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
@@ -281,7 +275,7 @@ export default {
 		GetOnReachBottomData(index) {
 			//上拉加载
 			this.listQuery.pageNum += 1
-			this.UserService.getUserClubRemarksList(this.listQuery)
+			this.UserService.userClubReportAssociatedList(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
@@ -337,8 +331,9 @@ export default {
 			this.listQuery.pinceSensitve = data.pinceSensitve
 			this.listQuery.satisfied = data.satisfied
 			this.listQuery.followup = data.followup
-			
-			this.getUserClubRemarksList()
+			this.listQuery.newDeal = data.newDeal
+			this.listQuery.status = data.status
+			this.userClubReportAssociatedList()
 		},
 		showScreenDrawer() {
 			//显示筛选抽屉
@@ -359,7 +354,7 @@ export default {
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
 					setTimeout(() => {
-						this.getUserClubRemarksList()
+						this.userClubReportAssociatedList()
 					}, 2000)
 				})
 				.catch(error => {
@@ -373,7 +368,7 @@ export default {
 			} else {
 				this.isShowClose = false
 				this.listQuery.pageNum = 1
-				this.getUserClubRemarksList()
+				this.userClubReportAssociatedList()
 			}
 		},
 		delInputText() {
@@ -381,7 +376,7 @@ export default {
 			this.listQuery.keyWord = ''
 			this.isShowClose = false
 			this.listQuery.pageNum = 1
-			this.getUserClubRemarksList()
+			this.userClubReportAssociatedList()
 		},
 		hideMobel() {
 			this.modal = false
@@ -420,10 +415,10 @@ page {
 .empty-container {
 	z-index: 99;
 }
-.container-fiexd-top{
+.container-fiexd-top {
 	width: 100%;
 	height: 112rpx;
-	background: #F5F5F5;
+	background: #f5f5f5;
 	box-sizing: border-box;
 	position: fixed;
 	top: 0;
@@ -546,13 +541,13 @@ page {
 						line-clamp: 1;
 						-webkit-box-orient: vertical;
 						font-weight: bold;
-						.tags{
+						.tags {
 							display: inline-block;
 							padding: 0 10rpx;
 							border-radius: 8rpx;
 							line-height: 36rpx;
 							font-size: 22rpx;
-							background-color: #F94B4B;
+							background-color: #f94b4b;
 							color: #ffffff;
 							text-align: center;
 							float: left;
@@ -565,7 +560,7 @@ page {
 						width: 40%;
 						font-size: $font-size-26;
 						color: #999999;
-						text-align: right;					
+						text-align: right;
 						.orange {
 							display: inline-block;
 							padding: 0 15rpx;
@@ -657,8 +652,8 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
-				.red{
-					color: #F94B4B;
+				.red {
+					color: #f94b4b;
 				}
 				&.a {
 					width: 100%;
@@ -699,7 +694,7 @@ page {
 			border-top: 1px solid #e1e1e1;
 			padding-top: 20rpx;
 			.btn {
-				width:100%;
+				width: 100%;
 				line-height: 48rpx;
 				box-sizing: border-box;
 				text-align: center;

pages/seller/remarks/relation-visitor-list.vue

@@ -10,7 +10,7 @@
 						confirm-type="search"
 						v-model="listQuery.keyWord"
 						@input="onShowClose"
-						@confirm="getUserClubRemarksList"
+						@confirm="userReportVisitorAssociatedList"
 						placeholder="搜索关键词 / 咨询人 / 机构名称"
 						maxlength="16"
 					/>
@@ -39,24 +39,31 @@
 					<view class="tui-remarks-title">
 						<view class="tui-remarks-title-bot">
 							<view class="tui-remarks-text-view">
-								<view class="tui-remarks-text h"><text class="iconfont icon-bianji"></text>记录人：{{ remark.recordName }}</view>
+								<view class="tui-remarks-text 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}">
+									<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 : '' }}
+									<text class="iconfont icon-guanliyuan"></text>管理员：{{
+										remark.leaderName ? remark.leaderName : ''
+									}}
 								</view>
-								<view class="tui-remarks-text y">
-									{{ remark.addDate }}
-								</view
-								>
+								<view class="tui-remarks-text y"> {{ remark.addDate }} </view>
 							</view>
 						</view>
-					</view> 
+					</view>
 					<view class="tui-remarks-name">
 						<view class="tui-remarks-name-text h">
 							咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
@@ -67,11 +74,9 @@
 					</view>
 					<view class="tui-remarks-name none" v-if="remark.satisfied">
 						<view class="tui-remarks-name-text h">
-							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text> 
-						</view>
-						<view class="tui-remarks-name-text y">
-							报备状态：<text>审核通过</text> 
+							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text>
 						</view>
+						<view class="tui-remarks-name-text y"> 报备状态：<text>审核通过</text> </view>
 					</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
@@ -102,7 +107,12 @@
 			</view>
 		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
-		<cm-screenDrawer ref="screendrawer" :rightDrawer="isScreenDrawer" @handSearchConfirm="handSearchConfirmData">
+		<cm-screenDrawer
+			ref="screendrawer"
+			:popupType="2"
+			:rightDrawer="isScreenDrawer"
+			@handSearchConfirm="handSearchConfirmData"
+		>
 		</cm-screenDrawer>
 		<!-- 添加记录 -->
 		<cm-clubpopup
@@ -133,16 +143,8 @@ import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
-	startAddTime: '',
-	endAddTime: '',
-	consult: '',
-	pinceSensitve: 0, //价格敏感度
-	satisfied: 0, // 意向程度
-	followup: 0, // 跟进状态
-	leaderId: 0,
-	groupId: 0,
-	manager: 0,
-	serviceProviderId: 0,
+	reportId: 0,
+	keyWord: '',
 	pageNum: 1,
 	pageSize: 10
 }
@@ -231,12 +233,12 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 			this.listQuery.manager = userInfo.manager ? userInfo.manager : 0
-			this.getUserClubRemarksList()
+			this.userReportVisitorAssociatedList()
 		},
-		getUserClubRemarksList() {
+		userReportVisitorAssociatedList() {
 			this.remarksList = []
 			this.listQuery.pageNum = 1
-			this.UserService.getUserClubRemarksList(this.listQuery)
+			this.UserService.userReportVisitorAssociatedList(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
@@ -272,7 +274,7 @@ export default {
 		GetOnReachBottomData(index) {
 			//上拉加载
 			this.listQuery.pageNum += 1
-			this.UserService.getUserClubRemarksList(this.listQuery)
+			this.UserService.userReportVisitorAssociatedList(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
@@ -328,8 +330,9 @@ export default {
 			this.listQuery.pinceSensitve = data.pinceSensitve
 			this.listQuery.satisfied = data.satisfied
 			this.listQuery.followup = data.followup
-			
-			this.getUserClubRemarksList()
+			this.listQuery.newDeal = data.newDeal
+			this.listQuery.status = data.status
+			this.userReportVisitorAssociatedList()
 		},
 		showScreenDrawer() {
 			//显示筛选抽屉
@@ -350,7 +353,7 @@ export default {
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
 					setTimeout(() => {
-						this.getUserClubRemarksList()
+						this.userReportVisitorAssociatedList()
 					}, 2000)
 				})
 				.catch(error => {
@@ -364,7 +367,7 @@ export default {
 			} else {
 				this.isShowClose = false
 				this.listQuery.pageNum = 1
-				this.getUserClubRemarksList()
+				this.userReportVisitorAssociatedList()
 			}
 		},
 		delInputText() {
@@ -372,7 +375,7 @@ export default {
 			this.listQuery.keyWord = ''
 			this.isShowClose = false
 			this.listQuery.pageNum = 1
-			this.getUserClubRemarksList()
+			this.userReportVisitorAssociatedList()
 		},
 		hideMobel() {
 			this.modal = false
@@ -411,10 +414,10 @@ page {
 .empty-container {
 	z-index: 99;
 }
-.container-fiexd-top{
+.container-fiexd-top {
 	width: 100%;
 	height: 112rpx;
-	background: #F5F5F5;
+	background: #f5f5f5;
 	box-sizing: border-box;
 	position: fixed;
 	top: 0;
@@ -537,13 +540,13 @@ page {
 						line-clamp: 1;
 						-webkit-box-orient: vertical;
 						font-weight: bold;
-						.tags{
+						.tags {
 							display: inline-block;
 							padding: 0 10rpx;
 							border-radius: 8rpx;
 							line-height: 36rpx;
 							font-size: 22rpx;
-							background-color: #F94B4B;
+							background-color: #f94b4b;
 							color: #ffffff;
 							text-align: center;
 							float: left;
@@ -556,7 +559,7 @@ page {
 						width: 40%;
 						font-size: $font-size-26;
 						color: #999999;
-						text-align: right;					
+						text-align: right;
 						.orange {
 							display: inline-block;
 							padding: 0 15rpx;
@@ -616,34 +619,34 @@ page {
 						}
 						&.y {
 							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: #ffffff;
 								text-align: center;
 							}
 						}
@@ -678,8 +681,8 @@ page {
 				-webkit-line-clamp: 1;
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
-				.red{
-					color: #F94B4B;
+				.red {
+					color: #f94b4b;
 				}
 				&.a {
 					width: 100%;
@@ -720,7 +723,7 @@ page {
 			border-top: 1px solid #e1e1e1;
 			padding-top: 20rpx;
 			.btn {
-				width:100%;
+				width: 100%;
 				line-height: 48rpx;
 				box-sizing: border-box;
 				text-align: center;

pages/seller/remarks/report-add.vue

@@ -1,17 +1,30 @@
 <template>
 	<view class="container qualifications" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
-		<view class="remarks-content">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="remarks-content" v-else>
 			<template v-if="handleType === '1'">
 				<view class="list-view-title">
-					<view class="list-view-h1">机构名称:<text class="none">蔡欣欣夕是大街上的按键上的</text></view>
+					<view class="list-view-h1"
+						>机构名称:<text class="none">{{ reportInfo.name }}</text></view
+					>
 				</view>
 				<view class="list-view-title">
-					<view class="list-view-h1">联系人:<text class="none">欧特是</text></view>
+					<view class="list-view-h1"
+						>联系人:<text class="none">{{ reportInfo.linkMan }}</text></view
+					>
 				</view>
 			</template>
 			<template v-else>
 				<view class="list-view-title">
-					<view class="list-view-h1">咨询人：<text class="none">阿萨德对方水电费</text></view>
+					<view class="list-view-h1"
+						>咨询人：<text class="none">{{ reportInfo.questionMan }}</text></view
+					>
 				</view>
 			</template>
 			<view class="list-view-title"> <view class="list-view-h1">报备商品：</view> </view>
@@ -29,7 +42,7 @@
 						</view>
 					</view>
 					<view class="tui-remarks-btn">
-						<view class="btn delete" @click="handleClean">删除</view> 
+						<view class="btn delete" @click="handleClean">删除</view>
 						<view class="btn update" @click="handleShowGoodPopup">更换</view>
 					</view>
 				</view>
@@ -40,15 +53,19 @@
 			<view class="remarks-textarea">
 				<textarea
 					class="textarea"
-					v-model="remarksParams.extra"
+					v-model="reportText"
 					value=""
 					placeholder="请输入其他需要说明的内容"
 					maxlength="200"
+					@blur="handleReportText($event)"
 					@input="conInput"
 				/>
 				<text class="limit-text">{{ min }}/{{ max }}</text>
 			</view>
 		</view>
+		<view class="remarks-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+			<view class="edit-button" @click="editButtonConfim">确定</view>
+		</view>
 		<!-- 商品列表弹窗 -->
 		<cm-goodspopup
 			ref="cmgoodspopup"
@@ -74,45 +91,89 @@ export default {
 			isIphoneX: this.$store.state.isIphoneX,
 			min: 0,
 			max: 200,
+			reportText: '',
+			skeletonShow: true,
 			isGoodspopup: false,
 			handleGoods: [],
-			handleType:'',// 1 机构添加报备 2 未注册客户添加报备
-			remarksParams: {},
-			remarksId: 0
+			handleType: '', // 1 机构添加报备 2 未注册客户添加报备
+			reportClubParams: {
+				serviceProviderId: 0,
+				clubId: 0,
+				productId: 0,
+				reportText: ''
+			},
+			reportParams: {
+				serviceProviderId: 0,
+				productId: 0,
+				reportText: ''
+			},
+			remarksId: 0,
+			reportInfo: {}
 		}
 	},
 	onLoad(option) {
 		console.log(option)
 		this.remarksId = option.remarksId
 		this.handleType = option.type
-		this.getUserRemarksVisitDetail()
+		this.reportInfo = JSON.parse(option.reportInfo)
+		if (this.handleType === 1) {
+			// 机构新增报备
+			this.reportClubParams.clubId = reportInfo.clubId
+		} else {
+		}
+		this.initStorage()
+		this.skeletonShow = false
 	},
 	methods: {
 		...mapMutations(['login']),
-		getUserRemarksVisitDetail() {
-			//资料详情
-			this.UserService.getUserRemarksVisitDetail({
-				remarksId: this.remarksId
-			})
+		async initStorage() {
+			const userInfo = await this.$api.getStorage()
+			this.reportClubParams.serviceProviderId = this.reportParams.serviceProviderId = userInfo.serviceProviderId
+		},
+		editButtonConfim(){// 确定提交保存
+			switch(this.handleType){
+				case 1: // 机构报备保存
+					userClubReportSave()
+					break
+				case 2: // 咨询人报备保存
+					userClubReportSave()
+					break
+			}
+		},
+		userClubReportSave(){// 机构报备保存
+			this.UserService.userClubReportSave(this.remarksParams)
 				.then(response => {
-					this.remarksParams = response.data
+					this.$util.msg('保存成功', 3000, true, 'success')
+					this.isConfirmLoding = false
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1
+						})
+					}, 1000)
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
+					this.isConfirmLoding = false
 				})
 		},
 		handleShowGoodPopup() {
 			// 显示添加商品弹窗
 			this.isGoodspopup = true
 		},
-		handleClean(){//删除选择的商品
+		handleClean() {
+			//删除选择的商品
 			this.handleGoods = []
 		},
 		handleChoiceaGoodsData(data) {
 			console.log('data', data)
 			this.handleGoods = []
+			this.reportClubParams.productId = this.reportParams.productId = data.productId
 			this.handleGoods.push(data)
 		},
+		handleReportText(e) {
+			let value = e.detail.value
+			this.reportClubParams.reportText = this.reportParams.reportText = value
+		},
 		conInput(e) {
 			//备注文字字数限制
 			let value = e.detail.value
@@ -152,7 +213,7 @@ page {
 			font-weight: bold;
 			text {
 				color: #ff2a2a;
-				&.none{
+				&.none {
 					color: #999999;
 					font-weight: normal;
 				}
@@ -336,4 +397,32 @@ page {
 		}
 	}
 }
+.remarks-btn {
+	width: 100%;
+	padding-top: 20rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	background-color: #ffffff;
+	z-index: 99;
+	.edit-button-canel {
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		color: #e15616;
+		font-size: $font-size-24;
+	}
+	.edit-button {
+		width: 600rpx;
+		height: 90rpx;
+		background: $btn-confirm;
+		line-height: 90rpx;
+		text-align: center;
+		color: #ffffff;
+		font-size: $font-size-30;
+		margin: 0 auto;
+		border-radius: 45rpx;
+	}
+}
 </style>

pages/seller/remarks/report-details.vue

@@ -3,16 +3,16 @@
 		<view class="remarks-content">
 			<view class="list-view-title">
 				<view class="list-view-h1"
-					>机构名称:<text>{{ remarksParams.questionMan }}</text></view
+					>机构名称:<text>{{ reportParams.questionMan }}</text></view
 				>
 			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"
-					>联系人:<text>{{ remarksParams.questionMan }}</text></view
+					>联系人:<text>{{ reportParams.questionMan }}</text></view
 				>
 			</view>
 			<view class="list-view-title">
-				<view class="list-view-h1">咨询人：{{ remarksParams.questionMan }}</view>
+				<view class="list-view-h1">咨询人：{{ reportParams.questionMan }}</view>
 			</view>
 			<view class="list-view-title"> <view class="list-view-h1">报备时间：2020-08-08</view> </view>
 			<view class="list-view-title"> <view class="list-view-h1">报备商品：</view> </view>
@@ -54,15 +54,15 @@ export default {
 		return {
 			isIphoneX: this.$store.state.isIphoneX,
 			productActions: [],
-			remarksParams: {},
-			remarksId: 0,
+			reportParams: {},
+			reportId: 0,
 			categorys: '产品，二手，耗材'
 		}
 	},
 	onLoad(option) {
 		console.log(option)
-		this.remarksId = option.remarksId
-		this.getUserRemarksVisitDetail()
+		this.reportId = option.reportId
+		this.userReportDetails(this.reportId)
 	},
 	filters: {
 		followupFilters(value) {
@@ -97,13 +97,13 @@ export default {
 	},
 	methods: {
 		...mapMutations(['login']),
-		getUserRemarksVisitDetail() {
-			//资料详情
-			this.UserService.getUserRemarksVisitDetail({
-				remarksId: this.remarksId
+		userReportDetails(reportId) {
+			//报备详情
+			this.UserService.userReportDetails({
+				reportId: reportId
 			})
 				.then(response => {
-					this.remarksParams = response.data
+					this.reportParams = response.data
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)

pages/seller/remarks/report-list.vue

@@ -10,7 +10,7 @@
 						confirm-type="search"
 						v-model="listQuery.keyWord"
 						@input="onShowClose"
-						@confirm="getUserClubVisitorRecordlist"
+						@confirm="userClubReportReportRemarks"
 						placeholder="搜索商品名称 / 报备关键词"
 						maxlength="16"
 					/>
@@ -29,51 +29,51 @@
 					<!-- 列表 -->
 					<view
 						class="tui-remarks-cell  tui-mtop clearfix"
-						v-for="(remark, index) in remarksList"
+						v-for="(report, index) in reportList"
 						:key="index"
-						@click.stop="details(remark.remarksId)"
+						@click.stop="details(report.reportId)"
 					>
 						<view class="tui-remarks-title">
 							<view class="tui-remarks-title-top">
-								<view class="tui-remarks-time tt"><text class="tags">新分配</text>{{ remark.clubName }}</view>
+								<view class="tui-remarks-time tt"><text class="tags">新分配</text>{{ report.clubName }}</view>
 							</view>
 							<view class="tui-remarks-title-bot">
 								<view class="tui-remarks-text-view">
-									<view class="tui-remarks-text h"></text>报备人：{{ remark.recordName }}</view>
+									<view class="tui-remarks-text h"></text>报备人：{{ report.recordName }}</view>
 									<view class="tui-remarks-text y">
-										{{ remark.addDate }}
+										{{ report.addDate }}
 									</view>
 								</view>
 							</view>
 							<view class="tui-remarks-title-icon" :class="{
-										reviewed: remark.type == 1,
-										failed: remark.type == 2,
-										approved: remark.type == 3
+										reviewed: report.type == 1,
+										failed: report.type == 2,
+										approved: report.type == 3
 									}">
 							</view>
 						</view> 
 						<view class="tui-remarks-content">
-							<view class="tui-remarks-goods" v-if="remark.product">
+							<view class="tui-remarks-goods" v-if="report.product">
 								<view class="goods-image">
 									<image
-										:src="remark.product.images"
+										:src="report.product.images"
 										mode=""
 									></image>
 								</view>
 								<view class="goods-main">
 									<view class="name">
-										{{ remark.product.name }}
+										{{ report.product.name }}
 									</view>
-									<view class="shop">{{ remark.reportText }}</view>
+									<view class="shop">{{ report.reportText }}</view>
 								</view>
 							</view>
 							<view class="tui-remarks-text" v-else>
-								{{ remark.reportText }}
+								{{ report.reportText }}
 							</view>
 						</view>
 						<view class="tui-remarks-button">
-							<view class="btn edit" @click.stop="handReportDetails(remark.remarksId)">查看关联咨询记录</view>
-							<view class="btn del" @click.stop="deleteRemark(remark.remarksId)">删除</view>
+							<view class="btn edit" @click.stop="handReportDetails(report.reportId)">查看关联咨询记录</view>
+							<view class="btn del" @click.stop="deleteRemark(report.reportId)">删除</view>
 						</view>
 					</view>
 					<!--加载loadding-->
@@ -105,14 +105,7 @@ import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
 import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 const defaultListQuery = {
-	startAddTime:'',
-	endAddTime:'',
-	consult:'',
-	pinceSensitve: 0, //价格敏感度
-	satisfied: 0, // 意向程度
-	followup: 0, // 跟进状态
-	leaderId:0,
-	groupId:0,
+	keyWord:'',
 	manager:0,
 	serviceProviderId: 0,
 	pageNum: 1,
@@ -147,7 +140,7 @@ export default {
 			popupShow: true,
 			popupShow1: false,
 			listQuery: Object.assign({}, defaultListQuery),
-			remarksList: [
+			reportList: [
 				{
 					clubName:'采美信息技术有限公司',
 					recordName:'吴小研',
@@ -205,22 +198,19 @@ export default {
 		async init() {
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-			// const VisitorInfo = await this.$api.getComStorage('VisitorInfo')
-			// this.questionMan = VisitorInfo.questionMan
-			// this.listQuery.questionManId = VisitorInfo.questionManId
-			// this.getUserClubVisitorRecordlist()
+			this.userClubReportReportRemarks()
 		},
-		getUserClubVisitorRecordlist() {
-			this.remarksList = []
+		userClubReportReportRemarks() {
+			this.reportList = []
 			this.listQuery.pageNum = 1
-			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+			this.UserService.userClubReportReportRemarks(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
 						this.isEmpty = false
 						this.hasNextPage = data.hasNextPage
 						this.totalRecord = data.totalRecord
-						this.remarksList = data.results
+						this.reportList = data.results
 						this.pullFlag = false
 						setTimeout(() => {
 							this.pullFlag = true
@@ -229,7 +219,7 @@ export default {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
 						} else {
-							if (this.remarksList.length < 8) {
+							if (this.reportList.length < 8) {
 								this.pullUpOn = true
 							} else {
 								this.pullUpOn = false
@@ -249,12 +239,12 @@ export default {
 		GetOnReachBottomData(index) {
 			//上拉加载
 			this.listQuery.pageNum += 1
-			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+			this.UserService.userClubReportReportRemarks(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
 						this.hasNextPage = data.hasNextPage
-						this.remarksList = this.remarksList.concat(data.results)
+						this.reportList = this.reportList.concat(data.results)
 						this.pullFlag = false // 防上拉暴滑
 						setTimeout(() => {
 							this.pullFlag = true
@@ -278,58 +268,12 @@ export default {
 			this.modal = true
 			this.contentModalText = '确定删除该报备吗？'
 		},
-		handReportDetails(remarksId) {
+		handReportDetails(reportId) {
 			//跳转报备详情
-			this.$api.navigateTo(`/pages/seller/remarks/relation-consult-list?id=${remarksId}`)
-		},
-		handSearchConfirmData(data){
-			//确定筛选
-			this.listQuery.startAddTime = data.startAddTime
-			this.listQuery.endAddTime = data.endAddTime
-			this.listQuery.consult = data.consult
-			this.listQuery.leaderId = data.leaderId
-			this.listQuery.groupId = data.groupId
-			this.listQuery.pinceSensitve = data.pinceSensitve
-			this.listQuery.satisfied = data.satisfied
-			this.listQuery.followup = data.followup
-			console.log('确定筛选',this.listQuery)
-			this.getUserClubVisitorRecordlist()
-		},
-		handleShowClubpopup() {
-			//跳转选择咨询人
-			this.$api.navigateTo('/pages/seller/remarks/customer-list')
-		},
-		handleChoiceaConsultData(data){// 选择咨询人添加记录
-			//跳转添加记录
-			this.$api.navigateTo(`/pages/seller/remarks/add-record?type=add&questionManId=${data.questionManId}&questionMan=${
-					data.questionMan
-				}`)
-		},
-		handleChoiceaTextData(data) {// 新增咨询人监听时间
-			console.log('data',data)
-			this.handleSaveVisitor(data)
-		},
-		handleSaveVisitor(data) {
-			// 添加咨询人
-			this.UserService.getUserClubVisitorSave({
-				name: data,
-				serviceProviderId: this.listQuery.serviceProviderId
-			})
-				.then(response => {
-					setTimeout(() => {
-						this.$api.navigateTo(
-							`/pages/seller/remarks/add-record?questionManId=${response.data.questionManId}&questionMan=${
-								response.data.questionMan
-							}`
-						)
-					}, 1000)
-				})
-				.catch(error => {
-					console.log('=======>添加咨询人失败~')
-				})
+			this.$api.navigateTo(`/pages/seller/remarks/relation-consult-list?reportId=${reportId}`)
 		},
 		handleClick(e) {
-			//取消收藏
+			//操作
 			if (e.index == 1) {
 				this.handleDeleteUserLike()
 			}
@@ -343,7 +287,7 @@ export default {
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
 					setTimeout(() => {
-						this.getUserClubVisitorRecordlist()
+						this.userClubReportReportRemarks()
 					}, 2000)
 				})
 				.catch(error => {
@@ -357,7 +301,7 @@ export default {
 			} else {
 				this.isShowClose = false
 				this.listQuery.pageNum = 1
-				this.getUserClubVisitorRecordlist()
+				this.userClubReportReportRemarks()
 			}
 		},
 		delInputText() {
@@ -365,13 +309,13 @@ export default {
 			this.listQuery.keyWord = ''
 			this.isShowClose = false
 			this.listQuery.pageNum = 1
-			this.getUserClubVisitorRecordlist()
+			this.userClubReportReportRemarks()
 		},
 		hideMobel() {
 			this.modal = false
 		},
-		details(remarksId) {
-			this.$api.navigateTo(`/pages/seller/remarks/record-details?remarksId=${remarksId}`)
+		details(reportId) {
+			this.$api.navigateTo(`/pages/seller/remarks/report-details?reportId=${reportId}`)
 		}
 	},
 	onPageScroll(e) {

pages/seller/remarks/report-visitor-list.vue

@@ -10,7 +10,7 @@
 						confirm-type="search"
 						v-model="listQuery.keyWord"
 						@input="onShowClose"
-						@confirm="getUserClubVisitorRecordlist"
+						@confirm="userReportVisitorRemarks"
 						placeholder="搜索商品名称 / 报备关键词"
 						maxlength="16"
 					/>
@@ -29,51 +29,51 @@
 					<!-- 列表 -->
 					<view
 						class="tui-remarks-cell  tui-mtop clearfix"
-						v-for="(remark, index) in remarksList"
+						v-for="(report, index) in reportList"
 						:key="index"
-						@click.stop="details(remark.remarksId)"
+						@click.stop="details(report.reportId)"
 					>
 						<view class="tui-remarks-title">
 							<view class="tui-remarks-title-top">
-								<view class="tui-remarks-time tt">{{ remark.clubName }}</view>
+								<view class="tui-remarks-time tt">{{ report.clubName }}</view>
 							</view>
 							<view class="tui-remarks-title-bot">
 								<view class="tui-remarks-text-view">
-									<view class="tui-remarks-text h"></text>报备人：{{ remark.recordName }}</view>
+									<view class="tui-remarks-text h"></text>报备人：{{ report.recordName }}</view>
 									<view class="tui-remarks-text y">
-										{{ remark.addDate }}
+										{{ report.addDate }}
 									</view>
 								</view>
 							</view>
 							<view class="tui-remarks-title-icon" :class="{
-										reviewed: remark.type == 1,
-										failed: remark.type == 2,
-										approved: remark.type == 3
+										reviewed: report.type == 1,
+										failed: report.type == 2,
+										approved: report.type == 3
 									}">
 							</view>
 						</view> 
 						<view class="tui-remarks-content">
-							<view class="tui-remarks-goods" v-if="remark.product">
+							<view class="tui-remarks-goods" v-if="report.product">
 								<view class="goods-image">
 									<image
-										:src="remark.product.images"
+										:src="report.product.images"
 										mode=""
 									></image>
 								</view>
 								<view class="goods-main">
 									<view class="name">
-										{{ remark.product.name }}
+										{{ report.product.name }}
 									</view>
-									<view class="shop">{{ remark.reportText }}</view>
+									<view class="shop">{{ report.reportText }}</view>
 								</view>
 							</view>
 							<view class="tui-remarks-text" v-else>
-								{{ remark.reportText }}
+								{{ report.reportText }}
 							</view>
 						</view>
 						<view class="tui-remarks-button">
-							<view class="btn edit" @click.stop="handReportDetails(remark.remarksId)">查看关联咨询记录</view>
-							<view class="btn del" @click.stop="deleteRemark(remark.remarksId)">删除</view>
+							<view class="btn edit" @click.stop="handReportDetails(report.reportId)">查看关联咨询记录</view>
+							<view class="btn del" @click.stop="deleteRemark(report.reportId)">删除</view>
 						</view>
 					</view>
 					<!--加载loadding-->
@@ -105,15 +105,8 @@ import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
 import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 const defaultListQuery = {
-	startAddTime:'',
-	endAddTime:'',
-	consult:'',
-	pinceSensitve: 0, //价格敏感度
-	satisfied: 0, // 意向程度
-	followup: 0, // 跟进状态
-	leaderId:0,
-	groupId:0,
 	manager:0,
+	keyWord:'',
 	serviceProviderId: 0,
 	pageNum: 1,
 	pageSize: 10
@@ -147,7 +140,7 @@ export default {
 			popupShow: true,
 			popupShow1: false,
 			listQuery: Object.assign({}, defaultListQuery),
-			remarksList: [
+			reportList: [
 				{
 					clubName:'采美信息技术有限公司',
 					recordName:'吴小研',
@@ -208,19 +201,19 @@ export default {
 			// const VisitorInfo = await this.$api.getComStorage('VisitorInfo')
 			// this.questionMan = VisitorInfo.questionMan
 			// this.listQuery.questionManId = VisitorInfo.questionManId
-			// this.getUserClubVisitorRecordlist()
+			// this.userReportVisitorRemarks()
 		},
-		getUserClubVisitorRecordlist() {
-			this.remarksList = []
+		userReportVisitorRemarks() {
+			this.reportList = []
 			this.listQuery.pageNum = 1
-			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+			this.UserService.userReportVisitorRemarks(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
 						this.isEmpty = false
 						this.hasNextPage = data.hasNextPage
 						this.totalRecord = data.totalRecord
-						this.remarksList = data.results
+						this.reportList = data.results
 						this.pullFlag = false
 						setTimeout(() => {
 							this.pullFlag = true
@@ -229,7 +222,7 @@ export default {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
 						} else {
-							if (this.remarksList.length < 8) {
+							if (this.reportList.length < 8) {
 								this.pullUpOn = true
 							} else {
 								this.pullUpOn = false
@@ -249,12 +242,12 @@ export default {
 		GetOnReachBottomData(index) {
 			//上拉加载
 			this.listQuery.pageNum += 1
-			this.UserService.getUserClubVisitorRecordlist(this.listQuery)
+			this.UserService.userReportVisitorRemarks(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
 						this.hasNextPage = data.hasNextPage
-						this.remarksList = this.remarksList.concat(data.results)
+						this.reportList = this.reportList.concat(data.results)
 						this.pullFlag = false // 防上拉暴滑
 						setTimeout(() => {
 							this.pullFlag = true
@@ -278,9 +271,9 @@ export default {
 			this.modal = true
 			this.contentModalText = '确定删除该报备吗？'
 		},
-		handReportDetails(remarksId) {
+		handReportDetails(reportId) {
 			//跳转报备详情
-			this.$api.navigateTo(`/pages/seller/remarks/relation-visitor-list?id=${remarksId}`)
+			this.$api.navigateTo(`/pages/seller/remarks/relation-visitor-list?id=${reportId}`)
 		},
 		handSearchConfirmData(data){
 			//确定筛选
@@ -293,7 +286,7 @@ export default {
 			this.listQuery.satisfied = data.satisfied
 			this.listQuery.followup = data.followup
 			console.log('确定筛选',this.listQuery)
-			this.getUserClubVisitorRecordlist()
+			this.userReportVisitorRemarks()
 		},
 		handleShowClubpopup() {
 			//跳转选择咨询人
@@ -343,7 +336,7 @@ export default {
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
 					setTimeout(() => {
-						this.getUserClubVisitorRecordlist()
+						this.userReportVisitorRemarks()
 					}, 2000)
 				})
 				.catch(error => {
@@ -357,7 +350,7 @@ export default {
 			} else {
 				this.isShowClose = false
 				this.listQuery.pageNum = 1
-				this.getUserClubVisitorRecordlist()
+				this.userReportVisitorRemarks()
 			}
 		},
 		delInputText() {
@@ -365,7 +358,7 @@ export default {
 			this.listQuery.keyWord = ''
 			this.isShowClose = false
 			this.listQuery.pageNum = 1
-			this.getUserClubVisitorRecordlist()
+			this.userReportVisitorRemarks()
 		},
 		hideMobel() {
 			this.modal = false

services/index.js

@@ -6,7 +6,6 @@ import UserService from './user.service'
 import ProductService from './product.service'
 import ShopService from './shop.service'
 import PayService from './pay.service'
-import PhotoService from './photo.service'
 import SellerService from './sellse.service'
 import ActivityService from './activity.service'
 import OrderService from './order.service'
@@ -21,7 +20,6 @@ let userService = new UserService(ajaxService)
 let productService = new ProductService(ajaxService)
 let shopService = new ShopService(ajaxService)
 let payService = new PayService(ajaxService)
-let photoService = new PhotoService(ajaxService)
 let sellerService = new SellerService(ajaxService)
 let activityService = new ActivityService(ajaxService)
 let orderService = new OrderService(ajaxService)
@@ -37,7 +35,6 @@ Vue.prototype.UserService = userService
 Vue.prototype.ProductService = productService
 Vue.prototype.ShopService = shopService
 Vue.prototype.PayService = payService
-Vue.prototype.PhotoService = photoService
 Vue.prototype.SellerService = sellerService
 Vue.prototype.ActivityService = activityService
 Vue.prototype.OrderService = orderService

services/photo.service.js

@@ -1,16 +0,0 @@
-/**
- * 随手拍模块公用业务逻辑的服务
- */
-export default class PhotoService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'PhotoService'
-	}
-	/* api公用定义 */
-	riskAdd (data = {}, isLoading = false) {
-		return this.AjaxService.post({ url: `weixin/api/risk/add`, data, isLoading })
-	}
-	riskEdit (data = {}, isLoading = false) {
-		return this.AjaxService.post({ url: `weixin/api/risk/edit`, data, isLoading })
-	}
-}

services/user.service.js

@@ -379,8 +379,8 @@ export default class UserService {
         })
     }
     /**
-	 *@机构资料备注详情
-	 *@param remarksId	备注Id
+	 *@注册机构咨询记录详情
+	 *@param remarksId	记录Id
 	 */
     getUserClubRemarksDetail(data = {}) {
         return this.AjaxService.get({
@@ -532,12 +532,166 @@ export default class UserService {
 	 */
     getUserClubTeamsRroups (data = {}) {
 	    return this.AjaxService.post({
-	        url:'/user/club/teams/groups ',
+	        url:'/user/club/teams/groups',
+	        data,
+	        isLoading: false,
+	    })
+    }
+    /**
+	 *@已注册机构新增报备
+	 *@param  productId:商品Id
+	 *@param  clubId:	机构Id
+	 *@param  serviceProviderId	协销Id
+	 *@param  reportText:报备事由
+	 */
+    userClubReportSave (data = {}) {
+	    return this.AjaxService.post({
+	        url:'/user/club/report/save',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@咨询报备关联商品
+	 *@param  pageNum: 页码
+	 *@param  pageSize:	条数
+	 */
+    userReportProductList (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/productList',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@对应机构报备列表
+	 *@param  serviceProviderId：: 协销Id
+	 *@param  clubId: 机构Id
+	 *@param  pageNum: 页码
+	 *@param  pageSize:	条数
+	 */
+    userClubReportList (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/List',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@所有注册机构报备记录列表
+	 *@param  manager：: 是否是管理员 1是管理员 （从登录协销信息内取）
+	 *@param  serviceProviderId：: 协销Id
+	 *@param  keyWord：关键词
+	 *@param  pageNum: 页码
+	 *@param  pageSize:	条数
+	 */
+    userClubReportReportRemarks (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/reportRemarks',
+	        data,
+	        isLoading: false,
+	    })
+    }
+    /**
+	 *@注册机构关联咨询记录列表
+	 *@param  reportId：: 报备Id
+	 *@param  pageNum: 页码
+	 *@param  pageSize:	条数
+	 */
+    userClubReportAssociatedList (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/associatedList',
+	        data,
+	        isLoading: false,
+	    })
+    }
+    /**
+	 *@报备详情
+	 *@param  reportId: 报备Id
+	 */
+    userReportDetails (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/details',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@未注册客户咨询人新建报备
+	 *@param  questionManId：: 协销咨询人Id
+	 *@param  productId: 商品Id
+	 *@param  reportText: 报备事由
+	 */
+    userReportVisitorSave (data = {}) {
+	    return this.AjaxService.post({
+	        url:'/user/club/report/visitor/save',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@单个咨询人报备列表
+	 *@param  questionManId：: 咨询人Id
+	 *@param  keyWord: 关键词
+	 */
+    userReportVisitorList (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/visitor/List',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@所有未注册机构报备记录列表
+	 *@param  manager：: 是否是管理员 1是管理员 （从登录协销信息内取）
+	 *@param  serviceProviderId：: 协销Id
+	 *@param  keyWord：关键词
+	 *@param  pageNum: 页码
+	 *@param  pageSize:	条数
+	 */
+    userReportVisitorRemarks (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/visitor/reportRemarks',
+	        data,
+	        isLoading: false,
+	    })
+    }
+    /**
+	 *@未注册咨询人关联咨询记录列表
+	 *@param  reportId：报备Id
+	 *@param  keyWord：关键词
+	 *@param  pageNum: 页码
+	 *@param  pageSize:	条数
+	 */
+    userReportVisitorAssociatedList (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/visitor/associatedList',
+	        data,
+	        isLoading: false,
+	    })
+    }
+    /**
+	 *@已注册机构取消报备关联咨询记录
+	 *@param  remarksId：报备Id
+	 */
+    userClubReportDisassociation (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/disassociation',
+	        data,
+	        isLoading: false,
+	    })
+    }
+    /**
+	 *@未注册咨询人取消报备关联咨询记录
+	 *@param  remarksId：报备Id
+	 */
+    userReportVisitorDisassociation (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/visitor/disassociation',
 	        data,
 	        isLoading: false,
 	    })
     }
-
     /**
 	 *@会员中心
 	 *@param userId	用户Id
@@ -644,4 +798,5 @@ export default class UserService {
 	        isLoading: false,
 	    })
     }
+	
 }