commit-m 首页改版

components/cm-module/homeIndex/navbars.vue

@@ -57,7 +57,6 @@
 							}
 						})
 					 }else{
-						 console.log(pros.linkType)
 						 const typeMap = {
 						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
 						 	10:`/second/pages/product/product-list`,
@@ -66,9 +65,7 @@
 						 	18:`/h5/pages/article/page?link=${pros.link}`,
 						 	20:`/pages/goods/good-floor?linkId=${pros.linkParam.id}&title=${pros.name}`
 						 }
-						console.log(typeMap)
 						const url = typeMap[pros.linkType];
-						console.log(url)
 						this.$api.navigateTo(url)
 					 }
 				}

components/cm-module/homeIndex/pageFloor.vue

@@ -65,6 +65,9 @@
 			list:{
 				type:Array
 			},
+			pageType:{
+				type:Number
+			},
 			userIdentity:{
 				type:Number
 			}
@@ -83,10 +86,10 @@
 		methods:{
 			initData(data){
 				this.pageFloorList = data
-				// console.log(this.pageFloorList)
+				console.log(this.pageType)
 			},
 			NavToDetailPage(page) {//跳转
-				this.$api.navigateTo(`/pages/goods/good-floorMore?floorId=${page.id}&title=${page.title}`)
+				this.$api.navigateTo(`/pages/goods/good-floorMore?pageType=${this.pageType}&floorId=${page.id}&title=${page.title}`)
 			}
 		}
 	}

components/cm-module/pageFloorTemplate/templateA.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill" @click="BannerToDetailPages(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.keyword)"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -197,6 +197,37 @@
 						 this.$api.navigateTo(url)
 					}
 				}
+			},
+			BannerToDetailPages(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				console.log(linkType)
+				console.log(linkId)
+				 /** 页面跳转类型
+				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+				 **/
+				 if(linkType){
+					 const typeMap = {
+						1:`/pages/goods/goods-instrument?linkId=${linkId}`,
+						2:`/pages/goods/instrument-details?id=${linkId}`,
+						4:`/h5/pages/activity/activity?id=${linkId}`,
+						5:`/pages/goods/product?id=${linkId}`,
+						7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
+						8:`/h5/pages/activity/activity-list`,
+						9:`/second/pages/form/introduce`,
+						10:`/second/pages/product/product-list`,
+						11:`/second/pages/form/form`,
+						12:`/pages/search/search?keyWord=${keyword}`,
+						13:`/h5/pages/article/page?link=${linkHref}`,
+						14:`/h5/pages/article/page?link=${linkHref}`,
+						15:`/h5/pages/article/page?link=${linkHref}`,
+						17:`/pages/login/register-select`,
+						18:`/h5/pages/article/page?link=${linkHref}`,
+						19:`/pages/search/search-supplier?keyWord=${keyword}`
+					 }
+					 const url = typeMap[linkType];
+					 this.$api.navigateTo(url)
+				}
 			}
 		}
 	}

components/cm-module/pageFloorTemplate/templateB.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageFloorTemplate/templateC.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageFloorTemplate/templateD.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_03">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage3" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage3" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageFloorTemplate/templateE.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageTemplate/templateA.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 3" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageTemplate/templateB.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 2" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageTemplate/templateC.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 3" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageTemplate/templateD.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_03">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage3" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage3" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 2" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageTemplate/templateE.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 4" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>

components/cm-module/pageTemplate/templateF.vue

@@ -95,7 +95,7 @@
 			</view>
 		</view>
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
+			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
 		</view>
 	</view>
 </template>

components/cm-module/pageTemplate/templateNav.vue

@@ -3,8 +3,7 @@
 		<view class="navbars-content clearfix">
 			<view class="nav-item" v-for="(item,index) in navList" :key="index" @click="NavToDetailPage(item,index)">
 				<view class="icon">
-					<image class="icon-image" :src="item.icon" mode="widthFix"></image>
-					<!-- <image class="icon-new" src="../../../static/temp/icon-new.png" mode="widthFix" v-if="index === 7"></image> -->
+					<image class="icon-image" :src="item.crmIcon" mode="widthFix"></image>
 				</view>
 				<view class="name">{{ item.name }}</view>
 			</view>
@@ -23,16 +22,7 @@
 		data() {
 			return{
 				current:100,
-				navList:[
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav1.png'},
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav2.png'},
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav3.png'},
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav4.png'},
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav5.png'},
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav6.png'},
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav7.png'},
-					{icon:'https://static.caimei365.com/app/img/icon/icon-nav8.png'},
-				]
+				navList:[]
 			}
 		},
 		created(){
@@ -43,20 +33,9 @@
 		},
 		methods:{
 			initData(list){
-				this.navList = this.ReturnNewNavList(this.navList,list)
+				this.navList = list
 				console.log(this.navList)
 			},
-			ReturnNewNavList(listA,listB){
-				let NewArray = []
-				listA.map((item,index)=>{
-					for (let i = 0; i < listB.length; i++) {
-						if(index == i){
-							NewArray.push(Object.assign(item,listB[i]))
-						}
-					}
-				});
-				return NewArray
-			},
 			NavToDetailPage(pro){//分类导航跳转
 				let self = this;
 				uni.setStorage({

pages/goods/good-floor.vue

@@ -11,7 +11,7 @@
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
-			<page-floor :list="pageList" :userIdentity="userIdentity"></page-floor>
+			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType="2" v-if="isRequest"></page-floor>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
@@ -23,7 +23,6 @@
 	import customFloor from '@/components/cm-custom/custom-floor' 		 //自定义导航
 	import templateNav from '@/components/cm-module/pageTemplate/templateNav.vue'
 	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-	import { pageList } from '@/common/json/data.json.js' //本地数据
 	
 	export default{
 		components:{
@@ -33,29 +32,31 @@
 		},
 		data(){
 			return{
+				userID:0,
+				shopId:0,
 				userIdentity:0,
 				skeletonShow:true,
 				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 				systeminfo: this.setSysteminfo(),		 //获取设备信息
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				navBarsList:[],
-				pageList:pageList,//楼层
+				pageList:[],//楼层
 				isRequest:false,
 				isScrollTop:false,
-				linkId:'',
+				pageId:'',
+				typeSort:'',
 			}
 		},
 		onLoad(option) {
 			console.log(option)
-			this.linkId = option.linkId
+			this.pageId = option.linkId
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.clubStatus = resolve.clubStatus
 				this.userID = resolve.userID ? resolve.userID : 0;
 				this.shopId = resolve.shopID ? resolve.shopID : 0;
 				this.userIdentity = resolve.userIdentity
-				// this.getListFromServer();
+				this.GetInstrumentPageData();
 			}).catch(error =>{
-				// this.getListFromServer();
+				this.GetInstrumentPageData();
 			})
 			setTimeout(()=>{
 				this.skeletonShow = false
@@ -65,10 +66,19 @@
 			...mapState(['hasLogin','userInfo','identity'])
 		},
 		methods:{
-			GetHomeInit(){//金刚区分类
-				this.CommonService.GetFirstClassly({typeSort:1,source:'crm'}).then(response =>{
+			GetInstrumentPageData(){//获取楼层数据
+				this.CommonService.GetInstrumentPageData({pageId:this.pageId,userId:this.userID,source:2}).then(response =>{
 					let data = response.data
-					this.navBarsList = data
+					this.typeSort = data.page.typeSort
+					this.pageList = data.floorList
+					this.GetHomeInit()
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			GetHomeInit(){//金刚区分类
+				this.CommonService.GetFirstClassly({typeSort:this.typeSort,source:'crm'}).then(response =>{
+					this.navBarsList = response.data
 					this.isRequest =true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -102,7 +112,7 @@
 			}, 200)
 		},
 		onShow() {
-			this.GetHomeInit()
+			
 		}
 	}
 </script>

pages/goods/good-floorMore.vue

@@ -60,9 +60,11 @@
 				navBarsList:[],
 				pageData:{},//楼层
 				floorId:null,
+				pageType:null
 			}
 		},
 		onLoad(option) {
+			this.pageType = option.pageType
 			this.floorId = Number(option.floorId)
 			uni.setNavigationBarTitle({title:option.title});
 			this.$api.getComStorage('userInfo').then((resolve) =>{
@@ -70,23 +72,33 @@
 				this.userID = resolve.userID ? resolve.userID : 0;
 				this.shopId = resolve.shopID ? resolve.shopID : 0;
 				this.userIdentity = resolve.userIdentity
-				this.GetHomeFloorContentDetails();
+				this.GetHomeFloorContentDetails(this.pageType);
 			}).catch(error =>{
-				this.GetHomeFloorContentDetails();
+				this.GetHomeFloorContentDetails(this.pageType);
 			})
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo','identity'])
 		},
 		methods:{
-			GetHomeFloorContentDetails(){//首页楼层查看更多
-				this.CommonService.GetHomeFloorContentDetails({userId:this.userID,floorId:this.floorId,source:2}).then(response =>{
-					this.pageData = response.data
-					this.skeletonShow = false
-					this.isRequest = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
+			GetHomeFloorContentDetails(pageType){//楼层查看更多
+				if(pageType == '1'){
+					this.CommonService.GetHomeFloorContentDetails({userId:this.userID,floorId:this.floorId,source:2}).then(response =>{
+						this.pageData = response.data
+						this.skeletonShow = false
+						this.isRequest = true
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				}else{
+					this.CommonService.GePageFloorContentDetails({userId:this.userID,centreId:this.floorId,source:2}).then(response =>{
+						this.pageData = response.data
+						this.skeletonShow = false
+						this.isRequest = true
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				}
 			}
 		},
 		onPullDownRefresh() {

pages/tabBar/category/index.vue

@@ -14,33 +14,35 @@
 			</scroll-view>
 			<!--右侧子导航-->
 			<scroll-view  scroll-y="true" class="right-aside" :style="{top:(CustomBar+38)+'px',height:(windowHeight-CustomBar+38)+'px'}">
-				<view class="category" v-if="first.smalltypeList.length > 0" v-for="(first,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
-					<view class="category-box" v-for="(small,oIndex) in n.smalltypeList" :key="oIndex">
-						<view class="title">{{small.name}}</view>
-						<view class="list" v-if="small.tinytypeList.length > 0">
-							<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
-								<image :src="pro.icon"></image>
-								<view class="text">{{pro.name}}</view>
+				<view class="category" v-for="(first,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
+					<template v-if="first.smalltypeList">
+						<view class="category-box AAA" v-for="(small,oIndex) in first.smalltypeList" :key="oIndex">
+							<view class="title">{{small.name}}</view>
+							<view class="list" v-if="small.tinytypeList.length > 0">
+								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
+									<image :src="pro.icon"></image>
+									<view class="text">{{pro.name}}</view>
+								</view>
 							</view>
-						</view>
-						<view v-else class="no-data">
-							<view class="box" @click.stop="navToListPage(small,2)">
-								<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
-								<view class="text">全部商品</view>
+							<view v-else class="no-data">
+								<view class="box" @click.stop="navToListPage(small,2)">
+									<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<view class="text">全部商品</view>
+								</view>
 							</view>
 						</view>
-					</view>
-				</view>
-				<view class="category" v-else v-for="(first,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
-					<view class="category-box">
-						<view class="title">{{first.name}}</view>
-						<view class="no-data">
-							<view class="box" @click.stop="navToListPage(first,1)">
-								<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
-								<view class="text">全部商品</view>
+					</template>
+					<template v-else>
+						<view class="category-box BBB">
+							<view class="title">{{first.name}}</view>
+							<view class="no-data">
+								<view class="box" @click.stop="navToListPage(first,1)">
+									<image src="https://static-b.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<view class="text">全部商品</view>
+								</view>
 							</view>
 						</view>
-					</view>
+					</template>
 				</view>
 			</scroll-view>
 		</view>

pages/tabBar/home/index.vue

@@ -13,7 +13,7 @@
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
-			<page-floor :list="pageList" :userIdentity="userIdentity" v-if="isRequest"></page-floor>
+			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
 			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
 		</view>
 		<!-- 侧边 -->

services/common.service.js

@@ -22,6 +22,10 @@ export default class CommonService {
 	GetHomeFloorContentDetails (data = {}) {
 		return this.AjaxService.get({ url:'/home/floorContentDetails', data, isLoading: false })
 	}
+	/* 二级页楼层查看更多数据 */
+	GePageFloorContentDetails (data = {}) {
+		return this.AjaxService.get({ url:'/home/pageFloorDetails', data, isLoading: false })
+	}
 	/* 首页顶部三个模块数据 */
 	GetHomeTopDataInfo (data = {}) {
 		return this.AjaxService.get({ url:'/home/top/data', data, isLoading: false })
@@ -42,6 +46,14 @@ export default class CommonService {
 	GetHomeFloorInfo (data = {}) {
 		return this.AjaxService.get({ url:'/home/floor', data, isLoading: false })
 	}
+	/* 搜索热门关键词 */
+	GetHomeHotSearchTerms (data = {}) {
+		return this.AjaxService.get({ url:'/home/hotSearchTerms', data, isLoading: false })
+	}
+	/* 二级列表楼层 */
+	GetInstrumentPageData (data = {}) {
+		return this.AjaxService.get({ url:'/home/instrumentData', data, isLoading: false })
+	}
 	/* 一级分类 */
 	GetFirstClassly (data = {}) {
 		return this.AjaxService.get({ url:'/product/classify', data, isLoading: false })

services/product.service.js

@@ -142,6 +142,18 @@ export default class ProductService {
 	GetProductSearchList (data = {}) {
 		return this.AjaxService.get({ url:'/search/query/product', data, isLoading: true })
 	}
+	/* 搜索一级分类商品列表 */
+	GetQuertProductBigType (data = {}) {
+		return this.AjaxService.get({ url:'/search/query/product/bigType', data, isLoading: true })
+	}
+	/* 搜索二级分类商品列表 */
+	GetQuertProductSmallType (data = {}) {
+		return this.AjaxService.get({ url:'/search/query/product/smallType', data, isLoading: true })
+	}
+	/* 搜索三级分类商品列表 */
+	GetQuertProductTinyType (data = {}) {
+		return this.AjaxService.get({ url:'/search/query/product/tinyType', data, isLoading: true })
+	}
 	/* 获取商品评价 */
 	GetProductEvaluate (data = {}) {
 		return this.AjaxService.get({ url:'/product/evaluate', data, isLoading: false })