commit -m 报备咨询记录

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

@@ -13,7 +13,7 @@
 							confirm-type="search"
 							v-model="listQuery.keyWord"
 							@input="onShowClose"
-							@confirm="initclubList()"
+							@confirm="userReportProductList()"
 							placeholder="搜索商品名称"
 							maxlength="16"
 						/>
@@ -31,7 +31,7 @@
 							<view class="list-cell-le">
 								<image
 									class="logo"
-									:src="pros.images"
+									:src="pros.image"
 									mode=""
 								></image>
 							</view>
@@ -60,7 +60,7 @@
 
 <script>
 export default {
-	name: 'coupon',
+	name: 'cmgoodspopup',
 	props: {
 		show: {
 			type: Boolean,
@@ -75,44 +75,13 @@ export default {
 			listQuery: {
 				keyWord:'',
 				pageNum: 1,
-				pageSize: 200,
+				pageSize: 100,
 			},
-			dataList: [
-				{
-					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
-					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
-					shopName:'广州市昊运生物科技有限公司',
-					price:100000,
-					ischecked:false
-				},
-				{
-					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
-					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
-					shopName:'广州市昊运生物科技有限公司',
-					price:100000,
-					ischecked:false
-					
-				},
-				{
-					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
-					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
-					shopName:'广州市昊运生物科技有限公司',
-					price:100000,
-					ischecked:false
-					
-				},
-				{
-					images:'https://img.caimei365.com/group1/M00/04/1D/rB-lGGK-kTWASmn_AAEbbtyDzZs488.jpg',
-					name:'ICE冷冻溶脂仪 意大利进口 减脂黑科技ICE冷冻溶脂仪 意大利进口 减脂黑科技',
-					shopName:'广州市昊运生物科技有限公司',
-					price:100000,
-					ischecked:false
-					
-				},
-			]
+			dataList: []
 		}
 	},
 	created() {
+		console.log('11111111111')
 		this.userReportProductList()
 	},
 	methods: {
@@ -120,8 +89,8 @@ export default {
 			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)=>{
+				if (data.results && data.results.length > 0) {
+					 this.dataList = data.results.map((el,index)=>{
 						el.ischecked = false
 						return el
 					})

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

@@ -24,7 +24,7 @@
 					<view class="tui-popup-main coupon">
 						<scroll-view class="tui-popup-scroll" scroll-y="true">
 							<view
-								v-for="(remark, index) in dataList"
+								v-for="(report, index) in dataList"
 								:key="index"
 								class="list clearfix"
 								@click.stop="checkedCoupon(index)"
@@ -32,31 +32,33 @@
 								<view
 									class="list-cell-icon"
 									:class="{
-										reviewed: remark.type == 1,
-										failed: remark.type == 2,
-										approved: remark.type == 3
+										reviewed: report.status == 1,
+										approved: report.status == 2,
+										failed: report.status == 3
 									}"
 								>
 								</view>
 								<view class="list-cell-title">
-									<view class="list-cell-h1">{{ remark.clubName }}</view>
-									<view class="list-cell-p"> {{ remark.addDate }} </view>
+									<view class="list-cell-h1" v-if="popupType === 1">{{ report.clubName }}</view>
+									<view class="list-cell-h1" v-else>{{ report.questionMan }}</view>
+									<view class="list-cell-p"> {{ report.addTime }} </view>
 								</view>
 								<view class="list-cell-content clearfix">
-									<view class="tui-remarks-goods" v-if="remark.product">
+									<view class="tui-remarks-text" v-if="!report.productId"> {{ report.reportText }} </view>
+									<view class="tui-remarks-goods" v-else>
 										<view class="goods-image">
-											<image :src="remark.product.images" mode=""></image>
+											<image :src="report.mainImage" mode=""></image>
 										</view>
 										<view class="goods-main">
-											<view class="name"> {{ remark.product.name }} </view>
-											<view class="shop">{{ remark.reportText }}</view>
+											<view class="name"> {{ report.productName }} </view>
+											<view class="shop">{{ report.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']"
+											:class="[report.ischecked ? 'icon-yixuanze' : 'icon-weixuanze']"
 										>
 										</view>
 									</view>
@@ -82,8 +84,21 @@
 </template>
 
 <script>
+const defaultClubQuery = {
+	keyWord: '',
+	pageNum: 1,
+	pageSize: 200,
+	clubId: 0,
+	serviceProviderId: 0
+}
+const defaultVisitQuery = {
+	keyWord: '',
+	pageNum: 1,
+	pageSize: 200,
+	questionManId: 0,
+}
 export default {
-	name: 'coupon',
+	name: 'cmreportpopup',
 	props: {
 		show: {
 			type: Boolean,
@@ -102,100 +117,49 @@ export default {
 			isIphoneX: this.$store.state.isIphoneX,
 			checkedIndex: 0,
 			isShowClose: false,
-			listQuery: {
-				keyWord: '',
-				pageNum: 1,
-				pageSize: 200,
-				clubId: 0,
-				serviceProviderId: 0
-			},
-			dataList: [
-				{
-					clubName: '采美信息技术有限公司',
-					recordName: '吴小研',
-					addDate: '2022-08-10',
-					ischecked: false,
-					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product: {
-						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:
-							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type: 1
-				},
-				{
-					clubName: '采美信息技术有限公司',
-					recordName: '吴小研',
-					addDate: '2022-08-10',
-					ischecked: false,
-					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product: {
-						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:
-							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type: 2
-				},
-				{
-					clubName: '采美信息技术有限公司',
-					recordName: '吴小研',
-					addDate: '2022-08-10',
-					ischecked: false,
-					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product: null,
-					type: 3
-				},
-				{
-					clubName: '采美信息技术有限公司',
-					recordName: '吴小研',
-					addDate: '2022-08-10',
-					ischecked: false,
-					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product: {
-						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:
-							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type: 1
-				},
-				{
-					clubName: '采美信息技术有限公司',
-					recordName: '吴小研',
-					addDate: '2022-08-10',
-					ischecked: false,
-					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product: {
-						images: 'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:
-							'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type: 2
-				},
-				{
-					clubName: '采美信息技术有限公司',
-					recordName: '吴小研',
-					addDate: '2022-08-10',
-					ischecked: false,
-					reportText: '请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product: null,
-					type: 3
-				}
-			],
+			listQuery: {},
+			
+			dataList: [],
 		}
 	},
 	created() {
-		this.listQuery.clubId = this.reportInfo.clubId
-		this.userClubReportList()
+		if(this.popupType === 1){
+			console.log('111111111')
+			this.listQuery = Object.assign({}, defaultClubQuery)
+			this.listQuery.clubId = this.reportInfo.clubId
+			this.userClubReportList()
+		}else{
+			console.log('222222222')
+			this.listQuery = Object.assign({}, defaultVisitQuery)
+			this.listQuery.questionManId = this.reportInfo.questionManId
+			this.userReportVisitorList()
+		}
+		
 	},
 	methods: {
-		async userClubReportList() {
+		async userClubReportList() {// 单个机构报备记录
 			const userInfo = await this.$api.getStorage()
 			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)=>{
+				if (data.results && data.results.length > 0) {
+					 this.dataList = data.results.map((el,index)=>{
+						el.ischecked = false
+						return el
+					})
+				}
+			})
+			.catch(error => {
+				this.$util.msg(error.msg, 2000)
+			})
+		},
+		userReportVisitorList() {// 单个咨询人报备记录
+			this.UserService.userReportVisitorList(this.listQuery)
+			.then(response => {
+				let data = response.data
+				if (data.results && data.results.length > 0) {
+					 this.dataList = data.results.map((el,index)=>{
 						el.ischecked = false
 						return el
 					})

manifest.json

@@ -78,7 +78,10 @@
     },
     "mp-baidu" : {
         "usingComponents" : true,
-        "appid" : ""
+        "appid" : "17767960",
+        "setting" : {
+            "urlCheck" : false
+        }
     },
     "mp-toutiao" : {
         "usingComponents" : true

pages/seller/remarks/add-record.vue

@@ -39,7 +39,7 @@
 				</view>
 				<view class="tui-remarks-showgoods" v-else>
 					<view class="tui-remarks-goods" v-for="(pros, index) in handleGoods" :key="index">
-						<view class="goods-image"> <image :src="pros.images" mode=""></image> </view>
+						<view class="goods-image"> <image :src="pros.image" mode=""></image> </view>
 						<view class="goods-main">
 							<view class="name"> {{ pros.name }} </view>
 							<view class="shop"> 供应商：{{ pros.shopName }} </view>
@@ -107,7 +107,7 @@
 					class="input"
 					type="text"
 					disabled="false"
-					v-model="priceFlagText"
+					v-model="reportText"
 					value=""
 					placeholder="请选择报备"
 				/>
@@ -276,6 +276,7 @@ export default {
 			checkedCategorysList:[],
 			categorys:[],
 			priceFlagText: '',
+			reportText:'',
 			intenFlagText: '',
 			followStateText: '',
 			priceActions: [
@@ -510,7 +511,9 @@ export default {
 			// 显示添加商品弹窗
 			this.isGoodspopup = true
 		},
-		handleClean(){//删除选择的商品
+		handleClean() {
+			//删除选择的商品
+			this.remarksParams.productId === 0
 			this.handleGoods = []
 		},
 		handleChoiceaGoodsData(data) {
@@ -521,6 +524,7 @@ export default {
 		},
 		handleChoiceaReportData(data) {
 			console.log('data', data)
+			this.reportText = data.reportText
 			this.remarksParams.reportId = data.reportId
 		},
 		contains(arr, val) {// 校验

pages/seller/remarks/add.vue

@@ -66,14 +66,14 @@
 				</view>
 				<view class="tui-remarks-showgoods" v-else>
 					<view class="tui-remarks-goods" v-for="(pros, index) in handleGoods" :key="index">
-						<view class="goods-image"> <image :src="pros.images" mode=""></image> </view>
+						<view class="goods-image"> <image :src="pros.image" mode=""></image> </view>
 						<view class="goods-main">
 							<view class="name"> {{ pros.name }} </view>
 							<view class="shop"> 供应商：{{ pros.shopName }} </view>
 						</view>
 					</view>
 					<view class="tui-remarks-btn">
-						<view class="btn delete" @click="handleClean">删除</view> 
+						<view class="btn delete" @click="handleClean">删除</view>
 						<view class="btn update" @click="handleShowGoodPopup">更换</view>
 					</view>
 				</view>
@@ -103,7 +103,7 @@
 									class="ass-list"
 									v-for="(ass, assIndex) in assActionList"
 									:key="assIndex"
-									@click="SelectAssociationFn(ass.remarks,item)"
+									@click="SelectAssociationFn(ass.remarks, item)"
 									>{{ ass.remarks }}</view
 								>
 							</scroll-view>
@@ -125,16 +125,14 @@
 			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1">关联报备：</view>
-				<view class="list-view-p"
-					>(若客户咨询的事项不确定采美能不能做，请创建并关联报备向上级反馈）</view
-				>
+				<view class="list-view-p">(若客户咨询的事项不确定采美能不能做，请创建并关联报备向上级反馈）</view>
 			</view>
 			<view class="list-view-radio" @click="handleShowReportPopup">
 				<input
 					class="input"
 					type="text"
 					disabled="false"
-					v-model="priceFlagText"
+					v-model="reportText"
 					value=""
 					placeholder="请选择报备"
 				/>
@@ -254,7 +252,7 @@
 			ref="cmreportpopup"
 			v-if="isReportpopup"
 			:show="isReportpopup"
-			:popupType ="1"
+			:popupType="1"
 			:reportInfo="reportInfo"
 			@handleChoiceaReport="handleChoiceaReportData"
 		>
@@ -285,18 +283,18 @@ export default {
 			remarksParams: {
 				clubId: 0,
 				questionMan: '',
-				clubType:'', //机构类型
-				remarks:[], // 关键词
-				extra: '',//额外说明
+				clubType: '', //机构类型
+				remarks: [], // 关键词
+				extra: '', //额外说明
 				fileList: [],
 				imageList: [],
 				serviceProviderId: 0,
 				consult: '', // 咨询类别
-				pinceSensitve:0,//价格敏感度
-				satisfied:0,// 意向程度
-				followup:0,// 跟进状态
-				productId:0,// 商品Id
-				reportId:0, // 报备Id
+				pinceSensitve: 0, //价格敏感度
+				satisfied: 0, // 意向程度
+				followup: 0, // 跟进状态
+				productId: 0, // 商品Id
+				reportId: 0 // 报备Id
 			},
 			min: 0,
 			max: 200,
@@ -308,6 +306,7 @@ export default {
 			categorys: [],
 			isConfirmLoding: false,
 			priceFlagText: '',
+			reportText: '',
 			intenFlagText: '',
 			followStateText: '',
 			priceActions: [
@@ -326,20 +325,19 @@ export default {
 			remarksList: [
 				{
 					label: '',
-					isAssociation:false
+					isAssociation: false
 				}
 			],
-			checkRemarkIndex:0,
+			checkRemarkIndex: 0,
 			assActionList: [],
-			isGoodspopup:false,
-			isReportpopup:false,
+			isGoodspopup: false,
+			isReportpopup: false,
 			handleGoods: [],
-			reportInfo:{
-				clubId:0,
-				name:'',
-				linkMan:''
+			reportInfo: {
+				clubId: 0,
+				name: '',
+				linkMan: ''
 			}
-			
 		}
 	},
 	onLoad(option) {
@@ -433,33 +431,35 @@ export default {
 			this.assActionList = []
 			this.checkRemarkIndex = index
 			if (event.detail.value != '') {
-				this.UserService.getCmremarkslist({remarks : event.detail.value}).then(response => {
-					if(response.data&&response.data.length>0){
-						this.assActionList = response.data
-						this.remarksList[index].isAssociation = true
-					}else{
-						this.assActionList = []
-						this.remarksList[index].isAssociation = false
-					}
-				})
-				.catch(error => {
-					console.log('=========>获取关键词联想失败')
-				})
+				this.UserService.getCmremarkslist({ remarks: event.detail.value })
+					.then(response => {
+						if (response.data && response.data.length > 0) {
+							this.assActionList = response.data
+							this.remarksList[index].isAssociation = true
+						} else {
+							this.assActionList = []
+							this.remarksList[index].isAssociation = false
+						}
+					})
+					.catch(error => {
+						console.log('=========>获取关键词联想失败')
+					})
 			} else {
 				this.remarksList[index].isAssociation = false
 			}
 		},
-		hideAssAction(item, event){//隐藏对应的联想弹窗
+		hideAssAction(item, event) {
+			//隐藏对应的联想弹窗
 			item.isAssociation = false
 		},
-		SelectAssociationFn(ass,item) {
+		SelectAssociationFn(ass, item) {
 			//选择关键词
 			item.isAssociation = false
 			item.label = ass
 		},
-		addListFn(item,index) {
+		addListFn(item, index) {
 			//添加
-			let obj = { label: '',isAssociation:false}
+			let obj = { label: '', isAssociation: false }
 			item.isAssociation = false
 			this.remarksList.push(obj)
 		},
@@ -483,7 +483,8 @@ export default {
 					break
 			}
 		},
-		async editButtonConfim() {//保存资料备注
+		async editButtonConfim() {
+			//保存资料备注
 			if (this.isConfirmLoding) {
 				return
 			}
@@ -499,7 +500,7 @@ export default {
 			//统一处理关键词
 			let remarksList = []
 			for (const el of this.remarksList) {
-				if(el.label!=''){
+				if (el.label != '') {
 					remarksList.push(el.label)
 				}
 			}
@@ -507,6 +508,10 @@ export default {
 				this.$util.msg('请输入关键词记录', 2000)
 				return
 			}
+			if (this.remarksParams.productId === 0) {
+				this.$util.msg('请选择商品', 2000)
+				return
+			}
 			if (!this.remarksParams.pinceSensitve) {
 				this.$util.msg('请选择价格敏感度', 2000)
 				return
@@ -520,7 +525,7 @@ export default {
 				return
 			}
 			this.remarksParams.remarks = JSON.stringify(remarksList)
-			console.log('remarksParams',this.remarksParams)
+			console.log('remarksParams', this.remarksParams)
 			this.remarksParams.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 			this.isConfirmLoding = true
 			this.UserService.getUserClubRemarksSave({
@@ -552,7 +557,7 @@ export default {
 			}
 			this.remarksParams.consult = this.checkedCategorysList.join(',')
 		},
-		handleShowReportPopup(){
+		handleShowReportPopup() {
 			// 显示报备弹窗
 			this.isReportpopup = true
 		},
@@ -560,7 +565,9 @@ export default {
 			// 显示添加商品弹窗
 			this.isGoodspopup = true
 		},
-		handleClean(){//删除选择的商品
+		handleClean() {
+			//删除选择的商品
+			this.remarksParams.productId === 0
 			this.handleGoods = []
 		},
 		handleChoiceaGoodsData(data) {
@@ -571,6 +578,7 @@ export default {
 		},
 		handleChoiceaReportData(data) {
 			console.log('data', data)
+			this.reportText = data.reportText
 			this.remarksParams.reportId = data.reportId
 		},
 		contains(arr, val) {
@@ -672,7 +680,7 @@ export default {
 				3: '意向平淡',
 				4: '随便看看'
 			}
-		 return map[value]
+			return map[value]
 		}
 	},
 	onShow() {}
@@ -945,7 +953,7 @@ page {
 						color: #666666;
 						text-align: left;
 						border-bottom: 1px solid #e1e1e1;
-						&:last-child{
+						&:last-child {
 							border-bottom: none;
 						}
 					}

pages/seller/remarks/details.vue

@@ -18,7 +18,14 @@
 			</view>
 			<view class="content-club-ri"> <text class="iconfont icon-xiayibu"></text> </view>
 		</view>
-		<view class="remarks-content clearfix">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="remarks-content clearfix" v-else>
 			<view class="list-view-title">
 				<view class="list-view-h1"
 					>咨询人：<text> {{ remarksParams.questionMan }} </text></view
@@ -37,17 +44,10 @@
 			<view class="list-view-title"> <view class="list-view-h1">咨询商品：</view> </view>
 			<view class="tui-remarks-content">
 				<view class="tui-remarks-goods">
-					<view class="goods-image">
-						<image
-							src="https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg"
-							mode=""
-						></image>
-					</view>
+					<view class="goods-image"> <image :src="remarksParams.mainImage" mode=""></image> </view>
 					<view class="goods-main">
-						<view class="name">
-							易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水
-						</view>
-						<view class="shop"> 供应商：华熙生物 </view>
+						<view class="name"> {{ remarksParams.productName }} </view>
+						<view class="shop"> 供应商：{{ remarksParams.shopName }} </view>
 					</view>
 				</view>
 			</view>
@@ -59,15 +59,21 @@
 			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"
-					>关联报备：<text
-						>报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由</text
-					></view
+					>关联报备：<text>{{ remarksParams.reportText }}</text></view
 				>
 			</view>
 			<view class="tui-remarks-content">
 				<view class="tui-remarks-text">
-					<view class="txt">报备审核通过</view>
-					<view class="txm">审核说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明</view>
+					<view
+						class="txt"
+						:class="{
+							reviewed: remarksParams.status == 1,
+							approved: remarksParams.status == 2,
+							failed: remarksParams.status == 3
+						}"
+						>{{ remarksParams.status | statusFilters }}</view
+					>
+					<view class="txm" v-if="remarksParams.auditText">{{ remarksParams.auditText }}</view>
 				</view>
 			</view>
 			<view class="list-view-title">
@@ -137,7 +143,8 @@ export default {
 			clubUserId: 0,
 			clubInfo: {},
 			userInfo: {},
-			categorys: ''
+			categorys: '',
+			skeletonShow:true
 		}
 	},
 	onLoad(option) {
@@ -146,6 +153,15 @@ export default {
 		this.getUserClubRemarksDetail()
 	},
 	filters: {
+		statusFilters(value) {
+			// 订单来源
+			const map = {
+				1: '报备待审核',
+				2: '报备审核通过',
+				3: '报备审核未通过'
+			}
+			return map[value]
+		},
 		followupFilters(value) {
 			// 订单来源
 			const map = {
@@ -173,7 +189,7 @@ export default {
 				3: '意向平淡',
 				4: '随便看看'
 			}
-		 return map[value]
+			return map[value]
 		}
 	},
 	methods: {
@@ -187,6 +203,9 @@ export default {
 					this.remarksParams = response.data
 					this.clubUserId = response.data.userId
 					this.getCulbInfo()
+					setTimeout(()=>{
+						this.skeletonShow = false
+					},500)
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
@@ -361,48 +380,57 @@ page {
 		width: 100%;
 		height: auto;
 		margin-bottom: 24rpx;
-		.tui-remarks-text{
+		.tui-remarks-text {
 			width: 100%;
 			box-sizing: border-box;
-			background-color: #F7F7F7;
+			background-color: #f7f7f7;
 			padding: 26rpx;
 			border-radius: 6rpx;
-			.txt{
+			.txt {
 				line-height: 36rpx;
-				color: #0DB26D;
+				color: #0db26d;
 				font-size: 26rpx;
+				&.reviewed{
+					color: #E15616;
+				}
+				&.approved{
+					color: #0DB26D;
+				}
+				&.failed{
+					color: #F94B4B;
+				}
 			}
-			.txm{
+			.txm {
 				line-height: 36rpx;
 				color: #666666;
 				font-size: 26rpx;
 			}
 		}
-		.tui-remarks-goods{
+		.tui-remarks-goods {
 			width: 100%;
 			height: 180rpx;
 			box-sizing: border-box;
-			background-color: #F7F7F7;
+			background-color: #f7f7f7;
 			padding: 26rpx;
 			border-radius: 6rpx;
-			.goods-image{
+			.goods-image {
 				width: 128rpx;
 				height: 128rpx;
 				float: left;
-				image{
+				image {
 					width: 128rpx;
 					height: 128rpx;
 					display: block;
 					border-radius: 4rpx;
 				}
 			}
-			.goods-main{
+			.goods-main {
 				width: 522rpx;
 				height: 128rpx;
 				box-sizing: border-box;
 				padding: 0 32rpx;
 				float: right;
-				.name{
+				.name {
 					width: 100%;
 					height: 60rpx;
 					box-sizing: border-box;
@@ -416,7 +444,7 @@ page {
 					-webkit-box-orient: vertical;
 					font-size: 26rpx;
 				}
-				.shop{
+				.shop {
 					line-height: 60rpx;
 					color: #999999;
 					font-size: 26rpx;

pages/seller/remarks/list.vue

@@ -47,7 +47,7 @@
 					<view class="tui-remarks-title">
 						<view class="tui-remarks-title-top">
 							<view class="tui-remarks-time tt"
-								><text class="tags">新分配</text>{{ remark.clubName }}</view
+								><text class="tags" v-if="report.newDeal === 1">新分配</text>{{ remark.clubName }}</view
 							>
 							<view class="tui-remarks-time sm" v-if="remark.followup">
 								<text
@@ -88,7 +88,16 @@
 						<view class="tui-remarks-name-text h">
 							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text>
 						</view>
-						<view class="tui-remarks-name-text y"> 报备状态：<text>审核通过</text> </view>
+						<view class="tui-remarks-name-text y" v-if="remark.status">
+							报备状态：<text
+								:class="{
+									reviewed: remark.status == 1,
+									approved: remark.status == 2,
+									failed: remark.status == 3
+								}"
+								>{{ remark.status | statusFilters }}</text
+							>
+						</view>
 					</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
@@ -217,11 +226,14 @@ export default {
 	},
 	onLoad() {},
 	filters: {
-		NumFormat: function(value) {
-			//处理金额
-			if (!value) return '0.00'
-			let number = Number(value).toFixed(2)
-			return number
+		statusFilters(value) {
+			// 订单来源
+			const map = {
+				1: '待审核',
+				2: '审核通过',
+				3: '审核未通过'
+			}
+			return map[value]
 		},
 		followupFilters(value) {
 			// 订单来源
@@ -719,6 +731,15 @@ page {
 				&.y {
 					width: 60%;
 					padding-left: 24rpx;
+					.reviewed{
+						color: #E15616;
+					}
+					.approved{
+						color: #0DB26D;
+					}
+					.failed{
+						color: #F94B4B;
+					}
 				}
 			}
 		}

pages/seller/remarks/record-details.vue

@@ -19,17 +19,10 @@
 			<view class="list-view-title"> <view class="list-view-h1">咨询商品：</view> </view>
 			<view class="tui-remarks-content">
 				<view class="tui-remarks-goods">
-					<view class="goods-image">
-						<image
-							src="https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg"
-							mode=""
-						></image>
-					</view>
+					<view class="goods-image"> <image :src="remarksParams.mainImage" mode=""></image> </view>
 					<view class="goods-main">
-						<view class="name">
-							易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水
-						</view>
-						<view class="shop"> 供应商：华熙生物 </view>
+						<view class="name"> {{ remarksParams.productName }} </view>
+						<view class="shop"> 供应商：{{ remarksParams.shopName }} </view>
 					</view>
 				</view>
 			</view>
@@ -41,15 +34,21 @@
 			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"
-					>关联报备：<text
-						>报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由</text
-					></view
+					>关联报备：<text>{{ remarksParams.reportText }}</text></view
 				>
 			</view>
 			<view class="tui-remarks-content">
 				<view class="tui-remarks-text">
-					<view class="txt">报备审核通过</view>
-					<view class="txm">审核说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明备注说明</view>
+					<view
+						class="txt"
+						:class="{
+							reviewed: remarksParams.status == 1,
+							approved: remarksParams.status == 2,
+							failed: remarksParams.status == 3
+						}"
+						>{{ remarksParams.status | statusFilters }}</view
+					>
+					<view class="txm" v-if="remarksParams.auditText">{{ remarksParams.auditText }}</view>
 				</view>
 			</view>
 			<view class="list-view-title">
@@ -125,6 +124,15 @@ export default {
 		this.getUserRemarksVisitDetail()
 	},
 	filters: {
+		statusFilters(value) {
+			// 订单来源
+			const map = {
+				1: '报备待审核',
+				2: '报备审核通过',
+				3: '报备审核未通过'
+			}
+			return map[value]
+		},
 		followupFilters(value) {
 			// 订单来源
 			const map = {
@@ -278,6 +286,15 @@ page {
 				line-height: 36rpx;
 				color: #0DB26D;
 				font-size: 26rpx;
+				&.reviewed{
+					color: #E15616;
+				}
+				&.approved{
+					color: #0DB26D;
+				}
+				&.failed{
+					color: #F94B4B;
+				}
 			}
 			.txm{
 				line-height: 36rpx;

pages/seller/remarks/record-list.vue

@@ -79,10 +79,17 @@
 						</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> 
+								意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text> 
 							</view>
-							<view class="tui-remarks-name-text y">
-								报备状态：<text>审核通过</text> 
+							<view class="tui-remarks-name-text y" v-if="remark.status">
+								报备状态：<text
+									:class="{
+										reviewed: remark.status == 1,
+										approved: remark.status == 2,
+										failed: remark.status == 3
+									}"
+									>{{ remark.status | statusFilters }}</text
+								>
 							</view>
 						</view>
 						<view class="tui-remarks-content">
@@ -107,7 +114,7 @@
 			<view class="tui-popup-box clearfix">
 				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 					<view class="tui-flex-1">
-						<view class="tui-button" :class="isEmpty ? 'disabled' : 'cancel'" @click="handleShowFereepopup"
+						<view class="tui-button cancel" @click="handleShowFereepopup"
 							>添加记录</view
 						>
 						<view class="tui-button confirm" @click="handleAddRecord">新增咨询人</view>
@@ -229,6 +236,15 @@ export default {
 		
 	},
 	filters: {
+		statusFilters(value) {
+			// 订单来源
+			const map = {
+				1: '待审核',
+				2: '审核通过',
+				3: '审核未通过'
+			}
+			return map[value]
+		},
 		NumFormat: function(value) {
 			//处理金额
 			if (!value) return '0.00'
@@ -777,6 +793,15 @@ page {
 				&.y {
 					width: 60%;
 					padding-left: 24rpx;
+					.reviewed{
+						color: #E15616;
+					}
+					.approved{
+						color: #0DB26D;
+					}
+					.failed{
+						color: #F94B4B;
+					}
 				}
 			}
 		}

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

@@ -68,7 +68,7 @@
 					</view>
 					<view class="tui-remarks-name">
 						<view class="tui-remarks-name-text h">
-							咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
+							咨询人：{{ remark.clubName ? remark.clubName : '' }}
 						</view>
 						<view class="tui-remarks-name-text y">
 							咨询类别：{{ remark.consultBack ? remark.consultBack : '无' }}
@@ -78,7 +78,16 @@
 						<view class="tui-remarks-name-text h">
 							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text>
 						</view>
-						<view class="tui-remarks-name-text y"> 报备状态：<text>审核通过</text> </view>
+						<view class="tui-remarks-name-text y">
+							报备状态：<text
+								:class="{
+									reviewed: remark.status == 1,
+									approved: remark.status == 2,
+									failed: remark.status == 3
+								}"
+								>{{ remark.status | statusFilters }}</text
+							>
+						</view>
 					</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
@@ -86,7 +95,7 @@
 						</text>
 					</view>
 					<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
-						<view class="btn edit" @click.stop="handEditRemark(remark.remarksId)">取消关联</view>
+						<view class="btn edit" @click.stop="cancelReport(remark.remarksId)">取消关联</view>
 					</view>
 				</view>
 				<!--加载loadding-->
@@ -95,19 +104,6 @@
 				<!--加载loadding-->
 			</view>
 		</view>
-		<!-- 取消收藏操作 -->
-		<tui-bottom-popup :radius="false" :mask="false" :show="popupShow">
-			<view class="tui-popup-box clearfix">
-				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
-					<view class="tui-flex-1">
-						<view class="tui-button" @click="handleShowClubpopup">添加已注册客户记录</view>
-					</view>
-					<view class="tui-flex-1">
-						<view class="tui-button-text" @click="handleAllUnder">未注册客户咨询记录 ></view>
-					</view>
-				</view>
-			</view>
-		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
 		<cm-screenDrawer
 			ref="screendrawer"
@@ -116,14 +112,6 @@
 			@handSearchConfirm="handSearchConfirmData"
 		>
 		</cm-screenDrawer>
-		<!-- 添加记录 -->
-		<cm-clubpopup
-			ref="clubpopup"
-			v-if="isClubpopupShow"
-			:show="isClubpopupShow"
-			@handleChoiceaClub="handleChoiceaClubData"
-		>
-		</cm-clubpopup>
 		<!-- 弹窗提示 -->
 		<tui-modal
 			:show="modal"
@@ -174,8 +162,6 @@ export default {
 				}
 			],
 			totalRecord: 0,
-			popupShow: true,
-			popupShow1: false,
 			listQuery: Object.assign({}, defaultListQuery),
 			remarksList: [],
 			scrollTop: 0,
@@ -189,17 +175,22 @@ export default {
 			contentModalText: '', //操作文字提示语句
 			modal: false,
 			handleRemarksId: 0,
-			isClubpopupShow: false,
 			isScreenDrawer: false
 		}
 	},
-	onLoad() {},
+	onLoad(option) {
+		this.listQuery.reportId = option.reportId
+		this.initGetStotage()
+	},
 	filters: {
-		NumFormat: function(value) {
-			//处理金额
-			if (!value) return '0.00'
-			let number = Number(value).toFixed(2)
-			return number
+		statusFilters(value) {
+			// 订单来源
+			const map = {
+				1: '待审核',
+				2: '审核通过',
+				3: '审核未通过'
+			}
+			return map[value]
 		},
 		followupFilters(value) {
 			// 订单来源
@@ -299,26 +290,10 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		deleteRemark(remarksId) {
+		cancelReport(remarksId) {
 			this.handleRemarksId = remarksId
 			this.modal = true
-			this.contentModalText = '确定删除这条记录吗？'
-		},
-		handEditRemark(remarksId) {
-			//跳转修改客户咨询记录
-			this.$api.navigateTo(`/pages/seller/remarks/add?type=edit&remarksId=${remarksId}`)
-		},
-		handleAllUnder() {
-			//跳转未注册客户咨询记录也
-			this.$api.navigateTo('/pages/seller/remarks/record-list')
-		},
-		handleShowClubpopup() {
-			//显示已注册机构弹窗
-			this.isClubpopupShow = true
-		},
-		handleChoiceaClubData(data) {
-			//跳转添加记录
-			this.$api.navigateTo(`/pages/seller/remarks/add?userId=${data.userId}`)
+			this.contentModalText = '确定取消该咨询记录和报备的关联吗？'
 		},
 		handSearchConfirmData(data) {
 			console.log('确定筛选', data)
@@ -342,17 +317,17 @@ export default {
 		handleClick(e) {
 			//确认删除
 			if (e.index == 1) {
-				this.handleDeleteUserLike()
+				this.handleCancelReport()
 			}
 			this.modal = false
 		},
-		handleDeleteUserLike() {
+		handleCancelReport() {
 			//操作删除资料备注
-			this.UserService.getUserClubRemarksDelete({
+			this.UserService.userClubReportDisassociation({
 				remarksId: this.handleRemarksId
 			})
 				.then(response => {
-					this.$util.msg('已删除', 2000, true, 'success')
+					this.$util.msg('操作成功', 2000, true, 'success')
 					setTimeout(() => {
 						this.userClubReportAssociatedList()
 					}, 2000)
@@ -367,7 +342,6 @@ export default {
 				this.isShowClose = true
 			} else {
 				this.isShowClose = false
-				this.listQuery.pageNum = 1
 				this.userClubReportAssociatedList()
 			}
 		},
@@ -401,9 +375,7 @@ export default {
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
-	onShow() {
-		this.initGetStotage()
-	}
+	onShow() {}
 }
 </script>
 
@@ -665,6 +637,15 @@ page {
 				&.y {
 					width: 60%;
 					padding-left: 24rpx;
+					.reviewed{
+						color: #E15616;
+					}
+					.approved{
+						color: #0DB26D;
+					}
+					.failed{
+						color: #F94B4B;
+					}
 				}
 			}
 		}

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

@@ -55,12 +55,12 @@
 								</view>
 							</view>
 							<view class="tui-remarks-text-view">
-								<view class="tui-remarks-text h" v-if="listQuery.manager >= 0">
+								<view class="tui-remarks-text h">
 									<text class="iconfont icon-guanliyuan"></text>管理员：{{
 										remark.leaderName ? remark.leaderName : ''
 									}}
 								</view>
-								<view class="tui-remarks-text y"> {{ remark.addDate }} </view>
+								<view class="tui-remarks-text y"> {{ remark.addTime }} </view>
 							</view>
 						</view>
 					</view>
@@ -76,7 +76,16 @@
 						<view class="tui-remarks-name-text h">
 							意向程度：<text class="red">{{ remark.satisfied | intenActionsFilters }}</text>
 						</view>
-						<view class="tui-remarks-name-text y"> 报备状态：<text>审核通过</text> </view>
+						<view class="tui-remarks-name-text y">
+							报备状态：<text
+								:class="{
+									reviewed: remark.status == 1,
+									approved: remark.status == 2,
+									failed: remark.status == 3
+								}"
+								>{{ remark.status | statusFilters }}</text
+							>
+						</view>
 					</view>
 					<view class="tui-remarks-content">
 						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
@@ -84,7 +93,7 @@
 						</text>
 					</view>
 					<view class="tui-remarks-button" v-if="remark.serviceProviderId === listQuery.serviceProviderId">
-						<view class="btn edit" @click.stop="handEditRemark(remark.remarksId)">取消关联</view>
+						<view class="btn edit" @click.stop="cancelReport(remark.remarksId)">取消关联</view>
 					</view>
 				</view>
 				<!--加载loadding-->
@@ -93,19 +102,6 @@
 				<!--加载loadding-->
 			</view>
 		</view>
-		<!-- 取消收藏操作 -->
-		<tui-bottom-popup :radius="false" :mask="false" :show="popupShow">
-			<view class="tui-popup-box clearfix">
-				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
-					<view class="tui-flex-1">
-						<view class="tui-button" @click="handleShowClubpopup">添加已注册客户记录</view>
-					</view>
-					<view class="tui-flex-1">
-						<view class="tui-button-text" @click="handleAllUnder">未注册客户咨询记录 ></view>
-					</view>
-				</view>
-			</view>
-		</tui-bottom-popup>
 		<!-- 筛选抽屉 -->
 		<cm-screenDrawer
 			ref="screendrawer"
@@ -114,13 +110,6 @@
 			@handSearchConfirm="handSearchConfirmData"
 		>
 		</cm-screenDrawer>
-		<!-- 添加记录 -->
-		<cm-clubpopup
-			ref="clubpopup"
-			v-if="isClubpopupShow"
-			:show="isClubpopupShow"
-			@handleChoiceaClub="handleChoiceaClubData"
-		>
 		</cm-clubpopup>
 		<!-- 弹窗提示 -->
 		<tui-modal
@@ -173,8 +162,6 @@ export default {
 				}
 			],
 			totalRecord: 0,
-			popupShow: true,
-			popupShow1: false,
 			listQuery: Object.assign({}, defaultListQuery),
 			remarksList: [],
 			scrollTop: 0,
@@ -188,11 +175,13 @@ export default {
 			contentModalText: '', //操作文字提示语句
 			modal: false,
 			handleRemarksId: 0,
-			isClubpopupShow: false,
 			isScreenDrawer: false
 		}
 	},
-	onLoad() {},
+	onLoad(option) {
+		this.listQuery.reportId = option.reportId
+		this.initGetStotage()
+	},
 	filters: {
 		NumFormat: function(value) {
 			//处理金额
@@ -231,8 +220,6 @@ export default {
 		...mapMutations(['login', 'logout']),
 		async initGetStotage() {
 			const userInfo = await this.$api.getStorage()
-			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-			this.listQuery.manager = userInfo.manager ? userInfo.manager : 0
 			this.userReportVisitorAssociatedList()
 		},
 		userReportVisitorAssociatedList() {
@@ -298,26 +285,10 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		deleteRemark(remarksId) {
+		cancelReport(remarksId) {
 			this.handleRemarksId = remarksId
 			this.modal = true
-			this.contentModalText = '确定删除这条记录吗？'
-		},
-		handEditRemark(remarksId) {
-			//跳转修改客户咨询记录
-			this.$api.navigateTo(`/pages/seller/remarks/add?type=edit&remarksId=${remarksId}`)
-		},
-		handleAllUnder() {
-			//跳转未注册客户咨询记录也
-			this.$api.navigateTo('/pages/seller/remarks/record-list')
-		},
-		handleShowClubpopup() {
-			//显示已注册机构弹窗
-			this.isClubpopupShow = true
-		},
-		handleChoiceaClubData(data) {
-			//跳转添加记录
-			this.$api.navigateTo(`/pages/seller/remarks/add?userId=${data.userId}`)
+			this.contentModalText = '确定取消该咨询记录和报备的关联吗？'
 		},
 		handSearchConfirmData(data) {
 			console.log('确定筛选', data)
@@ -381,7 +352,7 @@ export default {
 			this.modal = false
 		},
 		details(remarksId) {
-			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
+			this.$api.navigateTo(`/pages/seller/remarks/record-details?remarksId=${remarksId}`)
 		}
 	},
 	onPageScroll(e) {
@@ -694,6 +665,15 @@ page {
 				&.y {
 					width: 60%;
 					padding-left: 24rpx;
+					.reviewed{
+						color: #E15616;
+					}
+					.approved{
+						color: #0DB26D;
+					}
+					.failed{
+						color: #F94B4B;
+					}
 				}
 			}
 		}

pages/seller/remarks/report-add.vue

@@ -35,7 +35,7 @@
 				</view>
 				<view class="tui-remarks-showgoods" v-else>
 					<view class="tui-remarks-goods" v-for="(pros, index) in handleGoods" :key="index">
-						<view class="goods-image"> <image :src="pros.images" mode=""></image> </view>
+						<view class="goods-image"> <image :src="pros.image" mode=""></image> </view>
 						<view class="goods-main">
 							<view class="name"> {{ pros.name }} </view>
 							<view class="shop"> 供应商：{{ pros.shopName }} </view>
@@ -53,11 +53,20 @@
 			<view class="remarks-textarea">
 				<textarea
 					class="textarea"
-					v-model="reportText"
+					v-if="handleType==='1'"
+					v-model="reportClubParams.reportText"
+					value=""
+					placeholder="请输入其他需要说明的内容"
+					maxlength="200"
+					@input="conInput"
+				/>
+				<textarea
+					class="textarea"
+					v-if="handleType==='2'"
+					v-model="reportParams.reportText"
 					value=""
 					placeholder="请输入其他需要说明的内容"
 					maxlength="200"
-					@blur="handleReportText($event)"
 					@input="conInput"
 				/>
 				<text class="limit-text">{{ min }}/{{ max }}</text>
@@ -103,23 +112,22 @@ export default {
 				reportText: ''
 			},
 			reportParams: {
-				serviceProviderId: 0,
+				questionManId: 0,
 				productId: 0,
 				reportText: ''
 			},
-			remarksId: 0,
 			reportInfo: {}
 		}
 	},
 	onLoad(option) {
 		console.log(option)
-		this.remarksId = option.remarksId
 		this.handleType = option.type
 		this.reportInfo = JSON.parse(option.reportInfo)
-		if (this.handleType === 1) {
+		if (this.handleType === '1') {
 			// 机构新增报备
-			this.reportClubParams.clubId = reportInfo.clubId
+			this.reportClubParams.clubId = this.reportInfo.clubId
 		} else {
+			this.reportParams.questionManId = this.reportInfo.questionManId
 		}
 		this.initStorage()
 		this.skeletonShow = false
@@ -128,20 +136,39 @@ export default {
 		...mapMutations(['login']),
 		async initStorage() {
 			const userInfo = await this.$api.getStorage()
-			this.reportClubParams.serviceProviderId = this.reportParams.serviceProviderId = userInfo.serviceProviderId
+			this.reportClubParams.serviceProviderId = userInfo.serviceProviderId
 		},
-		editButtonConfim(){// 确定提交保存
-			switch(this.handleType){
-				case 1: // 机构报备保存
-					userClubReportSave()
+		editButtonConfim() {
+			// 确定提交保存
+			switch (this.handleType) {
+				case '1': // 机构报备保存
+					this.userClubReportSave()
 					break
-				case 2: // 咨询人报备保存
-					userClubReportSave()
+				case '2': // 咨询人报备保存
+					this.userReportVisitorSave()
 					break
 			}
 		},
-		userClubReportSave(){// 机构报备保存
-			this.UserService.userClubReportSave(this.remarksParams)
+		userClubReportSave() {
+			// 机构报备保存
+			this.UserService.userClubReportSave(this.reportClubParams)
+				.then(response => {
+					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
+				})
+		},
+		userReportVisitorSave() {
+			// 未注册客户报备保存
+			this.UserService.userReportVisitorSave(this.reportParams)
 				.then(response => {
 					this.$util.msg('保存成功', 3000, true, 'success')
 					this.isConfirmLoding = false
@@ -165,14 +192,10 @@ export default {
 			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
+			console.log('handleGoods', this.handleGoods)
 		},
 		conInput(e) {
 			//备注文字字数限制

pages/seller/remarks/report-details.vue

@@ -1,42 +1,46 @@
 <template>
 	<view class="container qualifications" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
-		<view class="remarks-content">
-			<view class="list-view-title">
-				<view class="list-view-h1"
-					>机构名称:<text>{{ reportParams.questionMan }}</text></view
-				>
-			</view>
-			<view class="list-view-title">
-				<view class="list-view-h1"
-					>联系人:<text>{{ reportParams.questionMan }}</text></view
-				>
-			</view>
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="remarks-content" v-else>
+			<template v-if="reportParams.clubId && reportParams.clubId > 0">
+				<view class="list-view-title">
+					<view class="list-view-h1"
+						>机构名称:<text>{{ reportParams.clubName }}</text></view
+					>
+				</view>
+				<view class="list-view-title">
+					<view class="list-view-h1"
+						>联系人:<text>{{ reportParams.linkMan }}</text></view
+					>
+				</view>
+			</template>
+			<template v-else>
+				<view class="list-view-title">
+					<view class="list-view-h1">咨询人：{{ reportParams.questionMan }}</view>
+				</view>
+			</template>
 			<view class="list-view-title">
-				<view class="list-view-h1">咨询人：{{ reportParams.questionMan }}</view>
+				<view class="list-view-h1">报备时间：{{ reportParams.addTime }}</view>
 			</view>
-			<view class="list-view-title"> <view class="list-view-h1">报备时间：2020-08-08</view> </view>
 			<view class="list-view-title"> <view class="list-view-h1">报备商品：</view> </view>
 			<view class="tui-remarks-content">
 				<view class="tui-remarks-goods">
-					<view class="goods-image">
-						<image
-							src="https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg"
-							mode=""
-						></image>
-					</view>
+					<view class="goods-image"> <image :src="reportParams.mainImage" mode=""></image> </view>
 					<view class="goods-main">
-						<view class="name">
-							易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水
-						</view>
-						<view class="shop"> 供应商：华熙生物 </view>
+						<view class="name"> {{ reportParams.productName }} </view>
+						<view class="shop"> 供应商：{{ reportParams.shopName }} </view>
 					</view>
 				</view>
 			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1"
-					>报备事由：<text
-						>报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由报备事由</text
-					></view
+					>报备事由：<text>{{ reportParams.reportText }}</text></view
 				>
 			</view>
 		</view>
@@ -46,17 +50,16 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import authorize from '@/common/config/authorize.js'
-import { uploadFileImage, uploadFilePdfDocDocx } from '@/services/public.js'
 
 var isPreviewImg
 export default {
 	data() {
 		return {
 			isIphoneX: this.$store.state.isIphoneX,
+			skeletonShow:true,
 			productActions: [],
 			reportParams: {},
 			reportId: 0,
-			categorys: '产品，二手，耗材'
 		}
 	},
 	onLoad(option) {
@@ -64,37 +67,6 @@ export default {
 		this.reportId = option.reportId
 		this.userReportDetails(this.reportId)
 	},
-	filters: {
-		followupFilters(value) {
-			// 订单来源
-			const map = {
-				1: '跟进中',
-				2: '跟进完成',
-				3: '已放弃'
-			}
-			return map[value]
-		},
-		pinceFilters(value) {
-			// 意向
-			const map = {
-				1: '敏感',
-				2: '适中',
-				3: '不敏感',
-				4: '不明确'
-			}
-			return map[value]
-		},
-		intenActionsFilters(value) {
-			// 意向
-			const map = {
-				1: '意向强烈',
-				2: '意向一般',
-				3: '意向平淡',
-				4: '随便看看'
-			}
-			return map[value]
-		}
-	},
 	methods: {
 		...mapMutations(['login']),
 		userReportDetails(reportId) {
@@ -104,6 +76,9 @@ export default {
 			})
 				.then(response => {
 					this.reportParams = response.data
+					setTimeout(()=>{
+						this.skeletonShow = false
+					},500)
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
@@ -146,31 +121,31 @@ page {
 		width: 100%;
 		height: auto;
 		margin-bottom: 24rpx;
-		.tui-remarks-goods{
+		.tui-remarks-goods {
 			width: 100%;
 			height: 180rpx;
 			box-sizing: border-box;
-			background-color: #F7F7F7;
+			background-color: #f7f7f7;
 			padding: 26rpx;
 			border-radius: 6rpx;
-			.goods-image{
+			.goods-image {
 				width: 128rpx;
 				height: 128rpx;
 				float: left;
-				image{
+				image {
 					width: 128rpx;
 					height: 128rpx;
 					display: block;
 					border-radius: 4rpx;
 				}
 			}
-			.goods-main{
+			.goods-main {
 				width: 522rpx;
 				height: 128rpx;
 				box-sizing: border-box;
 				padding: 0 32rpx;
 				float: right;
-				.name{
+				.name {
 					width: 100%;
 					height: 60rpx;
 					box-sizing: border-box;
@@ -184,7 +159,7 @@ page {
 					-webkit-box-orient: vertical;
 					font-size: 26rpx;
 				}
-				.shop{
+				.shop {
 					line-height: 60rpx;
 					color: #999999;
 					font-size: 26rpx;

pages/seller/remarks/report-list.vue

@@ -35,45 +35,51 @@
 					>
 						<view class="tui-remarks-title">
 							<view class="tui-remarks-title-top">
-								<view class="tui-remarks-time tt"><text class="tags">新分配</text>{{ report.clubName }}</view>
+								<view class="tui-remarks-time tt"><text class="tags" v-if="report.newDeal === 1">新分配</text>{{ report.clubName }}</view>
 							</view>
 							<view class="tui-remarks-title-bot">
 								<view class="tui-remarks-text-view">
-									<view class="tui-remarks-text h"></text>报备人：{{ report.recordName }}</view>
+									<view class="tui-remarks-text h"></text>报备人：{{ report.reportName }}</view>
 									<view class="tui-remarks-text y">
-										{{ report.addDate }}
+										{{ report.addTime }}
 									</view>
 								</view>
 							</view>
 							<view class="tui-remarks-title-icon" :class="{
-										reviewed: report.type == 1,
-										failed: report.type == 2,
-										approved: report.type == 3
+										reviewed: report.status == 1,
+										approved: report.status == 2,
+										failed: report.status == 3
 									}">
+									
 							</view>
 						</view> 
 						<view class="tui-remarks-content">
-							<view class="tui-remarks-goods" v-if="report.product">
+							<view class="tui-remarks-text" v-if="!report.productId">
+								<view class="text">
+									{{ report.reportText }}
+								</view>
+							</view>
+							<view class="tui-remarks-goods" v-else>
 								<view class="goods-image">
 									<image
-										:src="report.product.images"
+										:src="report.mainImage"
 										mode=""
 									></image>
 								</view>
 								<view class="goods-main">
 									<view class="name">
-										{{ report.product.name }}
+										{{ report.productName }}
 									</view>
 									<view class="shop">{{ report.reportText }}</view>
 								</view>
 							</view>
-							<view class="tui-remarks-text" v-else>
-								{{ report.reportText }}
-							</view>
 						</view>
-						<view class="tui-remarks-button">
+						<view class="tui-remarks-button" v-if="report.serviceProviderId === listQuery.serviceProviderId" >
 							<view class="btn edit" @click.stop="handReportDetails(report.reportId)">查看关联咨询记录</view>
-							<view class="btn del" @click.stop="deleteRemark(report.reportId)">删除</view>
+							<view class="btn del" @click.stop="deleteReport(report.reportId)"> 删除</view>
+						</view>
+						<view class="tui-remarks-button" v-else>
+							<view class="btn none" @click.stop="handReportDetails(report.reportId)">查看关联咨询记录</view>
 						</view>
 					</view>
 					<!--加载loadding-->
@@ -140,38 +146,7 @@ export default {
 			popupShow: true,
 			popupShow1: false,
 			listQuery: Object.assign({}, defaultListQuery),
-			reportList: [
-				{
-					clubName:'采美信息技术有限公司',
-					recordName:'吴小研',
-					addDate:'2022-08-10',
-					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product:{
-						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type:1
-				},
-				{
-					clubName:'采美信息技术有限公司',
-					recordName:'吴小研',
-					addDate:'2022-08-10',
-					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product:{
-						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type:2
-				},
-				{
-					clubName:'采美信息技术有限公司',
-					recordName:'吴小研',
-					addDate:'2022-08-10',
-					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product:null,
-					type:3
-				}
-			],
+			reportList: [],
 			scrollTop: 0,
 			isEmpty: false,
 			loadding: false,
@@ -184,7 +159,7 @@ export default {
 			modal: false,
 			questionMan: '',
 			questionManId: '',
-			handleRemarksId: 0,
+			handleReportId: 0,
 		}
 	},
 	onLoad(option) {
@@ -263,8 +238,8 @@ export default {
 					console.log('=======>查询列表异常~')
 				})
 		},
-		deleteRemark(remarksId) {
-			this.handleRemarksId = remarksId
+		deleteReport(reportId) {
+			this.handleReportId = reportId
 			this.modal = true
 			this.contentModalText = '确定删除该报备吗？'
 		},
@@ -275,14 +250,14 @@ export default {
 		handleClick(e) {
 			//操作
 			if (e.index == 1) {
-				this.handleDeleteUserLike()
+				this.handleDelete()
 			}
 			this.modal = false
 		},
-		handleDeleteUserLike() {
+		handleDelete() {
 			//操作删除资料备注
-			this.UserService.getUserRemarksVisitDelete({
-				remarksId: this.handleRemarksId
+			this.UserService.userClubReportDelete({
+				reportId: this.handleReportId
 			})
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
@@ -300,7 +275,6 @@ export default {
 				this.isShowClose = true
 			} else {
 				this.isShowClose = false
-				this.listQuery.pageNum = 1
 				this.userClubReportReportRemarks()
 			}
 		},
@@ -527,16 +501,20 @@ page {
 				box-sizing: border-box;
 				background-color: #F7F7F7;
 				padding: 26rpx;
-				border-radius: 6rpx;
-				line-height: 42rpx;
-				color: #333333;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				display: -webkit-box;
-				-webkit-line-clamp: 3;
-				line-clamp: 3;
-				-webkit-box-orient: vertical;
-				font-size: 30rpx;
+				.text{
+					width: 100%;
+					height: 100%;
+					box-sizing: border-box;
+					line-height: 42rpx;
+					color: #333333;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 3;
+					line-clamp: 3;
+					-webkit-box-orient: vertical;
+					font-size: 30rpx;
+				}
 			}
 			.tui-remarks-goods{
 				width: 100%;
@@ -604,6 +582,10 @@ page {
 				font-size: $font-size-34;
 				float: left;
 				font-weight: bold;
+				&.none{
+					width: 100%;
+					color: #1890F9;
+				}
 				&.edit{
 					color: #1890F9;
 					border-right: 1px solid #E1E1E1;

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

@@ -35,45 +35,50 @@
 					>
 						<view class="tui-remarks-title">
 							<view class="tui-remarks-title-top">
-								<view class="tui-remarks-time tt">{{ report.clubName }}</view>
+								<view class="tui-remarks-time tt">{{ report.questionMan }}</view>
 							</view>
 							<view class="tui-remarks-title-bot">
 								<view class="tui-remarks-text-view">
-									<view class="tui-remarks-text h"></text>报备人：{{ report.recordName }}</view>
+									<view class="tui-remarks-text h"></text>报备人：{{ report.reportName }}</view>
 									<view class="tui-remarks-text y">
-										{{ report.addDate }}
+										{{ report.addTime }}
 									</view>
 								</view>
 							</view>
 							<view class="tui-remarks-title-icon" :class="{
-										reviewed: report.type == 1,
-										failed: report.type == 2,
-										approved: report.type == 3
+										reviewed: report.status == 1,
+										approved: report.status == 2,
+										failed: report.status == 3
 									}">
 							</view>
 						</view> 
 						<view class="tui-remarks-content">
-							<view class="tui-remarks-goods" v-if="report.product">
+							<view class="tui-remarks-text" v-if="!report.productId">
+								<view class="text">
+									{{ report.reportText }}
+								</view>
+							</view>
+							<view class="tui-remarks-goods" v-else>
 								<view class="goods-image">
 									<image
-										:src="report.product.images"
+										:src="report.mainImage"
 										mode=""
 									></image>
 								</view>
 								<view class="goods-main">
 									<view class="name">
-										{{ report.product.name }}
+										{{ report.productName }}
 									</view>
 									<view class="shop">{{ report.reportText }}</view>
 								</view>
 							</view>
-							<view class="tui-remarks-text" v-else>
-								{{ report.reportText }}
-							</view>
 						</view>
-						<view class="tui-remarks-button">
+						<view class="tui-remarks-button" v-if="report.serviceProviderId === listQuery.serviceProviderId" >
 							<view class="btn edit" @click.stop="handReportDetails(report.reportId)">查看关联咨询记录</view>
-							<view class="btn del" @click.stop="deleteRemark(report.reportId)">删除</view>
+							<view class="btn del" @click.stop="deleteReport(report.reportId)"> 删除</view>
+						</view>
+						<view class="tui-remarks-button" v-else>
+							<view class="btn none" @click.stop="handReportDetails(report.reportId)">查看关联咨询记录</view>
 						</view>
 					</view>
 					<!--加载loadding-->
@@ -100,9 +105,6 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
-import cmRefereepopup from '@/components/cm-module/cm-seller/cm-refereepopup'
-import cmClubmodal from '@/components/cm-module/cm-seller/cm-clubmodal'
-import cmScreenDrawer from '@/components/cm-module/cm-seller/cm-screen-drawer'
 
 const defaultListQuery = {
 	manager:0,
@@ -112,11 +114,6 @@ const defaultListQuery = {
 	pageSize: 10
 }
 export default {
-	components: {
-		cmRefereepopup,
-		cmClubmodal,
-		cmScreenDrawer
-	},
 	data() {
 		return {
 			StaticUrl: this.$Static,
@@ -137,41 +134,8 @@ export default {
 				}
 			],
 			totalRecord: 0,
-			popupShow: true,
-			popupShow1: false,
 			listQuery: Object.assign({}, defaultListQuery),
-			reportList: [
-				{
-					clubName:'采美信息技术有限公司',
-					recordName:'吴小研',
-					addDate:'2022-08-10',
-					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product:{
-						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type:1
-				},
-				{
-					clubName:'采美信息技术有限公司',
-					recordName:'吴小研',
-					addDate:'2022-08-10',
-					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product:{
-						images:'https://img.caimei365.com/group1/M00/03/FC/rB-lGGInLUKAJAR0AAOvlb8lQKk394.jpg',
-						name:'易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水易可美贻贝粘蛋白私密修复精华水'
-					},
-					type:2
-				},
-				{
-					clubName:'采美信息技术有限公司',
-					recordName:'吴小研',
-					addDate:'2022-08-10',
-					reportText:'请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明请填写报备说明',
-					product:null,
-					type:3
-				}
-			],
+			reportList: [],
 			scrollTop: 0,
 			isEmpty: false,
 			loadding: false,
@@ -184,7 +148,7 @@ export default {
 			modal: false,
 			questionMan: '',
 			questionManId: '',
-			handleRemarksId: 0,
+			handleReportId: 0,
 		}
 	},
 	onLoad(option) {
@@ -195,13 +159,11 @@ export default {
 	},
 	methods: {
 		...mapMutations(['login', 'logout']),
-		async init() {
+		async initGetlist() {
 			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.userReportVisitorRemarks()
+			this.listQuery.manager = userInfo.manager ? userInfo.manager : 0
+			this.userReportVisitorRemarks()
 		},
 		userReportVisitorRemarks() {
 			this.reportList = []
@@ -266,14 +228,14 @@ export default {
 					console.log('=======>查询列表异常~')
 				})
 		},
-		deleteRemark(remarksId) {
-			this.handleRemarksId = remarksId
+		deleteReport(reportId) {
+			this.handleReportId = reportId
 			this.modal = true
 			this.contentModalText = '确定删除该报备吗？'
 		},
 		handReportDetails(reportId) {
-			//跳转报备详情
-			this.$api.navigateTo(`/pages/seller/remarks/relation-visitor-list?id=${reportId}`)
+			//跳转报备关联记录
+			this.$api.navigateTo(`/pages/seller/remarks/relation-visitor-list?reportId=${reportId}`)
 		},
 		handSearchConfirmData(data){
 			//确定筛选
@@ -288,39 +250,6 @@ export default {
 			console.log('确定筛选',this.listQuery)
 			this.userReportVisitorRemarks()
 		},
-		handleShowClubpopup() {
-			//跳转选择咨询人
-			this.$api.navigateTo('/pages/seller/remarks/customer-list')
-		},
-		handleChoiceaConsultData(data){// 选择咨询人添加记录
-			//跳转添加记录
-			this.$api.navigateTo(`/pages/seller/remarks/add-record?type=add&questionManId=${data.questionManId}&questionMan=${
-					data.questionMan
-				}`)
-		},
-		handleChoiceaTextData(data) {// 新增咨询人监听时间
-			console.log('data',data)
-			this.handleSaveVisitor(data)
-		},
-		handleSaveVisitor(data) {
-			// 添加咨询人
-			this.UserService.getUserClubVisitorSave({
-				name: data,
-				serviceProviderId: this.listQuery.serviceProviderId
-			})
-				.then(response => {
-					setTimeout(() => {
-						this.$api.navigateTo(
-							`/pages/seller/remarks/add-record?questionManId=${response.data.questionManId}&questionMan=${
-								response.data.questionMan
-							}`
-						)
-					}, 1000)
-				})
-				.catch(error => {
-					console.log('=======>添加咨询人失败~')
-				})
-		},
 		handleClick(e) {
 			//取消收藏
 			if (e.index == 1) {
@@ -330,8 +259,8 @@ export default {
 		},
 		handleDeleteUserLike() {
 			//操作删除资料备注
-			this.UserService.getUserRemarksVisitDelete({
-				remarksId: this.handleRemarksId
+			this.UserService.userClubReportDelete({
+				reportId: this.handleReportId
 			})
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
@@ -363,8 +292,8 @@ export default {
 		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) {
@@ -385,7 +314,7 @@ export default {
 	},
 	
 	onShow() {
-		this.init()
+		this.initGetlist()
 	}
 }
 </script>
@@ -653,6 +582,10 @@ page {
 				font-size: $font-size-34;
 				float: left;
 				font-weight: bold;
+				&.none{
+					width: 100%;
+					color: #1890F9;
+				}
 				&.edit{
 					color: #1890F9;
 					border-right: 1px solid #E1E1E1;

services/config.env.js

@@ -3,8 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
-    // URL_CONFIG = 'http://192.168.2.180:18002' //超超联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com'
+    URL_CONFIG = 'http://192.168.2.180:18002' //超超联调地址
+    // URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境

services/user.service.js

@@ -386,7 +386,7 @@ export default class UserService {
         return this.AjaxService.get({
             url: '/user/club/remarks/detail',
             data,
-            isLoading: true,
+            isLoading: false,
 
         })
     }
@@ -605,6 +605,17 @@ export default class UserService {
 	        isLoading: false,
 	    })
     }
+    /**
+	 *@删除机构报备记录
+	 *@param  reportId：: 报备Id
+	 */
+    userClubReportDelete (data = {}) {
+	    return this.AjaxService.post({
+	        url:'/user/club/report/delete',
+	        data,
+	        isLoading: false,
+	    })
+    }
     /**
 	 *@报备详情
 	 *@param  reportId: 报备Id
@@ -613,7 +624,7 @@ export default class UserService {
 	    return this.AjaxService.get({
 	        url:'/user/club/report/details',
 	        data,
-	        isLoading: true,
+	        isLoading: false,
 	    })
     }
     /**
@@ -633,6 +644,8 @@ export default class UserService {
 	 *@单个咨询人报备列表
 	 *@param  questionManId：: 咨询人Id
 	 *@param  keyWord: 关键词
+	 *@param  pageNum: 页码
+	 *@param  pageSize:	条数
 	 */
     userReportVisitorList (data = {}) {
 	    return this.AjaxService.get({