commit -m 报备

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

@@ -172,7 +172,7 @@ export default {
 			})
 		},
 		details(reportId) {
-			this.$api.navigateTo(`/pages/seller/remarks/report-details?reportId=${reportId}`)
+			this.$api.navigateTo(`/pages/seller/remarks/report-details?type=${this.popupType}&reportId=${reportId}`)
 		},
 		checkedCoupon(idx) {
 			// 选择商品
@@ -418,7 +418,7 @@ export default {
 						}
 					}
 					.tui-remarks-goods {
-						width: 646rpx;
+						width: 606rpx;
 						height: 168rpx;
 						float: left;
 						box-sizing: border-box;
@@ -470,7 +470,7 @@ export default {
 						}
 					}
 					.list-cell-btn {
-						width: 40rpx;
+						width: 80rpx;
 						height: 168rpx;
 						float: right;
 						.checkbox {

pages/seller/club/club-info.vue

@@ -34,8 +34,8 @@
 						>手机号：<text>{{ clubInfo.contractMobile }}</text></view
 					>
 				</view>
-				<view class="info-main">
-					<view class="info-h1">注册信息</view>
+				<view class="info-main" v-if="clubInfo.userIdentity === 2">
+					<view class="info-h1">升级信息</view>
 					<view class="info-p"
 						>机构名称：<text>{{ clubInfo.name }}</text></view
 					>
@@ -69,13 +69,13 @@
 				</view>
 				<view class="info-main">
 					<view class="info-h1">其他信息</view>
-					<view class="info-p"
+					<view class="info-p" v-if="clubInfo.contractPhone"
 						>固定电话：<text>{{ clubInfo.contractPhone }}</text></view
 					>
-					<view class="info-p"
+					<view class="info-p" v-if="clubInfo.fax"
 						>传真：<text>{{ clubInfo.fax }}</text></view
 					>
-					<view class="info-p"
+					<view class="info-p" v-if="clubInfo.profile"
 						>公司介绍：<text>{{ clubInfo.profile }}</text></view
 					>
 				</view>
@@ -91,7 +91,8 @@ export default {
 		return {
 			skeletonShow: true,
 			clubId: 0,
-			saleName: ''
+			saleName: '',
+			clubInfo:{}
 		}
 	},
 	filters: {},

pages/seller/remarks/add-record.vue

@@ -355,6 +355,8 @@ export default {
 				this.remarksParams.fileList = data.fileList
 				this.remarksParams.imageList = data.imageList
 				this.remarksParams.consult = data.consult
+				this.remarksParams.productId = data.productId
+				this.remarksParams.reportId = data.reportId
 				this.checkedCategorysList = data.consult.split(',').map(i => parseInt(i, 0))
 				this.categorys = this.categorys.map((el, index) => {
 					if(data.consult.includes(el.id)){
@@ -364,6 +366,15 @@ export default {
 					}
 					return el
 				})
+				if(data.productId){
+					let pro = {
+						image:data.mainImage,
+						name:data.productName,
+						shopName:data.shopName
+					}
+					this.handleGoods.push(pro)
+				}
+				this.reportText = data.reportText ? data.reportText : ''
 				this.priceFlagText = this.pinceFilters(data.pinceSensitve)
 				this.intenFlagText = this.intenActionsFilters(data.satisfied)
 				this.followStateText = this.followupFilters(data.followup)
@@ -505,6 +516,10 @@ export default {
 		},
 		handleShowReportPopup(){
 			// 显示报备弹窗
+			if (this.remarksParams.reportId) {
+				this.$util.msg('请取消已有关联后再重新关联报备', 2000)
+				return
+			}
 			this.isReportpopup = true
 		},
 		handleShowGoodPopup() {

pages/seller/remarks/add.vue

@@ -392,6 +392,8 @@ export default {
 					this.remarksParams.followup = data.followup
 					this.remarksParams.fileList = data.fileList
 					this.remarksParams.imageList = data.imageList
+					this.remarksParams.productId = data.productId
+					this.remarksParams.reportId = data.reportId
 					if (this.handleType == 'edit') {
 						this.remarksParams.questionMan = data.questionMan
 						this.remarksParams.consult = data.consult
@@ -405,6 +407,15 @@ export default {
 							return el
 						})
 					}
+					if(data.productId){
+						let pro = {
+							image:data.mainImage,
+							name:data.productName,
+							shopName:data.shopName
+						}
+						this.handleGoods.push(pro)
+					}
+					this.reportText = data.reportText ? data.reportText : ''
 					this.priceFlagText = this.pinceFilters(data.pinceSensitve)
 					this.intenFlagText = this.intenActionsFilters(data.satisfied)
 					this.followStateText = this.followupFilters(data.followup)
@@ -555,6 +566,10 @@ export default {
 		},
 		handleShowReportPopup() {
 			// 显示报备弹窗
+			if (this.remarksParams.reportId) {
+				this.$util.msg('请取消已有关联后再重新关联报备', 2000)
+				return
+			}
 			this.isReportpopup = true
 		},
 		handleShowGoodPopup() {
@@ -690,7 +705,7 @@ page {
 }
 .remarks-content-club {
 	width: 100%;
-	height: 252rpx;
+	height: 288rpx;
 	padding: 24rpx;
 	box-sizing: border-box;
 	border-bottom: 20rpx solid #f7f7f7;

pages/seller/remarks/list.vue

@@ -46,8 +46,11 @@
 				>
 					<view class="tui-remarks-title">
 						<view class="tui-remarks-title-top">
-							<view class="tui-remarks-time tt"
-								><text class="tags" v-if="remark.newDeal === 1">新分配</text>{{ remark.clubName }}</view
+							<view class="tui-remarks-time tt" :style="{ paddingLeft: remark.newDeal === 1 ? '90rpx' : '0rpx'  }"
+								>
+								<text class="tags" v-if="remark.newDeal === 1">新分配</text>
+								{{ remark.clubName }}
+								</view
 							>
 							<view class="tui-remarks-time sm" v-if="remark.followup">
 								<text
@@ -593,10 +596,13 @@ page {
 				width: 100%;
 				height: 56rpx;
 				line-height: 56rpx;
+				float: left;
 				.tui-remarks-time {
 					float: left;
+					box-sizing: border-box;
+					position: relative;
 					&.tt {
-						width: 60%;
+						width: 58%;
 						font-size: $font-size-32;
 						color: #333333;
 						text-align: left;
@@ -616,10 +622,10 @@ page {
 							background-color: #f94b4b;
 							color: #ffffff;
 							text-align: center;
-							float: left;
-							margin-right: 10rpx;
-							margin-top: 10rpx;
 							font-weight: normal;
+							position: absolute;
+							left: 0;
+							top: 10rpx;
 						}
 					}
 					&.sm {
@@ -663,6 +669,7 @@ page {
 			.tui-remarks-title-bot {
 				width: 100%;
 				height: auto;
+				float: left;
 				.tui-remarks-text-view {
 					width: 100%;
 					height: 48rpx;

pages/seller/remarks/report-details.vue

@@ -25,6 +25,9 @@
 					<view class="list-view-h1">咨询人：{{ reportParams.questionMan }}</view>
 				</view>
 			</template>
+			<view class="list-view-title">
+				<view class="list-view-h1">报备人：{{ reportParams.reportName }}</view>
+			</view>
 			<view class="list-view-title">
 				<view class="list-view-h1">报备时间：{{ reportParams.addTime }}</view>
 			</view>
@@ -65,12 +68,17 @@ export default {
 	onLoad(option) {
 		console.log(option)
 		this.reportId = option.reportId
-		this.userReportDetails(this.reportId)
+		if(option.type === '1'){
+			this.userReportDetails(this.reportId)
+		}else{
+			this.userReportVisitorDetails(this.reportId)
+		}
+		
 	},
 	methods: {
 		...mapMutations(['login']),
 		userReportDetails(reportId) {
-			//报备详情
+			//注册机构报备详情
 			this.UserService.userReportDetails({
 				reportId: reportId
 			})
@@ -83,6 +91,21 @@ export default {
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
 				})
+		},
+		userReportVisitorDetails(reportId) {
+			//未注册咨询人报备详情
+			this.UserService.userReportVisitorDetails({
+				reportId: reportId
+			})
+				.then(response => {
+					this.reportParams = response.data
+					setTimeout(()=>{
+						this.skeletonShow = false
+					},500)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
 		}
 	},
 	onShow() {}

pages/seller/remarks/report-list.vue

@@ -35,7 +35,10 @@
 					>
 						<view class="tui-remarks-title">
 							<view class="tui-remarks-title-top">
-								<view class="tui-remarks-time tt"><text class="tags" v-if="report.newDeal === 1">新分配</text>{{ report.clubName }}</view>
+								<view class="tui-remarks-time tt" :style="{ paddingLeft: report.newDeal === 1 ? '90rpx' : '0rpx'  }">
+									<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">
@@ -289,7 +292,7 @@ export default {
 			this.modal = false
 		},
 		details(reportId) {
-			this.$api.navigateTo(`/pages/seller/remarks/report-details?reportId=${reportId}`)
+			this.$api.navigateTo(`/pages/seller/remarks/report-details?type=1&reportId=${reportId}`)
 		}
 	},
 	onPageScroll(e) {
@@ -430,6 +433,7 @@ page {
 				line-height: 56rpx;
 				.tui-remarks-time {
 					float: left;
+					position: relative;
 					&.tt {
 						width: 70%;
 						font-size: $font-size-32;
@@ -448,13 +452,13 @@ page {
 							border-radius: 8rpx;
 							line-height: 36rpx;
 							font-size: 22rpx;
-							background-color: #F94B4B;
+							background-color: #f94b4b;
 							color: #ffffff;
 							text-align: center;
-							float: left;
-							margin-right: 10rpx;
-							margin-top: 10rpx;
 							font-weight: normal;
+							position: absolute;
+							left: 0;
+							top: 10rpx;
 						}
 					}
 				}

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

@@ -293,7 +293,7 @@ export default {
 			this.modal = false
 		},
 		details(reportId) {
-			this.$api.navigateTo(`/pages/seller/remarks/report-details?reportId=${reportId}`)
+			this.$api.navigateTo(`/pages/seller/remarks/report-details?type=2&reportId=${reportId}`)
 		}
 	},
 	onPageScroll(e) {

services/config.env.js

@@ -4,8 +4,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 = 'https://core.caimei365.com'
+    // URL_CONFIG = 'https://core-b.caimei365.com'
+    URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'

services/user.service.js

@@ -617,7 +617,7 @@ export default class UserService {
 	    })
     }
     /**
-	 *@报备详情
+	 *@注册机构报备详情
 	 *@param  reportId: 报备Id
 	 */
     userReportDetails (data = {}) {
@@ -627,6 +627,17 @@ export default class UserService {
 	        isLoading: false,
 	    })
     }
+    /**
+	 *@未注册咨询人报备详情
+	 *@param  reportId: 报备Id
+	 */
+    userReportVisitorDetails (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/user/club/report/visitor/details',
+	        data,
+	        isLoading: false,
+	    })
+    }
     /**
 	 *@未注册客户咨询人新建报备
 	 *@param  questionManId：: 协销咨询人Id