Ross精准用户搜集

components/cm-module/cm-ross/cm-ross-popup.vue

@@ -0,0 +1,206 @@
+<template name="cm-parameter">
+	<!-- 相关规格 -->
+	<tui-bottom-popup :radius="false" :show="popupShow">
+		<view class="tui-popup-box clearfix">
+			<view class="tui-popup-close" @click.stop="hidePopup">
+				<text class="iconfont icon-iconfontguanbi"></text>
+			</view>
+			<view class="tui-popup-main" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+				<view class="tui-popup-from">
+					<input
+						class="input"
+						type="text"
+						v-model="consultParams.consultName"
+						@input="handleInputName"
+						placeholder="请输入名字"
+						placeholder-style="color:#FFFFFF;"
+						maxlength="10"
+					/>
+				</view>
+				<view class="tui-popup-from none">
+					<input
+						class="input"
+						type="text"
+						v-model="consultParams.consultMobile"
+						@input="handleInputPhone"
+						placeholder="请输入手机号"
+						placeholder-style="color:#FFFFFF;"
+						maxlength="11"
+					/>
+				</view>
+			</view>
+			<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+				<view class="tui-modal-flex">
+					<button class="tui-modal-button" :class="isDisabled ? 'disabled' : ''" @click="handleSubmit">
+						提交
+					</button>
+				</view>
+				<view class="tui-modal-text">
+					<view class="tui-modal-left" @click.stop="this.$api.navigateTo('/pages/login/register-select')">立即注册</view>
+					<view class="tui-modal-right" @click.stop="this.$api.navigateTo('/pages/login/login')">登录</view>
+				</view>
+			</view>
+		</view>
+	</tui-bottom-popup>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+	name: 'cm-ross-popup',
+	props: {
+		popupShow: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			userId: 0, // 用户Id
+			consultParams: {
+				ip:'',
+				createTime:'',
+				consultMobile: '',
+				consultName: '',
+				isClick:1
+			},
+			isDisabled: true
+		}
+	},
+	created() {
+		this.initData()
+	},
+	computed: {
+		...mapState(['hasLogin'])
+	},
+	methods: {
+		async initData(data) {
+			const userInfo = await this.$api.getStorage()
+			this.userId = userInfo.userId ? userInfo.userId : 0
+		},
+		handleInputName(e) {
+			this.consultParams.name = e.detail.value
+			this.handldeCheckInput()
+		},
+		handleInputPhone(e) {
+			this.consultParams.phone = e.detail.value
+			this.handldeCheckInput()
+		},
+		handldeCheckInput() {
+			if (this.consultParams.name !== '' && this.consultParams.phone !== '') {
+				this.isDisabled = false
+			} else {
+				this.isDisabled = true
+			}
+		},
+		handleSubmit() {
+			// 提交联系人信息
+			if (this.isDisabled) {
+				return
+			}
+			this.userInformationInsertRoos(this.consultParams)
+		},
+		userInformationInsertRoos(params){
+			// 游客关闭广告弹窗
+			this.UserService.userInformationInsertRoos(params)
+				.then(response => {
+					this.$parent.showRossHtml = false
+				})
+				.catch(error => {
+					console.log('游客关闭广告弹窗失败~')
+				})
+		},
+		hidePopup() {
+			this.userInformationInsertRoos(this.consultParams)
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.tui-popup-box {
+	width: 100%;
+	height: 852rpx;
+	background: url(https://static.caimei365.com/app/img/ross/ross-bg@3x.png) no-repeat;
+	background-size: cover;
+	padding: 330rpx 75rpx 0 75rpx;
+	box-sizing: border-box;
+	.tui-popup-close{
+		width: 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		position: absolute;
+		top: 0;
+		right: 0;
+		.icon-iconfontguanbi{
+			color: #ffffff;
+			font-size: 40rpx;
+		}
+	}
+	.tui-popup-main{
+		width: 100%;
+		height: auto;
+		.tui-popup-from{
+			width: 100%;
+			height: 80rpx;
+			margin-bottom: 30rpx;
+			&.none{
+				margin-bottom: 0;
+			}
+			.input{
+				width: 100%;
+				height: 80rpx;
+				box-sizing: border-box;
+				line-height: 80rpx;
+				font-size: 28rpx;
+				color: #ffffff;
+				border-bottom: 1px solid #ffffff;
+			}
+		}
+	}
+}
+.tui-popup-btn {
+	width: 100%;
+	float: left;
+	.tui-modal-flex {
+		width: 100%;
+		height: 84rpx;
+		margin-top: 40rpx;
+		display: flex;
+		.tui-modal-button {
+			flex: 1;
+			line-height: 84rpx;
+			font-size: $font-size-28;
+			text-align: center;
+			border-radius: 42rpx;
+			padding: 0;
+			margin: 0 15rpx;
+			box-sizing: border-box;
+			background: #202020;
+			color: #ffffff;
+			&.disabled {
+				background: #cbcbcb;
+			}
+		}
+	}
+	.tui-modal-text{
+		width: 100%;
+		height: 68rpx;
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		.tui-modal-left{
+			float: left;
+			line-height: 68rpx;
+			font-size: 28rpx;
+			color: #ffffff;
+		}
+		.tui-modal-right{
+			float: right;
+			line-height: 68rpx;
+			font-size: 28rpx;
+			color: #ffffff;
+		}
+	}
+}
+</style>

components/cm-module/homeIndex/pageSpecial.vue

@@ -3,18 +3,34 @@
 		<view class="container-pages clearfix">
 			<scroll-view scroll-x>
 				<view class="tui-goods__list">
+					<view class="tui-goods__item ross" v-if="isRossShow">
+						<view class="tui-goods__ross" @click="this.$api.navigateTo('/pages/supplier/user/my-shop?shopId=1378')">
+							<image class="ross-image" src="https://static.caimei365.com/app/img/ross/ross-image@3x.jpg" mode=""></image>
+						</view>
+					</view>
 					<view class="tui-goods__item" v-if="tempData.liveList != ''">
 						<view class="tui-group-name" @click="LiveGoPath">
 							<view class="tui-group-title"><text>采美LIVE</text></view>
 							<view class="iconfont icon-xiayibu"></view>
 						</view>
-						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(live, flIndex) in tempData.liveList" :key="flIndex" @click="LiveGoPathPros(live)">
+						<view
+							class="tui-goods__main"
+							:class="flIndex == 0 ? 'one' : ''"
+							v-for="(live, flIndex) in tempData.liveList"
+							:key="flIndex"
+							@click="LiveGoPathPros(live)"
+						>
 							<view class="tui-goods__imgbox" v-if="flIndex === 0">
 								<image :src="live.homePageImage" mode="" class="tui-goods__img"></image>
 								<view class="tui-goods__name">{{ live.liveTitle }}</view>
 								<view class="tui-goods__statu">
 									<text class="iconfont icon-weikaishi" v-if="live.liveStatus == 1"></text>
-									<image :src="iconLive" mode="widthFix" class="icon-live" v-if="live.liveStatus == 2"></image>
+									<image
+										:src="iconLive"
+										mode="widthFix"
+										class="icon-live"
+										v-if="live.liveStatus == 2"
+									></image>
 									<text class="iconfont icon-jieshu" v-if="live.liveStatus == 3"></text>
 									<text>{{ live.liveStatus | statusType }}</text>
 								</view>
@@ -27,7 +43,13 @@
 							<view class="tui-group-title"><text>最新活动</text></view>
 							<view class="iconfont icon-xiayibu"></view>
 						</view>
-						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(cmImage, flIndex) in tempData.cmImageList" :key="flIndex" @click="NewActivityListPath(cmImage)">
+						<view
+							class="tui-goods__main"
+							:class="flIndex == 0 ? 'one' : ''"
+							v-for="(cmImage, flIndex) in tempData.cmImageList"
+							:key="flIndex"
+							@click="NewActivityListPath(cmImage)"
+						>
 							<view class="tui-goods__imgbox" v-if="flIndex === 0">
 								<image :src="cmImage.homePageImage" mode="" class="tui-goods__img"></image>
 								<view class="tui-goods__name">{{ cmImage.title }}</view>
@@ -36,11 +58,20 @@
 						</view>
 					</view>
 					<view class="tui-goods__item" v-if="tempData.infoList != ''">
-						<view class="tui-group-name" @click="NavArticlePath('https://www.caimei365.com/info/center-3-1.html')">
+						<view
+							class="tui-group-name"
+							@click="NavArticlePath('https://www.caimei365.com/info/center-3-1.html')"
+						>
 							<view class="tui-group-title"><text>热门文章</text></view>
 							<view class="iconfont icon-xiayibu"></view>
 						</view>
-						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(info, flIndex) in tempData.infoList" :key="flIndex" @click="NavArticlePath(info.link)">
+						<view
+							class="tui-goods__main"
+							:class="flIndex == 0 ? 'one' : ''"
+							v-for="(info, flIndex) in tempData.infoList"
+							:key="flIndex"
+							@click="NavArticlePath(info.link)"
+						>
 							<view class="tui-goods__imgbox" v-if="flIndex === 0">
 								<image :src="info.homePageImage" mode="" class="tui-goods__img"></image>
 								<view class="tui-goods__name">{{ info.title }}</view>
@@ -48,20 +79,29 @@
 							<view class="tui-goods__text" v-if="flIndex > 0">{{ info.title }}</view>
 						</view>
 					</view>
-                    <!-- 采美百科 -->
-                    <view class="tui-goods__item" v-if="tempData.baikeList.length > 0">
-                    	<view class="tui-group-name" @click="NavArticlePath('https://www.caimei365.com/encyclopedia/product.html')">
-                    		<view class="tui-group-title"><text>热门百科</text></view>
-                    		<view class="iconfont icon-xiayibu"></view>
-                    	</view>
-                    	<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(item, flIndex) in tempData.baikeList" :key="flIndex" @click="NavArticlePath(item.link)">
-                    		<view class="tui-goods__imgbox" v-if="flIndex === 0">
-                    			<image :src="item.image" mode="" class="tui-goods__img"></image>
-                    			<view class="tui-goods__name">{{ item.name }}</view>
-                    		</view>
-                    		<view class="tui-goods__text" v-if="flIndex > 0">{{ item.name }}</view>
-                    	</view>
-                    </view>
+					<!-- 采美百科 -->
+					<view class="tui-goods__item" v-if="tempData.baikeList.length > 0">
+						<view
+							class="tui-group-name"
+							@click="NavArticlePath('https://www.caimei365.com/encyclopedia/product.html')"
+						>
+							<view class="tui-group-title"><text>热门百科</text></view>
+							<view class="iconfont icon-xiayibu"></view>
+						</view>
+						<view
+							class="tui-goods__main"
+							:class="flIndex == 0 ? 'one' : ''"
+							v-for="(item, flIndex) in tempData.baikeList"
+							:key="flIndex"
+							@click="NavArticlePath(item.link)"
+						>
+							<view class="tui-goods__imgbox" v-if="flIndex === 0">
+								<image :src="item.image" mode="" class="tui-goods__img"></image>
+								<view class="tui-goods__name">{{ item.name }}</view>
+							</view>
+							<view class="tui-goods__text" v-if="flIndex > 0">{{ item.name }}</view>
+						</view>
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -69,293 +109,317 @@
 </template>
 
 <script>
-	import { mapState,mapMutations} from 'vuex'
-	import cmsMixins from '@/mixins/cmsMixins.js'
-	export default{
-		mixins: [cmsMixins],
-		name:'pagesProduct',
-		props:{
-			templateData:{
-				type:Object
+import { mapState, mapMutations } from 'vuex'
+import cmsMixins from '@/mixins/cmsMixins.js'
+export default {
+	mixins: [cmsMixins],
+	name: 'pagesProduct',
+	props: {
+		templateData: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			tempData: {},
+			iconLive: 'https://static.caimei365.com/app/img/icon/icon-live.gif'
+		}
+	},
+	filters: {
+		statusType: function(value) {
+			switch (value) {
+				case 1:
+					return '未开始'
+					break
+				case 2:
+					return '直播中'
+					break
+				case 3:
+					return '看回放'
+					break
 			}
 		},
-		data() {
-			return{
-				tempData:{},
-				iconLive:'https://static.caimei365.com/app/img/icon/icon-live.gif'
+		NumFormat: function(value) {
+			//处理金额
+			return Number(value).toFixed(2)
+		}
+	},
+	created() {
+		this.initData(this.templateData)
+	},
+	computed: {
+		...mapState(['isRossShow'])
+	},
+	methods: {
+		initData(data) {
+			this.tempData = data
+		},
+		NavArticlePath(LINK) {
+			// 友盟埋点首页文章模块点击
+			if (process.env.NODE_ENV != 'development') {
+				this.$uma.trackEvent('Um_Event_HomeArticleTemplateClick', {
+					Um_Key_ArticleLink: `${LINK}`,
+					Um_Key_PageName: '首页文章模块',
+					Um_Key_SourcePage: '商城首页'
+				})
 			}
+			// 采美埋点首页文章模块数据统计
+			this.cmsSysStatistics(4)
+			this.$api.navigateTo(`/pages/h5/article/path?link=${LINK}`)
 		},
-		filters: {
-			statusType:function(value) {
-				switch (value) {
-					case 1:
-						return  '未开始'
-						break
-					case 2:
-						return  '直播中'
-						break
-					case 3:
-						return  '看回放'
-						break
+		NewActivityList() {
+			this.$api.navigateTo('/pages/h5/activity/activity-list')
+		},
+		NewActivityListPath(pros) {
+			// 友盟埋点首页活动模块点击
+			if (process.env.NODE_ENV != 'development') {
+				this.$uma.trackEvent('Um_Event_HomeActivityTemplateClick', {
+					Um_Key_ActivityName: `${pros.title}`,
+					Um_Key_PageName: '首页活动模块',
+					Um_Key_SourcePage: '商城首页'
+				})
+			}
+			// 采美埋点首页活动模块数据统计
+			this.cmsSysStatistics(3)
+			/**
+			 * 页面跳转类型
+			 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+			 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+			 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+			 **/
+			if (pros.linkType) {
+				console.log(pros.linkType)
+				const typeMap = {
+					1: `/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
+					2: `/pages/goods/instrument-details?id=${pros.linkParam.id}`,
+					4: `/pages/h5/activity/activity?title=${pros.title}&link=${pros.appletsLink}`,
+					5: `/pages/goods/product?id=${pros.linkParam.id}`,
+					// 7:`/pages/supplier/user/my-shop?shopId=${pros.linkParam.id}`,
+					8: '/pages/h5/activity/activity-list',
+					9: '/pages/second/form/introduce',
+					10: '/pages/second/product/product-list',
+					11: '/pages/second/form/form',
+					12: `/pages/search/search?keyWord=${pros.linkParam.keyword}`,
+					13: `/pages/h5/article/path?link=${pros.link}`,
+					14: `/pages/h5/article/path?link=${pros.link}`,
+					15: `/pages/h5/article/path?link=${pros.link}`,
+					17: '/pages/login/register-select',
+					18: `/pages/h5/article/path?link=${pros.link}`,
+					19: `/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`,
+					20: `/pages/goods/good-floor?linkId=${pros.linkParam.id}&title=${pros.name}`,
+					21: '/pages/h5/activity/meobohui',
+					22: `/pages/goods/good-floor-temp?linkId=${pros.linkParam.id}&title=${pros.name}`,
+					23: `/pages/h5/activity/activity-topic?linkId=${pros.linkParam.id}`, //活动专题页面
+					25: '/pages/goods/goods-doc-list', //美业资料
+					28: `/pages/h5/article/path?link=${pros.link}`, // 采美认证通
+					29: '/pages/user/coupon/coupon-collection' //领券中心
 				}
-			},
-			NumFormat:function(value) {//处理金额
-				return Number(value).toFixed(2)
-			},
+				const url = typeMap[pros.linkType]
+				uni.navigateTo({
+					url: url
+				})
+			}
 		},
-		created(){
-			this.initData(this.templateData)
+		LiveGoPath() {
+			//查看直播
+			this.$api.navigateTo('/pages/h5/article/path-live')
+
+			// uni.navigateToMiniProgram({
+			// 	appId: 'wx92d650b253f8f2e3',
+			// 	path: '/pages/index/index',
+			// 	extraData: {
+			// 		'data1': 'test'
+			// 	},
+			// 	envVersion: 'develop',
+			// 	success(res) {
+			// 		// 打开成功
+			// 		console.log(res)
+			// 	}
+			// })
 		},
-		methods:{
-			initData(data){
-				this.tempData = data
-			},
-			NavArticlePath(LINK){
-				// 友盟埋点首页文章模块点击
-				if(process.env.NODE_ENV != 'development'){
-					this.$uma.trackEvent('Um_Event_HomeArticleTemplateClick', {
-						Um_Key_ArticleLink: `${LINK}`,
-						Um_Key_PageName: '首页文章模块',
-						Um_Key_SourcePage: '商城首页',
-					})
-				}
-				// 采美埋点首页文章模块数据统计
-				this.cmsSysStatistics(4)
-				this.$api.navigateTo(`/pages/h5/article/path?link=${LINK}`)
-			},
-			NewActivityList(){
-				this.$api.navigateTo('/pages/h5/activity/activity-list')
-			},
-			NewActivityListPath(pros){
-				// 友盟埋点首页活动模块点击
-				if(process.env.NODE_ENV != 'development'){
-					this.$uma.trackEvent('Um_Event_HomeActivityTemplateClick', {
-						Um_Key_ActivityName: `${pros.title}`,
-						Um_Key_PageName: '首页活动模块',
-						Um_Key_SourcePage: '商城首页',
-					})
-				}
-				// 采美埋点首页活动模块数据统计
-				this.cmsSysStatistics(3)
-				/**
-				 * 页面跳转类型
-				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-				 **/
-				if(pros.linkType){
-					console.log(pros.linkType)
-					const typeMap = {
-					 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-					 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-						4:`/pages/h5/activity/activity?title=${pros.title}&link=${pros.appletsLink}`,
-					 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-					 	// 7:`/pages/supplier/user/my-shop?shopId=${pros.linkParam.id}`,
-					 	8:'/pages/h5/activity/activity-list',
-					 	9:'/pages/second/form/introduce',
-					 	10:'/pages/second/product/product-list',
-					 	11:'/pages/second/form/form',
-					 	12:`/pages/search/search?keyWord=${pros.linkParam.keyword}`,
-					 	13:`/pages/h5/article/path?link=${pros.link}`,
-					 	14:`/pages/h5/article/path?link=${pros.link}`,
-					 	15:`/pages/h5/article/path?link=${pros.link}`,
-					 	17:'/pages/login/register-select',
-					 	18:`/pages/h5/article/path?link=${pros.link}`,
-					 	19:`/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`,
-						20:`/pages/goods/good-floor?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						21:'/pages/h5/activity/meobohui',
-						22:`/pages/goods/good-floor-temp?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						23:`/pages/h5/activity/activity-topic?linkId=${pros.linkParam.id}`,  //活动专题页面
-						25:'/pages/goods/goods-doc-list' ,//美业资料
-						28:`/pages/h5/article/path?link=${pros.link}`, // 采美认证通
-						29:'/pages/user/coupon/coupon-collection',//领券中心
-						
-					}
-					const url = typeMap[pros.linkType]
-					uni.navigateTo({
-					  	url:url
-					})
-				}
-			},
-			LiveGoPath(){//查看直播
-				this.$api.navigateTo('/pages/h5/article/path-live')
-				
-				// uni.navigateToMiniProgram({
-				// 	appId: 'wx92d650b253f8f2e3',
-				// 	path: '/pages/index/index',
-				// 	extraData: {
-				// 		'data1': 'test'
-				// 	},
-				// 	envVersion: 'develop',
-				// 	success(res) {
-				// 		// 打开成功
-				// 		console.log(res)
-				// 	}
-				// })
-			},
-			LiveGoPathPros(live){
-				// 友盟埋点首页直播模块点击
-				if(process.env.NODE_ENV != 'development'){
-					this.$uma.trackEvent('Um_Event_HomeLiveTemplateClick', {
-						Um_Key_LiveName: `${live.liveTitle}`,
-						Um_Key_PageName: '首页直播模块',
-						Um_Key_SourcePage: '商城首页',
-					})
-				}
-				// 采美埋点首页直播模块数据统计
-				this.cmsSysStatistics(2)
-				this.$api.navigateTo(`/pages/h5/article/page-image?title=${live.liveTitle}&image=${live.advertisingImage}`)
+		LiveGoPathPros(live) {
+			// 友盟埋点首页直播模块点击
+			if (process.env.NODE_ENV != 'development') {
+				this.$uma.trackEvent('Um_Event_HomeLiveTemplateClick', {
+					Um_Key_LiveName: `${live.liveTitle}`,
+					Um_Key_PageName: '首页直播模块',
+					Um_Key_SourcePage: '商城首页'
+				})
 			}
+			// 采美埋点首页直播模块数据统计
+			this.cmsSysStatistics(2)
+			this.$api.navigateTo(`/pages/h5/article/page-image?title=${live.liveTitle}&image=${live.advertisingImage}`)
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	.container-pages{
-		width: 100%;
-		height:508rpx;
-		padding: 24rpx;
-		float: left;
-		background-color: #F7F7F7;
-		box-sizing: border-box;
-		background-color: #F7F7F7;
-		overflow: hidden;
+.container-pages {
+	width: 100%;
+	height: 508rpx;
+	padding: 24rpx;
+	float: left;
+	background-color: #f7f7f7;
+	box-sizing: border-box;
+	background-color: #f7f7f7;
+	overflow: hidden;
+	display: flex;
+	align-items: center;
+	.tui-goods__list {
 		display: flex;
 		align-items: center;
-		.tui-goods__list {
-			display: flex;
-			align-items: center;
+	}
+	.tui-goods__item {
+		background-color: #fff;
+		width: 307rpx;
+		height: 460rpx;
+		border-radius: 16rpx;
+		box-sizing: border-box;
+		margin-right: 16rpx;
+		padding: 17rpx;
+		&.ross{
+			padding: 0;
 		}
-		.tui-goods__item {
-			background-color: #fff;
+		.tui-goods__ross{
 			width: 307rpx;
 			height: 460rpx;
-			border-radius: 16rpx;
-			box-sizing: border-box;
-			margin-right: 16rpx;
-			padding: 17rpx;
-		}
-		.tui-group-name{
-			width: 100%;
-			height: 36rpx;
+			text-align: center;
+			background-color: #F3920D;
+			line-height: 460rpx;
+			color: #fff;
+			font-size: 40rpx;
 			float: left;
-			margin-bottom: 13rpx;
-			.tui-group-title{
-				font-size: 26rpx;
-				line-height: 36rpx;
-				float: left;
-				color: #333333;
-			}
-			.icon-xiayibu{
-				font-size: 26rpx;
-				line-height: 36rpx;
-				float: right;
-				color: #909090;
+			border-radius: 16rpx;
+			.ross-image{
+				width: 100%;
+				height: 100%;
+				border-radius: 16rpx;
+				display: block;
 			}
 		}
-		.tui-goods__main{
-			width: 100%;
-			height: auto;
+	}
+	.tui-group-name {
+		width: 100%;
+		height: 36rpx;
+		float: left;
+		margin-bottom: 13rpx;
+		.tui-group-title {
+			font-size: 26rpx;
+			line-height: 36rpx;
 			float: left;
-			position: relative;
-			&.one{
-				margin-bottom: 14rpx;
-			}
+			color: #333333;
 		}
-		.tui-goods__imgbox {
-			width: 273rpx;
-			height: 273rpx;
-			box-sizing: border-box;
-			border-radius: 8rpx;
+		.icon-xiayibu {
+			font-size: 26rpx;
+			line-height: 36rpx;
+			float: right;
+			color: #909090;
 		}
-		.tui-goods__img {
-			max-width: 273rpx;
-			max-height: 273rpx;
-			border-radius: 8rpx;
-			display: block;
+	}
+	.tui-goods__main {
+		width: 100%;
+		height: auto;
+		float: left;
+		position: relative;
+		&.one {
+			margin-bottom: 14rpx;
 		}
-		.tui-goods__name{
-			width: 100%;
-			height: 48rpx;
-			float: left;
-			line-height: 48rpx;
-			box-sizing: border-box;
-			padding-left: 12rpx;
-			font-size: $font-size-24;
-			color: #FFFFFF;
-			background-color: rgba(0,0,0,0.4);
+	}
+	.tui-goods__imgbox {
+		width: 273rpx;
+		height: 273rpx;
+		box-sizing: border-box;
+		border-radius: 8rpx;
+	}
+	.tui-goods__img {
+		max-width: 273rpx;
+		max-height: 273rpx;
+		border-radius: 8rpx;
+		display: block;
+	}
+	.tui-goods__name {
+		width: 100%;
+		height: 48rpx;
+		float: left;
+		line-height: 48rpx;
+		box-sizing: border-box;
+		padding-left: 12rpx;
+		font-size: $font-size-24;
+		color: #ffffff;
+		background-color: rgba(0, 0, 0, 0.4);
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		border-radius: 0 0 8rpx 8rpx;
+	}
+	.tui-goods__statu {
+		padding-left: 45rpx;
+		padding-right: 10rpx;
+		height: 35rpx;
+		position: absolute;
+		top: 17rpx;
+		left: 17rpx;
+		background-color: rgba(0, 0, 0, 0.4);
+		border-radius: 18rpx;
+		line-height: 35rpx;
+		color: #ffffff;
+		text-align: right;
+		font-size: $font-size-20;
+		.icon-live {
+			width: 17rpx;
+			height: 17rpx;
+			display: block;
+			margin: 0 auto;
 			position: absolute;
-			bottom: 0;
-			left: 0;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			border-radius:0 0 8rpx 8rpx;
+			left: 15rpx;
+			top: 9rpx;
 		}
-		.tui-goods__statu{
-			padding-left: 45rpx;
-			padding-right: 10rpx;
+		.iconfont {
+			width: 35rpx;
 			height: 35rpx;
-			position: absolute;
-			top: 17rpx;
-			left: 17rpx;
-			background-color: rgba(0,0,0,0.4);
-			border-radius: 18rpx;
 			line-height: 35rpx;
-			color: #FFFFFF;
-			text-align: right;
-			font-size: $font-size-20;
-			.icon-live{
-				width: 17rpx;
-				height: 17rpx;
-				display: block;
-				margin: 0 auto;
-				position: absolute;
-				left: 15rpx;
-				top: 9rpx;
-			}
-			.iconfont{
-				width: 35rpx;
-				height: 35rpx;
-				line-height: 35rpx;
-				display: block;
-				position: absolute;
-				left: 10rpx;
-				font-size: $font-size-26;
-				&.icon-weikaishi{
-					color: #E56D00;
-					left:0;
-				}
-				&.icon-jieshu{
-					color: #FFFFFF;
-					left:0;
-					font-size: 22rpx;
-				}
+			display: block;
+			position: absolute;
+			left: 10rpx;
+			font-size: $font-size-26;
+			&.icon-weikaishi {
+				color: #e56d00;
+				left: 0;
 			}
-		}
-		.tui-goods__text{
-			width: 100%;
-			height: 44rpx;
-			float: left;
-			line-height: 44rpx;
-			box-sizing: border-box;
-			padding-left: 12rpx;
-			font-size: $font-size-24;
-			color: #666666;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			position: relative;
-			&::before{
-				content: '';
-				width: 8rpx;
-				height: 8rpx;
-				border-radius: 50%;
-				background-color: #cccccc;
-				position: absolute;
+			&.icon-jieshu {
+				color: #ffffff;
 				left: 0;
-				top: 18rpx;
+				font-size: 22rpx;
 			}
 		}
-	}	
+	}
+	.tui-goods__text {
+		width: 100%;
+		height: 44rpx;
+		float: left;
+		line-height: 44rpx;
+		box-sizing: border-box;
+		padding-left: 12rpx;
+		font-size: $font-size-24;
+		color: #666666;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		position: relative;
+		&::before {
+			content: '';
+			width: 8rpx;
+			height: 8rpx;
+			border-radius: 50%;
+			background-color: #cccccc;
+			position: absolute;
+			left: 0;
+			top: 18rpx;
+		}
+	}
+}
 </style>

components/cm-module/scrollTop/scrollTop.vue

@@ -60,7 +60,7 @@
 		height: 200rpx;
 		position: fixed;
 		right: 20rpx;
-		z-index: 999;
+		z-index: 99;
 		.icon{
 			width: 80rpx;
 			height: 80rpx;

mixins/appMixins.js

@@ -3,7 +3,7 @@ import { mapState,mapMutations} from 'vuex'
 import authorize from '@/common/config/authorize.js'
 const appMixins = {
     computed: {
-        ...mapState(['hasLogin','updateNoticeNum'])
+        ...mapState(['hasLogin','updateNoticeNum','updateRossShow'])
     },
     methods: {
         ...mapMutations(['login','logout','isWxAuthorize']),
@@ -18,12 +18,14 @@ const appMixins = {
                 .then(response =>{
                     this.$store.commit('updateStatus',response.data)
                     this.login(response.data)
+                    this.updateRossShow()
                     uni.setStorageSync('token',response.data.token)
                     uni.setStorageSync('unionId',response.data.unionId)
                 })
                 .catch(error =>{
                     this.logout(error.data)
                     this.$store.commit('updateStatus',error.data)
+                    this.updateRossShow()
                     uni.setStorageSync('unionId',error.data.unionId)
                     if(!this.hasLogin){
                         if(uni.getStorageSync('isActivitySwitch')){

mixins/cmSrsMixins.js

@@ -0,0 +1,50 @@
+// 统计Ross 用户 
+import Vue from 'vue'
+const cmSrsMixins = {
+    data() {
+        return {
+            handleProsId: 0,
+            handleShopId: 0,
+            handleProsKey: '',
+            handleShopKey: '',
+			 productIds:[6946,6947,6953,6953,6954,6955,6956,6957,6958],//Ross 商品ID集合
+            // productIds:[7247,7248],//Ross 商品ID集合
+            shopIds:[10131],// Ross 供应商Id
+            // shopIds:[1378],// Ross 供应商Id
+            keyWords: ['Binary Premium', '智能体疗管理系统', '448k', '肌肉重塑疗法', '西班牙ROSS', 'ROSS','智能体疗'], // Ross 搜索商品关键词 集合
+            shopKeyWords: ['深圳艾斯佰丽生物科技有限公司', '艾斯佰丽'],
+            showRossHtml: false,
+            isDisabled: true
+        }
+    },
+    methods: {
+        checkedIsRossSet() {
+            if (this.productIds.includes(this.handleProsId * 1) ||
+				this.shopIds.includes(this.handleShopId * 1) ||
+				this.keyWords.includes(this.handleProsKey) ||
+				this.shopKeyWords.includes(this.handleShopKey)
+            ) {
+                uni.setStorageSync('behaviorType', 2)
+                if (!this.hasLogin) {
+                    this.userInformationIsClick()
+                }
+            }
+        },
+        userInformationIsClick() {
+            // 查看用户是否有过弹框游客当天是否有过弹框
+            this.UserService.userInformationIsClick()
+                .then(response => {
+                    if(response.data){
+                        setTimeout(()=>{
+                            this.showRossHtml = true
+                        },5000)
+                    }
+                })
+                .catch(error => {
+                    console.log('查询失败~')
+                })
+        }
+    }
+}
+
+export default cmSrsMixins

pages/goods/good-floor.vue

@@ -9,6 +9,12 @@
 			<!-- 金刚区菜单 -->
 			<templateNav :list="navBarsList" v-if="isRequest"></templateNav>
 		</view>	
+		<!-- ross广告图区 -->
+		<view class="container-ross" v-if="isRossShow">
+			<view class="ross-image" @click="this.$api.navigateTo('/pages/supplier/user/my-shop?shopId=1378')">
+				<image class="image" src="https://static.caimei365.com/app/img/ross/ross-image@2x.jpg" mode=""></image>
+			</view>
+		</view>
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
 			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType="2" v-if="isRequest"></page-floor>
@@ -50,7 +56,7 @@
 			}
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo','identity','isWxAuthorize'])
+			...mapState(['hasLogin','userInfo','isRossShow','isWxAuthorize'])
 		},
 		onLoad(option) {
 			if(option.type =='share'){
@@ -139,6 +145,30 @@
 		width: 100%;
 		height: auto;
 	}
+	.container-ross{
+		width: 100%;
+		height: 264rpx;
+		box-sizing: border-box;
+		padding: 24rpx 24rpx 0 24rpx;
+		float: left;
+		background-color: #F5F5F5;
+		.ross-image{
+			width: 100%;
+			height: 100%;
+			line-height: 240rpx;
+			background-color: #F3920D;
+			border-radius: 16rpx;
+			text-align: center;
+			font-size: 80rpx;
+			color: #FFFFFF;
+			.image{
+				width: 100%;
+				height: 100%;
+				border-radius: 16rpx;
+				display: block;
+			}
+		}
+	}
 	.container-section{
 		width: 100%;
 		height: auto;

pages/goods/product.vue

@@ -666,6 +666,8 @@
 			:userIdentity="userIdentity"
 			:firstClubType="firstClubType"
 		/>
+		<!-- ross弹窗 -->
+		<cmRossPopup v-if="showRossHtml" :popupShow="showRossHtml"></cmRossPopup>
 	</view>
 </template>
 
@@ -681,14 +683,16 @@ import cmService from './components/cm-service' //服务项目
 import cmProductDoc from './components/cm-product-doc.vue'
 import cmProductModal from './components/cm-product-modal.vue'
 import couponTabs from '@/components/cm-module/coupon/tui-tabs.vue'
+import cmRossPopup from '@/components/cm-module/cm-ross/cm-ross-popup'
 import authorize from '@/common/config/authorize.js'
 import wxLogin from '@/common/config/wxLogin.js'
 import { debounce } from '@/common/config/common.js'
 import payMixins from '@/mixins/payMixins.js'
+import cmSrsMixins from '@/mixins/cmSrsMixins.js'
 import thorui from '@/components/clipboard/clipboard.thorui.js'
 var isPreviewImg
 export default {
-	mixins: [payMixins],
+	mixins: [payMixins,cmSrsMixins],
 	components: {
 		customP,
 		parser,
@@ -699,7 +703,8 @@ export default {
 		cmService,
 		couponTabs,
 		cmProductDoc,
-		cmProductModal
+		cmProductModal,
+		cmRossPopup
 	},
 	data() {
 		return {
@@ -847,7 +852,7 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.productId = this.couponParam.productId = option.id //获取商品ID
+		this.productId = this.couponParam.productId = this.handleProsId = option.id //获取商品ID
 		if (option.typeId) {
 			this.typeId = option.typeId
 		}
@@ -923,6 +928,8 @@ export default {
 							this.product.brandName ? this.product.brandName : ''
 						}`
 					)
+					//校验是否为ross
+					this.checkedIsRossSet()
 					//判断是否可以跳转供应商主页
 					if (this.product.shopType === 2) {
 						this.isShowCaimeiShop = true

pages/search/search-supplier.vue

@@ -68,6 +68,8 @@
 					<!--加载loadding-->
 			</view>
 		</view>
+		<!-- ross弹窗 -->
+		<cmRossPopup v-if="showRossHtml" :popupShow="showRossHtml"></cmRossPopup>
 	</view>  
 </template>
 
@@ -77,13 +79,17 @@
 	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
+	import cmRossPopup from '@/components/cm-module/cm-ross/cm-ross-popup'
 	import authorize from '@/common/config/authorize.js'	
+	import cmSrsMixins from '@/mixins/cmSrsMixins.js'
 	export default {
 		components:{
 			tuiLoadmore,
 			tuiNomore,
-			uniStars
+			uniStars,
+			cmRossPopup
 		},
+		mixins: [cmSrsMixins],
 		data() {
 			return {
 				iconClass:'icon-aixin',
@@ -128,6 +134,9 @@
 			},	
 			searchsupplierList(){//搜索
 				this.listQuery.pageNum=1
+				this.handleShopKey = this.listQuery.keyword
+				uni.setStorageSync('pageLabel',this.listQuery.keyword)
+				this.checkedIsRossSet() //判断是否弹窗ross广告
 				this.GetSearchSupplierList()
 				// 友盟埋点供应商搜索点击
 				if(process.env.NODE_ENV != 'development'){
@@ -139,7 +148,6 @@
 				}
 			},
 			GetSearchSupplierList(){//查询供应商列表	
-				uni.setStorageSync('pageLabel',this.listQuery.keyword)
 				this.ShopService.GetSearchSupplierList(this.listQuery).then(response =>{
 					let data = JSON.parse(response.data)
 					let dataList = data.items

pages/search/search.vue

@@ -482,6 +482,8 @@
                 </view>
             </view>
         </tui-drawer>
+		<!-- ross弹窗 -->
+		<cmRossPopup v-if="showRossHtml" :popupShow="showRossHtml"></cmRossPopup>
         <!-- 透明模态层 -->
         <modal-layer v-if="isModallayer"></modal-layer>
     </view>
@@ -491,15 +493,19 @@
 import { mapState } from 'vuex'
 import modalLayer from '@/components/modal-layer'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
+import cmRossPopup from '@/components/cm-module/cm-ross/cm-ross-popup'
 import wxLogin from '@/common/config/wxLogin.js'
 import { debounce } from '@/common/config/common.js'
+import cmSrsMixins from '@/mixins/cmSrsMixins.js'
 const myDebounce = fn => debounce(fn, 500, false)
 
 export default {
     components: {
         modalLayer,
-        uniGrader
+        uniGrader,
+		cmRossPopup
     },
+	mixins: [cmSrsMixins],
     data() {
         return {
             CustomBar: this.CustomBar, // 顶部导航栏高度
@@ -698,7 +704,9 @@ export default {
                 switch (this.searchKeyType) {
                     case 1:
                         this.listData = []
-                        this.brandParam.keyword = this.listQuery.keyword
+                        this.brandParam.keyword = this.handleProsKey = this.listQuery.keyword
+						uni.setStorageSync('pageLabel',this.listQuery.keyword)
+						this.checkedIsRossSet() //判断是否弹窗ross广告
                         this.setSearchHistoryAdd()
                         this.getCommoditySearchQUeryBrand()
                         this.getListFromServer()

pages/supplier/user/my-shop.vue

@@ -405,6 +405,8 @@
 				</view>
 			</view>
 		</template>
+		<!-- ross弹窗 -->
+		<cmRossPopup v-if="showRossHtml" :popupShow="showRossHtml"></cmRossPopup>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 	</view>
@@ -415,15 +417,18 @@ import { mapState, mapMutations } from 'vuex'
 import custom from './components/custom.vue' //自定义导航
 import banner from '../components/banner.vue'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
+import cmRossPopup from '@/components/cm-module/cm-ross/cm-ross-popup'
 import authorize from '@/common/config/authorize.js'
 import wxLogin from '@/common/config/wxLogin.js'
-
+import cmSrsMixins from '@/mixins/cmSrsMixins.js'
 export default {
 	components: {
 		custom,
 		banner,
-		uniGrader
+		uniGrader,
+		cmRossPopup
 	},
+	mixins: [cmSrsMixins],
 	data() {
 		return {
 			CustomBar:this.CustomBar,
@@ -469,7 +474,7 @@ export default {
 		if (option.type == 'share') {
 			wxLogin.wxLoginAuthorize()
 		}
-		this.listQuery.id = this.supplierId = option.shopId
+		this.listQuery.id = this.supplierId = this.handleShopId = option.shopId
 		this.initGetStotage()
 	},
 	filters: {
@@ -508,6 +513,7 @@ export default {
 			this.GetSupplierHomeDeatils()
 			this.GetSupplierHomeProduct()
 			this.GetSupplierHomeProductList()
+			this.checkedIsRossSet()
 			this.skeletonShow = false
 		},
 		GetSupplierHomeBanner() {

pages/tabBar/home/index.vue

@@ -125,7 +125,7 @@ export default {
 		...mapState(['hasLogin', 'userInfo', 'identity', 'isActivity', 'isWxAuthorize'])
 	},
 	methods: {
-		...mapMutations(['login', 'logout','updateNoticeNum']),
+		...mapMutations(['login', 'logout','updateNoticeNum','updateRossShow']),
 		async GetWxAuthorize() {
 			const wechatCode = await authorize.getCode('weixin') // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 			const getUserInfo = await authorize.getUserInfo('weixin')
@@ -149,6 +149,7 @@ export default {
 					} else if (response.data.userIdentity === 3) {
 						this.$api.redirectTo('/pages/supplier/index/index')
 					}
+					this.updateRossShow()
 					this.GetInitBeansInfo()
 					this.getHomeInformation()
 				})
@@ -157,6 +158,7 @@ export default {
 					this.logout()
 					uni.setStorageSync('unionId', error.data.unionId)
 					this.$store.commit('updateStatus', error.data)
+					this.updateRossShow()
 					this.getHomeInformation()
 				})
 		},

pages/user/address/addressManage.vue

@@ -169,15 +169,15 @@
 				}
 			},
 			onShouHuoRen(e){
-			   this.addressData.receiver = e.detail.value;
+			   this.addressData.receiver = e.detail.value
 			   this.initInput();
 			},
 			onMobile(e){
-			   this.addressData.mobile = e.detail.value;
+			   this.addressData.mobile = e.detail.value
 			   this.initInput();
 			},
 			onTextareaInput(e){
-			   this.addressData.address = e.detail.value;
+			   this.addressData.address = e.detail.value
 			   this.initInput();
 			},
 			initInput(){

services/user.service.js

@@ -838,5 +838,39 @@ export default class UserService {
 	        isLoading: false,
 	    }) 
     }
+    /**
+	 *@查看用户是否有过弹框游客当天是否有过弹框
+	 */
+    userInformationIsClick(data = {}) {
+	    return this.AjaxService.get({
+	        url: '/user/information/isClick',
+	        data,
+	        isLoading: false,
+	    }) 
+    }
+    /**
+	 *@插入填写咨询人基本信息
+	 *@param consultName：页面类型
+	 *@param consultMobile：页面标签
+	 *@param isClick：1
+	 
+	 */
+    userInformationInsertRoos(data = {}) {
+	    return this.AjaxService.post({
+	        url: '/user/information/insertRoos',
+	        data,
+	        isLoading: false,
+	    }) 
+    }
+    /**
+	 *@查看访问者是否浏览过roos相关页面
+	 */
+    userInformationVisitRoos(data = {}) {
+	    return this.AjaxService.get({
+	        url: '/user/information/visitRoos',
+	        data,
+	        isLoading: false,
+	    }) 
+    }
 	 
 }

store/index.js

@@ -5,7 +5,7 @@ import authorize from '../common/config/authorize.js'
 import * as caimeiApi from '@/common/config/caimeiApi.js'
 import ajaxService from '@/services/ajax.service.js'
 import UserService from '@/services/user.service.js'
-
+const getUserService = new UserService(ajaxService)
 Vue.use(Vuex)
 const store = new Vuex.Store({
     state: {
@@ -22,6 +22,7 @@ const store = new Vuex.Store({
         isLoginType: 0,
         isLoginProductId: 0,
         isManage: false,// 是否是管理员或者小组长
+        isRossShow:false // 是否显示ross广告图
     },
     mutations: {
         login(state, provider) { //用户身份 1、协销 2、资质机构 3、供应商 4.个人机构
@@ -73,14 +74,12 @@ const store = new Vuex.Store({
                     state.identity = 0
                 }
             }
-            console.log('用户类型', state.identity)
             uni.setStorage({ //缓存用户登陆状态
                 key: 'userInfo',
                 data: provider
             })
         },
         async updateNoticeNum(state) { // 更新通知消息数量
-            const getUserService = new UserService(ajaxService)
             const userInfo = await caimeiApi.getStorage()
             const commonId = userInfo.clubId ? userInfo.clubId : 0
             getUserService.getAuthClubCount({ commonId: commonId })
@@ -108,6 +107,17 @@ const store = new Vuex.Store({
                     })
                 })
         },
+        async updateRossShow(state){
+            const USER_EVEN = await caimeiApi.getStorage()
+            if(USER_EVEN.userIdentity === 1) { return }
+            getUserService.userInformationVisitRoos({ userId: USER_EVEN.userId ? USER_EVEN.userId : 0 })
+			    .then(response => {
+                    state.isRossShow = response.data
+			    })
+			    .catch(error => {
+                    console.log(error)
+			    })
+        },
         updateAllNum(state, num) {
             if (num >= 100) {
                 uni.setTabBarBadge({

utils/residence.js

@@ -22,7 +22,8 @@ const defaultParams = {
     pageType: '', //页面类型
     pageLabel: '', //页面标签
     userId: userSync.userId ? userSync.userId : 0, //用户Id
-    productId: 0 //商品Id
+    productId: 0 ,//商品Id
+    behaviorType:1 // 统计类型
 }
 
 // 页面进入
@@ -58,6 +59,7 @@ async function userBehavior(current, prev) {
         const pageData = isIncludeType(prev.path)
         sysParams.pagePath = prev.fullPath
         sysParams.pageType = pageData ? pageData.pageType : ''
+        sysParams.behaviorType =  uni.getStorageSync('behaviorType') ? uni.getStorageSync('behaviorType') : 1
         if (prev.path === '/pages/goods/product' || prev.path === '/pages/second/product/product-details') {
             sysParams.productId = prev.query.id ? prev.query.id : 0
             sysParams.pageLabel = uni.getStorageSync('productLabel')
@@ -68,6 +70,7 @@ async function userBehavior(current, prev) {
         console.log('记录路径:', prev.path, '停留时间:', sysParams.accessDuration, 'ms', '标签:', sysParams.pageLabel)
         await UserApi.userRecordStatistics(sysParams)
         uni.removeStorageSync('pageLabel')
+        uni.removeStorageSync('behaviorType')
         // 删除标记标签名
         console.log('---用户行为轨迹记录成功---')
         console.log('------------------------')