首页跳转

common/config/config.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
 	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'

components/cm-module/homeIndex/banner.vue

@@ -2,8 +2,8 @@
 	<view>
 		<view class="swiper-banner-box" >
 			<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
-				<swiper-item v-for="(item,index) in list" :key="index">
-					<image :src="item" class="tui-slide-image" mode="scaleToFill"/>
+				<swiper-item v-for="(item,index) in list" :key="index" @click.stop="NavToDetailPage(item)">
+					<image :src="item.image" class="tui-slide-image" mode="scaleToFill"/>
 				</swiper-item>
 			</swiper>
 			<view class="swiper__dots-box" v-if="list.length > 1">
@@ -54,6 +54,67 @@
 				const index = e.detail.current;
 				this.current = index;
 			},
+			NavToDetailPage(floor) {//跳转
+				switch(floor.linkType){
+					case 1://二级页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`)
+						break;
+					case 2://搜索项目仪器 
+						this.$api.navigateTo(`/pages/search/search-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 3://直播页面
+						this.$api.navigateTo(``)
+						break;
+					case 4://自由页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 5://商品详情
+						this.$api.navigateTo(`/pages/goods/product?id=${floor.linkParam.id}`)
+						break;
+					case 6://仪器项目详情
+						this.$api.navigateTo(`/pages/goods/instrument-details?id=${floor.linkParam.id}`)
+						break;
+					case 7://供应商主页 
+						this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`)
+						break;
+					case 8://专题活动页
+						this.$api.navigateTo(`/h5/pages/activity/activity-list`)
+						break;
+					case 9://二手市场介绍
+						this.$api.navigateTo(`/second/pages/form/introduce`)
+						break;
+					case 10://二手商品列表
+						this.$api.navigateTo(`/second/pages/product/product-list`)
+						break;
+					case 11://二手商品发布
+						this.$api.navigateTo(`/second/pages/form/form`)
+						break;
+					case 12://商品搜索
+						this.$api.navigateTo(`/pages/search/search?keyWord=${floor.title}`)
+						break;
+					case 13://信息详情
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 14://品牌招商介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 15://维修保养介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 16://首页
+						this.$api.switchTabTo(`/pages/tabBar/home/index`)
+						break;
+					case 17://注册页 
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 18://信息中心
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 19://供应商列表
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+				}
+			}
 		}
 	}
 </script>

components/cm-module/homeIndex/hotProduct.vue

@@ -3,10 +3,10 @@
 		<view class="container clearfix">
 			<view class="title">推荐专区</view>
 			<view class="recommend-list">
-				<swiper class="tui-banner-swiper" :autoplay="true" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
+				<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
 					<swiper-item v-for="(product,index) in hotProductList" :key="index">
-						<view class="floor-item" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item.productID)">
-							<image class="tui-skeleton-fillet" :src="item.mainImage" mode="aspectFill"></image>
+						<view class="floor-item" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item.id)">
+							<image class="tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
 							<view class="floor-item-content">
 								<view class="title tui-skeleton-rect">
 									<text class="mclap">{{item.name}}</text>
@@ -108,7 +108,6 @@
 						this.hotProductList.push(res.slice(i, i + this.pageSize));
 					}
 				}
-				console.log(this.hotProductList)
 			},
 			PromotionsFormat(promo){//促销活动类型数据处理
 				if(promo!=null){
@@ -165,7 +164,7 @@
 				transform: translateY(0);
 				.floor-item{
 					width: 341rpx;
-					height: 502rpx;
+					height: auto;
 					margin-right: 20rpx;
 					font-size: $font-size-24;
 					color: $text-color;
@@ -199,16 +198,17 @@
 						margin-top: 8rpx;
 					}
 					.floor-tags{
-						float: left;
 						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
 						line-height: 36rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						margin-left: 15rpx;
+						border: 1px solid #E15616;
 					}
 					.title-none{
 						font-size: $font-size-26;
@@ -235,7 +235,7 @@
 						flex-direction: column;
 						.mclap{
 							width: 100%;
-							line-height: 36rpx;
+							line-height:40rpx;
 							text-overflow:ellipsis;
 							display: -webkit-box;
 							word-break: break-all;
@@ -263,7 +263,7 @@
 					}
 					.price{
 						color: #FF2A2A;
-						line-height: 44rpx;
+						line-height:70rpx;
 						&.none{
 							text-decoration: line-through;
 							color: #999999;

components/cm-module/homeIndex/pagesProduct.vue

@@ -10,7 +10,7 @@
 				</view>
 				<scroll-view scroll-x>
 					<view class="tui-goods__list">
-						<view class="tui-goods__item" @tap="seckillList(3)" v-for="(floor, index) in item.floorData" :key="index">
+						<view class="tui-goods__item"v-for="(floor, flIndex) in item.floorData" :key="flIndex"  @tap="NavToDetailPage(floor)" >
 							<view class="tui-goods__imgbox">
 								<image :src="floor.image" mode="widthFix" class="tui-goods__img"></image>
 							</view>
@@ -39,428 +39,7 @@
 		},
 		data() {
 			return{
-				pagesProductList:[
-					{
-						"id":6,
-						"type":null,
-						"title":"品牌仪器",
-						"detail":"科医人 赛诺龙 路创丽 Jeisys 华熙生物",
-						"link":null,
-						"subFloors":null,
-						"floorData":[
-							{
-								"id":19,
-								"status":null,
-								"title":"脸部抗衰仪器系列",
-								"detail":null,
-								"link":"http://www.caimei365.com/cmpage/info-1-22.html",
-								"image":"https://img.caimei365.com/group1/M00/03/C2/Cmis2F-b03iAbm6AAAB-3AQ2ab4270.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":23,
-								"status":null,
-								"title":"脱毛嫩肤仪器系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-20.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9R9kaAE5-iAACBMZJBjPU450.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":22,
-								"status":null,
-								"title":"瘦身塑形仪器系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-49.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R9HeAP5lxAACLzIoow4k828.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":56,
-								"status":null,
-								"title":"激光仪器系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-228.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R9GuAQslKAABsHxQEqMs728.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":55,
-								"status":null,
-								"title":"光子嫩肤仪器系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-227.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9R9IWAPcPfAACGRRPiWNI482.jpg",
-								"beginTime":null,
-								"endTime":null
-							}
-						]
-					},
-					{
-						"id":10,
-						"type":null,
-						"title":"科学护肤品",
-						"detail":"敏感肌  痘痘肌  黑色素  多效修复  净化角质",
-						"link":null,
-						"subFloors":null,
-						"floorData":[
-							{
-								"id":45,
-								"status":null,
-								"title":"华熙米蓓尔皮肤护理系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/product/search/list/0-0-0-1-0.html?wd=%25E7%25B1%25B3%25E8%2593%2593%25E5%25B0%2594&amp;searchTypeID=0",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R6kGAedqnAAEFz7A20Dk764.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":26,
-								"status":null,
-								"title":"优斐斯液体敷料系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/prolist-1285.html?brandID=67",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R6fiALawUAAC9Gw_OU98595.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":29,
-								"status":null,
-								"title":"肌本演绎舒缓系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/web/supplier/view/supplierHomePage.jsp?shopId=1248",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R6bmAaIdDAAD3eoag-y4911.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":57,
-								"status":null,
-								"title":"上海汇融舜华颜冻干安瓶",
-								"detail":null,
-								"link":"https://www.caimei365.com/web/supplier/view/supplierHomePage.jsp?shopId=1259",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R6ZSACbCsAACzgFjQRcs111.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":62,
-								"status":null,
-								"title":"韩国恩盛VITAL水光面膜",
-								"detail":null,
-								"link":"https://www.caimei365.com/product-3893.html",
-								"image":"https://img.caimei365.com/group1/M00/03/D1/Cmis21-aHICADWnZAAGWiXX_syA466.jpg",
-								"beginTime":null,
-								"endTime":null
-							}
-						]
-					},
-					{
-						"id":11,
-						"type":null,
-						"title":"高端院用产品",
-						"detail":"皮肤护理  紧致抗衰  玻尿酸补水嫩肤 ",
-						"link":null,
-						"subFloors":null,
-						"floorData":[
-							{
-								"id":32,
-								"status":null,
-								"title":"德玛莉肌活系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/prolist-1267.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B4/Cmis2F9XMo2AELI3AAO-S150ml8816.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":58,
-								"status":null,
-								"title":"美生美稚龄长效童颜",
-								"detail":null,
-								"link":"https://www.caimei365.com/product-3669.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R6tqAb9oFAAEnv5BPpTA032.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":61,
-								"status":null,
-								"title":"BIOLINE高端护肤系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/index.html?id=1225",
-								"image":"https://img.caimei365.com/group1/M00/03/BF/Cmis2F-Gcn6AKqTSAAEhEKsbcVs589.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":31,
-								"status":null,
-								"title":"肌本演绎高端护肤系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/web/supplier/view/supplierHomePage.jsp?shopId=1248",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R6qyAB2CTAAC4XyL7zAg816.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":51,
-								"status":null,
-								"title":"优斐斯护肤系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/prolist-1285.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B2/Cmis2F9R6qOAREllAADzyGgdFoY829.jpg",
-								"beginTime":null,
-								"endTime":null
-							}
-						]
-					},
-					{
-						"id":4,
-						"type":null,
-						"title":"术后修护",
-						"detail":"皮肤屏障修复 净肤  美白 私密养护",
-						"link":null,
-						"subFloors":null,
-						"floorData":[
-							{
-								"id":60,
-								"status":null,
-								"title":"肌本演绎修护系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/index.html?id=1248",
-								"image":"https://img.caimei365.com/group1/M00/03/BF/Cmis2F-GcJCAWAqdAB7ucSzYvvA841.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":59,
-								"status":null,
-								"title":"优斐斯修护系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/index.html?id=1285",
-								"image":"https://img.caimei365.com/group1/M00/03/BF/Cmis2F-GcFqAXiioAAFxGLPuidY392.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":36,
-								"status":null,
-								"title":"伯纳赫点斗修护系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-132.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9R_5eAOfXIAADU3Nytmv0342.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":47,
-								"status":null,
-								"title":"Reyoungel瑞漾修护系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/prolist-1211.html?brandID=0",
-								"image":"https://img.caimei365.com/group1/M00/03/3C/Cmis21y-xz2AHSu0AAGcagKhNL0844.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":53,
-								"status":null,
-								"title":"UPLANT宫龄修护系列",
-								"detail":null,
-								"link":"https://www.caimei365.com/supplier/prolist-1247.html",
-								"image":"https://img.caimei365.com/group1/M00/03/5C/Cmis211CTB2ARsSXAACVJxRbLsc158.jpg",
-								"beginTime":null,
-								"endTime":null
-							}
-						]
-					},
-					{
-						"id":12,
-						"type":null,
-						"title":"导入液 针剂 ",
-						"detail":"水光导入液 塑形针剂 配套耗材",
-						"link":null,
-						"subFloors":null,
-						"floorData":[
-							{
-								"id":50,
-								"status":null,
-								"title":"青春抗衰动能素",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-182.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9R-XKAGQppAADFs1u-igo687.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":39,
-								"status":null,
-								"title":"无针水光导入液",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-138.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9R-WmAJ48rAAChfUHq0jE879.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":43,
-								"status":null,
-								"title":"补水 塑形针剂",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-141.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9R-V2ADyOEAAEnv5BPpTA478.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":40,
-								"status":null,
-								"title":"小气泡溶液",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-139.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9R-VCACzDVAADJ7-QlA04237.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":42,
-								"status":null,
-								"title":"治疗头",
-								"detail":null,
-								"link":"https://www.caimei365.com/cmpage/info-1-142.html",
-								"image":"https://img.caimei365.com/group1/M00/01/17/Cmis21vESJGAJ-L8AACdGTWUK_Y617.jpg",
-								"beginTime":null,
-								"endTime":null
-							}
-						]
-					},
-					{
-						"id":3,
-						"type":null,
-						"title":"项目仪器",
-						"detail":"紧致抗衰 私密养护 美白祛斑 减脂塑形",
-						"link":null,
-						"subFloors":null,
-						"floorData":[
-							{
-								"id":11,
-								"status":null,
-								"title":"除皱抗衰项目系列",
-								"detail":null,
-								"link":"http://www.caimei365.com/cmpage/info-1-39.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9SAH6ASXTuAAB-HRqRRMI866.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":10,
-								"status":null,
-								"title":"美白祛斑项目系列",
-								"detail":null,
-								"link":"http://www.caimei365.com/cmpage/info-1-38.html",
-								"image":"https://img.caimei365.com/group1/M00/03/9A/Cmis2F8H3g6AZrebAAB-P2l3KJQ806.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":9,
-								"status":null,
-								"title":"祛妊娠纹项目系列",
-								"detail":null,
-								"link":"http://www.caimei365.com/cmpage/info-1-40.html",
-								"image":"https://img.caimei365.com/group1/M00/03/9A/Cmis2F8H3gWASntuAADIG70r2WM840.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":7,
-								"status":null,
-								"title":"瘦身塑形项目系列",
-								"detail":null,
-								"link":"http://www.caimei365.com/cmpage/info-1-7.html",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9SDIyADjOuAAChTjRFOmI030.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":6,
-								"status":null,
-								"title":"私密养护项目系列",
-								"detail":null,
-								"link":"http://www.caimei365.com/cmpage/info-1-41.html",
-								"image":"https://img.caimei365.com/group1/M00/03/9A/Cmis2F8H3fOAE8UeAABaHH4JaDo889.jpg",
-								"beginTime":null,
-								"endTime":null
-							}
-						]
-					},
-					{
-						"id":5,
-						"type":null,
-						"title":"会所常用品",
-						"detail":"面膜粉 洁面巾 卸妆棉 按摩精油",
-						"link":null,
-						"subFloors":null,
-						"floorData":[
-							{
-								"id":12,
-								"status":null,
-								"title":"按摩精油",
-								"detail":null,
-								"link":"http://www.caimei365.com/product/search/list/0-0-0-1-0.html?wd=%25E6%258C%2589%25E6%2591%25A9%25E7%25B2%25BE%25E6%25B2%25B9&amp;searchTypeID=0",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9SCp6AbxEmAACsLXphp3o046.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":13,
-								"status":null,
-								"title":"软膜粉",
-								"detail":null,
-								"link":"https://www.caimei365.com/product/search/list/0-0-0-1-0.html?wd=%2520%25E8%25BD%25AF%25E8%2586%259C%25E7%25B2%2589&amp;searchTypeID=0",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9SCpiALQVKAADRAwxVJyU552.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":15,
-								"status":null,
-								"title":"卸妆棉",
-								"detail":null,
-								"link":"http://www.caimei365.com/product/search/list/0-0-0-1-0.html?wd=%25E5%258C%2596%25E5%25A6%2586%25E6%25A3%2589&amp;searchTypeID=0",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9SCpGAAnfkAACLsfmvAUM980.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":14,
-								"status":null,
-								"title":"无纺布制品",
-								"detail":null,
-								"link":"http://www.caimei365.com/product/search/list/0-0-0-1-0.html?wd=%25E6%2597%25A0%25E7%25BA%25BA%25E5%25B8%2583&amp;searchTypeID=0",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9SCouABo2yAABoFVyTJ3A443.jpg",
-								"beginTime":null,
-								"endTime":null
-							},
-							{
-								"id":8,
-								"status":null,
-								"title":"洁面巾",
-								"detail":null,
-								"link":"http://www.caimei365.com/product/search/list/0-0-0-1-0.html?wd=%25E6%25B4%2581%25E9%259D%25A2%25E5%25B7%25BE&amp;searchTypeID=0",
-								"image":"https://img.caimei365.com/group1/M00/03/B3/Cmis2F9SCoaAf0xsAADEJHhV2oM348.jpg",
-								"beginTime":null,
-								"endTime":null
-							}
-						]
-					}
-				],
+				pagesProductList:[],
 			}
 		},
 		filters: {
			NumFormat:function(text) {//处理金额
				return Number(text).toFixed(2);
			},
		},
@@ -472,11 +51,70 @@
 		},
 		methods:{
 			initData(res){
-				
+				this.pagesProductList = res
 				console.log(this.hotProductList)
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			NavToDetailPage(floor) {//跳转
+				console.log(floor)
+				switch(floor.linkType){
+					case 1://二级页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`)
+						break;
+					case 2://搜索项目仪器 
+						this.$api.navigateTo(`/pages/search/search-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 3://直播页面
+						this.$api.navigateTo(``)
+						break;
+					case 4://自由页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 5://商品详情
+						this.$api.navigateTo(`/pages/goods/product?id=${floor.linkParam.id}`)
+						break;
+					case 6://仪器项目详情
+						this.$api.navigateTo(`/pages/goods/instrument-details?id=${floor.linkParam.id}`)
+						break;
+					case 7://供应商主页 
+						this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`)
+						break;
+					case 8://专题活动页
+						this.$api.navigateTo(`/h5/pages/activity/activity-list`)
+						break;
+					case 9://二手市场介绍
+						this.$api.navigateTo(`/second/pages/form/introduce`)
+						break;
+					case 10://二手商品列表
+						this.$api.navigateTo(`/second/pages/product/product-list`)
+						break;
+					case 11://二手商品发布
+						this.$api.navigateTo(`/second/pages/form/form`)
+						break;
+					case 12://商品搜索
+						this.$api.navigateTo(`/pages/search/search?keyWord=${floor.title}`)
+						break;
+					case 13://信息详情
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 14://品牌招商介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 15://维修保养介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 16://首页
+						this.$api.switchTabTo(`/pages/tabBar/home/index`)
+						break;
+					case 17://注册页 
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 18://信息中心
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 19://供应商列表
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+				}
 			}
 		}
 	}
@@ -534,27 +172,28 @@
 			flex-direction: column;
 			flex-shrink: 0;
 			margin-right: 12rpx;
-			padding: 0 9rpx;
 		}
 		.tui-goods__imgbox {
-			width: 182rpx;
-			height: 182rpx;
+			width: 200rpx;
+			height: 200rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			box-sizing: border-box;
 		}
 		.tui-goods__img {
-			max-width: 182rpx;
-			max-height: 182rpx;
+			max-width: 200rpx;
+			max-height: 200rpx;
 			display: block;
-			border-radius: 10rpx;
+			border-radius: 10rpx 10rpx 0 0;
 		}
 		.tui-pri__box {
-			max-width: 182rpx;
+			max-width: 200rpx;
 			display: flex;
 			justify-content: center;
 			align-items: center;
+			box-sizing: border-box;
+			padding: 0 10rpx;
 		}
 		.tui-sale-pri {
 			display: flex;

components/cm-module/homeIndex/specialProduct.vue

@@ -3,12 +3,12 @@
 		<view class="swiper-banner-title">商品专题</view>
 		<view class="swiper-banner-box" >
 			<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
-				<swiper-item v-for="(item,index) in listArray" :key="index">
+				<swiper-item v-for="(item,index) in bannerList" :key="index" @click="NavToDetailPage(item)">
 					<image :src="item.image" class="tui-slide-image" mode="scaleToFill"/>
 				</swiper-item>
 			</swiper>
-			<view class="swiper__dots-box" v-if="listArray.length > 1">
-				<view v-for="(item,idx) in listArray" 
+			<view class="swiper__dots-box" v-if="bannerList.length > 1">
+				<view v-for="(item,idx) in bannerList" 
 					  :key="idx" 
 					  :class="[idx===current?'swiper__dots-long':'none']" 
 					  :data-index="current" class="swiper__dots-item">
@@ -16,7 +16,7 @@
 			</view>
 		</view>
 		<view class="swiper-goods-box">
-			<view class="goods-box-item" v-for="(item,index) in goodArray" :key="index">
+			<view class="goods-box-item" v-for="(item,index) in productList" :key="index" @click="NavToDetailPage(item)">
 				<image :src="item.image" mode="" class="box-item-image"></image>
 				<view class="box-item-mask">{{ item.title }}</view>
 			</view>
@@ -30,35 +30,95 @@
 		props:{
 			list:{
 				type:Array
+			},
+			listB:{
+				type:Array
 			}
+			
 		},
 		data() {
 			return{
 				current:0,
-				listArray:[
-					{image:'https://m.360buyimg.com/mobilecms/s700x280_jfs/t1/114550/12/7437/102254/5ec3971fE78db18f4/438d4775f9d653ee.jpg!q70.jpg.dpg'},
-					{image:'https://m.360buyimg.com/mobilecms/s700x280_jfs/t1/126187/19/17323/149042/5fa13ef1E6bc65f5b/8fbecafdbf0e4736.jpg!q70.jpg.dpg'},
-					{image:'https://m.360buyimg.com/mobilecms/s700x280_jfs/t1/126522/38/16493/151268/5f9940bfE9bf4ce43/b9a09e36102a9667.jpg!q70.jpg.dpg'}
-				],
-				goodArray:[
-					{image:'https://img.caimei365.com/group1/M00/03/A2/Cmis2F8VTz2AIH2JAAIDFdpGDsE352.jpg',title:'优斐斯术后护理产品搭配应用'},
-					{image:'https://img.caimei365.com/group1/M00/03/5B/Cmis2F1bq0yATM6SAAEcNkc0bwk054.jpg',title:'肌本演绎·动能精华素'},
-					{image:'https://img.caimei365.com/group1/M00/03/BF/Cmis2F-GZJOAdquJAADIHkLdHVE324.jpg',title:'科医人第六代王者之冠M22'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-				]
+				bannerList:[],
+				productList:[]
 			}
 		},
 		created(){
-			
+			this.initData(this.list,this.listB)
 		},
 		computed: {
 	
 		},
 		methods:{
+			initData(list,listB){
+				this.bannerList = list
+				this.productList = listB
+			},
 			swiperChange(e) {//轮播图切换
 				const index = e.detail.current;
 				this.current = index;
 			},
+			NavToDetailPage(floor) {//跳转
+				switch(floor.linkType){
+					case 1://二级页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`)
+						break;
+					case 2://搜索项目仪器 
+						this.$api.navigateTo(`/pages/search/search-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 3://直播页面
+						this.$api.navigateTo(``)
+						break;
+					case 4://自由页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 5://商品详情
+						this.$api.navigateTo(`/pages/goods/product?id=${floor.linkParam.id}`)
+						break;
+					case 6://仪器项目详情
+						this.$api.navigateTo(`/pages/goods/instrument-details?id=${floor.linkParam.id}`)
+						break;
+					case 7://供应商主页 
+						this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`)
+						break;
+					case 8://专题活动页
+						this.$api.navigateTo(`/h5/pages/activity/activity-list`)
+						break;
+					case 9://二手市场介绍
+						this.$api.navigateTo(`/second/pages/form/introduce`)
+						break;
+					case 10://二手商品列表
+						this.$api.navigateTo(`/second/pages/product/product-list`)
+						break;
+					case 11://二手商品发布
+						this.$api.navigateTo(`/second/pages/form/form`)
+						break;
+					case 12://商品搜索
+						this.$api.navigateTo(`/pages/search/search?keyWord=${floor.title}`)
+						break;
+					case 13://信息详情
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 14://品牌招商介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 15://维修保养介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 16://首页
+						this.$api.switchTabTo(`/pages/tabBar/home/index`)
+						break;
+					case 17://注册页 
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 18://信息中心
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 19://供应商列表
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+				}
+			}
 		}
 	}
 </script>

components/cm-module/homeIndex/supplierList.vue

@@ -7,7 +7,7 @@
 			<view class="tui-sub__desc">采美正品联盟 质量保证</view>
 		</view>
 		<view class="swiper-goods-box">
-			<view class="goods-box-item" v-for="(item,index) in goodArray" :key="index">
+			<view class="goods-box-item" v-for="(item,index) in list" :key="index" @click="NavToDetailPage(item)">
 				<image :src="item.image" mode="" class="box-item-image"></image>
 				<view class="box-item-mask">{{ item.title }}</view>
 			</view>
@@ -29,30 +29,22 @@
 		},
 		data() {
 			return{
-				goodArray:[
-					{image:'https://img.caimei365.com/group1/M00/03/A2/Cmis2F8VTz2AIH2JAAIDFdpGDsE352.jpg',title:'优斐斯术后护理产品搭配应用'},
-					{image:'https://img.caimei365.com/group1/M00/03/5B/Cmis2F1bq0yATM6SAAEcNkc0bwk054.jpg',title:'肌本演绎·动能精华素'},
-					{image:'https://img.caimei365.com/group1/M00/03/BF/Cmis2F-GZJOAdquJAADIHkLdHVE324.jpg',title:'科医人第六代王者之冠M22'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-					{image:'https://img.caimei365.com/group1/M00/03/38/Cmis21yweGSAdSCdAADddSdkc1E158.jpg',title:'赛诺龙360'},
-				]
+				supplierList:[]
 			}
 		},
 		created(){
-			
+			this.initData(this.list)
 		},
 		computed: {
 	
 		},
 		methods:{
-			
+			initData(res){
+				this.supplierList = res
+			},
+			NavToDetailPage(item) {//跳转
+				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${item.linkParam.id}`)
+			}
 		}
 	}
 </script>

pages.json

@@ -77,6 +77,12 @@
 				"navigationBarTitleText": "商品列表",
 				"enablePullDownRefresh":true
 			}
+		},{
+			"path": "pages/goods/goods-instrument",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh":true
+			}
 		},{
 			"path": "pages/goods/goods-classify",
 			"style": {
@@ -101,6 +107,12 @@
 				"navigationBarTitleText": "商品详情",
 				"navigationStyle":"custom"
 			}
+		},{
+			"path": "pages/goods/instrument-details",
+			"style": {
+				"navigationBarTitleText": "项目仪器详情",
+				"navigationStyle":"custom"
+			}
 		},{
 			"path": "pages/goods/supplier",
 			"style": {

pages/goods/goods-instrument.vue

@@ -0,0 +1,257 @@
+<template>
+	<view class="container instrument">
+		<view class="banner">
+			<view class="banner-image">
+				<image :src="banner" mode=""></image>
+			</view>
+		</view>
+		<view class="instrument-list">
+			<view class="list-item-cell" v-for="(item,index) in list" :key="index">
+				<view class="list-item-title">
+					<view class="title" :class="item.link ? 'float' : ''">
+						<text>{{ item.title }}</text>
+					</view>
+					<view class="more" v-if="item.link" @click="details(item)">
+						<text>查看更多</text>
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+				</view>
+				<view class="list-item-pros">
+					<view class="item-pros" v-for="(pros,prosIndex) in item.floorData" :key="prosIndex" @click="details(pros)">
+						<view class="item-pros-image">
+							<image :src="pros.image" mode=""></image>
+						</view>
+						<view class="item-pros-name">{{ pros.title }}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 侧边 -->
+		<scroll-top v-if="isScrollTop"></scroll-top>
+	</view>
+</template>
+
+<script>
+	export default{
+		components:{
+			
+		},
+		data(){
+			return{
+				banner:'',
+				list:[],
+				linkType:0,
+				isScrollTop:false,
+				linkTitle:''
+			}
+		},		
+		onLoad(option) {
+			console.log(option)
+			let _self = this
+			this.linkType = option.linkId
+			this.linkTitle = option.title
+			uni.setNavigationBarTitle({title:_self.linkTitle});
+			this.GetPageTopicInfo()
+		},
+		methods:{
+			GetPageTopicInfo(){//获取数据
+				this.ProductService.GetPageTopic({type:this.linkType}).then(response =>{
+					let data = response.data
+					this.list = data
+					this.GetPageTopicBanner()
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			GetPageTopicBanner(){//获取banner
+				this.ProductService.GetPageTopicBanner({type:this.linkType}).then(response =>{
+					let data = response.data
+					this.banner = data.image
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			details(floor){
+				console.log(floor)
+				switch(floor.linkType){
+					case 1://二级页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`)
+						break;
+					case 2://搜索项目仪器 
+						this.$api.navigateTo(`/pages/search/search-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 3://直播页面
+						this.$api.navigateTo(``)
+						break;
+					case 4://自由页面
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 5://商品详情
+						this.$api.navigateTo(`/pages/goods/product?id=${floor.linkParam.id}`)
+						break;
+					case 6://仪器项目详情
+						this.$api.navigateTo(`/pages/goods/instrument-details?id=${floor.linkParam.id}`)
+						break;
+					case 7://供应商主页 
+						this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`)
+						break;
+					case 8://专题活动页
+						this.$api.navigateTo(`/h5/pages/activity/activity-list`)
+						break;
+					case 9://二手市场介绍
+						this.$api.navigateTo(`/second/pages/form/introduce`)
+						break;
+					case 10://二手商品列表
+						this.$api.navigateTo(`/second/pages/product/product-list`)
+						break;
+					case 11://二手商品发布
+						this.$api.navigateTo(`/second/pages/form/form`)
+						break;
+					case 12://商品搜索
+						this.$api.navigateTo(`/pages/search/search?keyWord=${floor.title}`)
+						break;
+					case 13://信息详情
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 14://品牌招商介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 15://维修保养介绍页 
+						this.$api.navigateTo(`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}`)
+						break;
+					case 16://首页
+						this.$api.switchTabTo(`/pages/tabBar/home/index`)
+						break;
+					case 17://注册页 
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 18://信息中心
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+					case 19://供应商列表
+						this.$api.navigateTo(`/pages/login/register-select`)
+						break;
+				}
+			}
+		},
+		onPageScroll(e){//实时获取到滚动的值
+			if(e.scrollTop>600){
+				this.isScrollTop = true
+			}else{
+				this.isScrollTop = false
+			}	
+		},
+		onShow() {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F7F7F7;
+	}
+	.instrument{
+		width: 100%;
+		height: auto;
+		.banner{
+			box-sizing: border-box;
+			padding:24rpx;
+			background-color: #FFFFFF;
+			width: 100%;
+			.banner-image{
+				width: 100%;
+				height: 248rpx;
+				border-radius: 4rpx;
+			}
+			image{
+				width: 100%;
+				height: 248rpx;
+				border-radius: 4rpx;
+			}
+		}
+		.instrument-list{
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			.list-item-cell{
+				width: 100%;
+				height: auto;
+				float: left;
+				.list-item-title{
+					width: 100%;
+					height: 88rpx;
+					line-height: 88rpx;
+					float: left;
+					.title{
+						font-size: $font-size-28;
+						line-height: 80rpx;
+						color: $text-color;
+						font-weight: bold;
+						&.float{
+							float: left;
+						}
+					}
+					.more{
+						font-size: $font-size-26;
+						line-height: 80rpx;
+						color: #999999;
+						height: 80rpx;
+						float: right;
+						.icon-xiangyou{
+							font-size: $font-size-28;
+							margin-left: 10rpx;
+						}
+					}
+				}
+				.list-item-pros{
+					width: 100%;
+					height: auto;
+					float: left;
+					.item-pros{
+						width: 340rpx;
+						height: 414rpx;
+						float: left;
+						margin-right: 20rpx;
+						margin-bottom: 20rpx;
+						background-color: #FFFFFF;
+						border-radius: 4rpx;
+						&:nth-child(2n){
+							margin-right: 0;
+						}
+						.item-pros-image{
+							width: 340rpx;
+							height: 340rpx;
+							float: left;
+							image{
+								width: 340rpx;
+								height: 340rpx;
+								display: block;
+								border-radius: 4rpx 4rpx 0 0;
+							}
+						}
+						.item-pros-name{
+							width: 100%;
+							height: 74rpx;
+							line-height: 74rpx;
+							box-sizing: border-box;
+							padding: 0 24rpx;
+							white-space: normal;
+							word-break: break-all;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1;
+							text-align: center;
+							font-size: $font-size-26;
+							line-height: 74rpx;
+							text-align: center;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

pages/goods/instrument-details.vue

@@ -25,13 +25,6 @@
 				</view>
 				<view class="product-wrap clearfix">
 					<view class="wrap-top" :class="goodsData.isNoneDisabled ? 'none' : ''">
-						<view class="wrap-top-price" v-if="!goodsData.isNoneDisabled">
-							<cm-price v-if="isRequest"
-									  :product="product"
-									  :userIdentity="userIdentity"
-									  :promotions="product.promotions"
-									  :ladderPriceList="ladderPriceList"/>
-						</view>
 						<view class="p-title tui-skeleton-fillet">
 							<view class="p-title-name">
 								{{product.name == undefined ? '' : product.name}}
@@ -61,22 +54,6 @@
 				<text class="name">品牌  起订量  分类...</text>
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
-			<view class="product-supplier" @click="goSupplier">
-				<view class="logo"><img src="https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png" alt=""></view>
-				<view class="main">
-					<view class="name">{{shop.name}}</view>
-					<view class="massgs">
-						<view class="label">满意度:</view>
-						<view class="p-stars">
-							<uni-stars :stars="6" :iconClass="iconClass" :iconColor="iconColor" :fontSize="36" :widthInfo="176"></uni-stars>
-						</view>
-						<view class="acount">
-							<text>50</text>件商品
-						</view>
-					</view>
-				</view>
-				<view class="right"><text class="iconfont icon-xiayibu"></text></view>
-			</view>
 			<view class="product-details">
 				<!-- 商品详情 -->
 				<view class="title">
@@ -862,70 +839,6 @@
 				display: inline-block;
 			}
 		}
-		.wrap-top-price{
-			float: left;
-			width: 100%;
-			box-sizing: border-box;
-			.wrap-main-item{
-				width: 100%;
-				height: 56rpx;
-				.p-price{
-					height: 56rpx;
-					line-height: 56rpx;
-					float: left;
-					color: #FF2A2A;
-					font-weight: bold;
-					&.none{
-						text-decoration: line-through;
-						color: #999999;
-						font-weight: normal;
-					}
-					.txt{
-						margin:0 2rpx;
-					}
-					.txt.sm{
-						font-size: $font-size-26;
-					}
-					.txt.big{
-						font-size: $font-size-34;
-					}
-				}
-			}
-			.floor-item-act{
-				height: 56rpx;
-				text-align: center;
-				box-sizing: border-box;
-				float: left;
-				padding:10rpx 0;
-				margin-left: 10rpx;
-				.floor-tags{
-					float: right;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
-					color: $color-system;
-					text-align: center;
-					display: inline-block;
-					padding:0 16rpx;
-					font-size: $font-size-20;
-				}
-			}
-			.floor-item-btn{
-				float: right;
-				height: 40rpx;
-				margin-top: 8rpx;
-				.btn{
-					line-height: 40rpx;
-					padding: 0 20rpx;
-					height: 40rpx;
-					background: $btn-confirm;
-					color: #FFFFFF;
-					font-size: $font-size-20;
-					border-radius: 4rpx;
-				}
-			}
-		}
 		.wrap-info{
 			float: left;
 			width: 702rpx;
@@ -1033,77 +946,6 @@
 			color: #b2b2b2;
 		}
 	}
-	.product-supplier{
-		width: 100%;
-		height: 174rpx;
-		padding: 30rpx 24rpx;
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		position: relative;
-		box-sizing: border-box;
-		border-bottom: 20rpx solid #F7F7F7;
-		.logo{
-			width: 128rpx;
-			height: 92rpx;
-			float: left;
-			border: 1px solid #efefef;
-			border-radius: 6rpx;
-			image{
-				width: 100%;
-				height: 100%;
-				display: block;
-				border-radius: 6rpx;
-			}
-		}
-		.main{
-			width: 470rpx;
-			height: 92rpx;
-			float: left;
-			margin-left: 20rpx;
-			.name{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-28;
-				color: $text-color;
-				float: right;
-				overflow: hidden;
-				text-overflow:ellipsis;
-				white-space: nowrap;
-				text-align: left;
-			}
-			.massgs{
-				width: 100%;
-				line-height: 46rpx;
-				float: left;
-				font-size: $font-size-24;
-				color: #999999;
-				.label{
-					float: left;
-				}
-				.p-stars{
-					float: left;
-					margin-left: 20rpx;
-				}
-				.acount{
-					float: right;
-					text{
-						color: $color-system;
-					}
-				}
-			}
-		}
-		
-		.icon-xiayibu{
-			line-height: 154rpx;
-			display: inline-block;
-			position: absolute;
-			width: 48rpx;
-			top: 0;
-			right: 0;
-			color: #b2b2b2;
-		}
-	}
 	.product-details {
 		width: 100%;
 		background: #FFFFFF;

pages/search/search.vue

@@ -1,9 +1,21 @@
 <template>
 	<view class="search-container">
 		<view class="search-main">
-			<view class="search-input">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input maxlength="20" :focus="isFocus" type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="searchInputVal"/>
+			<view class="search-tab">
+				<view class="search-tab-btn"  @click="topBubble">
+					<text>{{ tabValue }}</text>
+					<text class="iconfont icon-xiangxiajiantou"></text>
+				</view>
+				<tui-bubble-popup :show="show" :mask="true" position="absolute" direction="top" @close="topBubble" width="140rpx"
+				 left="10rpx" bottom="0rpx" translateY="100%" triangleRight="60rpx" triangleTop="-22rpx" :maskBgColor="maskBgColor">
+					<view class="tui-menu-item" @tap="selectTabs(1)">产品</view>
+					<view class="tui-menu-item" @tap="selectTabs(2)">供应商</view>
+					<view class="tui-menu-item" @tap="selectTabs(3)">项目仪器</view>
+				</tui-bubble-popup>
+			</view>
+			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
+				<text class="iconfont icon-sousuo"></text>
+				<input class="input" maxlength="20" :focus="isFocus" type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入关键词" v-model.trim="searchInputVal"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
 			</view>
 			<view class="search-btn" @click="subMitSearch()">搜索</view>
@@ -111,10 +123,13 @@
 		data() {
 			return {
 				userID:0,
+				tabValue:'产品',
 				themeClass: 'block',
+				show:false,
 				searchInputVal:'',	//搜索关键词
 				userIdentity:'',	
 				identity:2,
+				searchKeyType:1,
 				isShowClose:false,	//是否显示清空输入框图标
 				isSearchHistory:false,//是都显示搜索历史
 				serachRecordList:[],//历史搜索记录
@@ -137,8 +152,13 @@
 				pullFlag: true,
 			}
 		},
-		onLoad() {
+		onLoad(option) {
 			this.isFocus = true
+			console.log(option)
+			if(option.keyWord){
+				this.searchInputVal = option.keyWord
+				this.getListFromServer();
+			}
 			this.initGetSerachRecord()			
 		},
 		filters: {
@@ -170,10 +190,20 @@
 				if (this.searchInputVal == '') {
 					this.$util.msg('请输入商品关键词',2000);
 				}else{
-					this.listData =[]
-					this.setSearchHistoryAdd()
-					this.getListFromServer()
-					this.isFocus = false
+					switch(this.searchKeyType){
+						case 1:
+							this.listData =[]
+							this.setSearchHistoryAdd()
+							this.getListFromServer()
+							this.isFocus = false
+							break;
+						case 2:
+							this.$api.navigateTo(`/pages/search/search-supplier?keyword=${this.searchInputVal}`);
+							break;
+						case 3:
+							this.$api.navigateTo(`/pages/search/search-instrument?keyword=${this.searchInputVal}`);
+							break;
+					}
 				}
 			},
 			scrolltolower() {
@@ -333,7 +363,25 @@
 				uni.navigateTo({
 					url:`/pages/login/login?type=${searchLoginType}`
 				})
-			}
+			},
+			selectTabs(index){//选择搜索项
+				this.show = false
+				this.searchKeyType = index
+				switch(index){
+					case 1:
+						this.tabValue='产品'
+						break;
+					case 2:
+						this.tabValue='供应商'
+						break;
+					case 3:
+						this.tabValue='项目仪器'
+						break;
+				}
+			},
+			topBubble() {//显隐搜索项
+				this.show = !this.show;
+			},
 		},
 		onShow() {
 			this.setScrollHeight();
@@ -347,70 +395,82 @@
 		background-color: #F7F7F7 !important;
 	}
 	.search-main{
-		width: 702rpx;
-		height: 70rpx;
-		padding: 12rpx 24rpx;
-		border-bottom: 1px solid #F0F0F0;
+		width: 100%;
+		height: 88rpx;
 		position: fixed;
 		top: 0;
 		left: 0;
 		background: #FFFFFF;
 		z-index: 1001;
-		.search-input{
-			width: 448rpx;
+		box-sizing: border-box;
+		padding: 9rpx 0;
+		.search-tab{
+			width: 160rpx;
 			height: 70rpx;
-			padding: 0 68rpx;
 			line-height: 70rpx;
-			border-radius: 40rpx;
+			color: #666666;
+			font-size: $font-size-24;
+			text-align: center;
+			float: left;
 			position: relative;
-			background: #F0F0F0;
+			.icon-xiangxiajiantou{
+				margin-left: 10rpx;
+				font-size: $font-size-30;
+			}
+		}
+		.gosearch-btn{
+			width: 470rpx;
+			height: 100%;
 			float: left;
-			.icon-iconfonticonfontsousuo1{
+			border-radius: 40rpx;
+			background: #F0F0F0;
+			margin: 0 auto;
+			padding:0 20rpx;
+			font-size: 28rpx;
+			line-height: 70rpx;
+			padding-left: 70rpx;
+			color: #8A8A8A;
+			background: #F7F7F7;
+			position: relative;
+			box-sizing: border-box;
+			.icon-sousuo{
+				width: 70rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
 				display: block;
-				width: 68rpx;
-				font-size: 36rpx;
-				color: #8A8A8A;
 				position: absolute;
-				left: 24rpx;
+				left: 0;
+				top: 0;
+				font-size: 34rpx;
+				color: #8A8A8A;
 				z-index: 10;
 			}
 			.icon-shanchu1{
-				display: block;
-				width: 68rpx;
 				font-size: 36rpx;
-				text-align: center;
-				color: #999;
+				color: #8A8A8A;
 				position: absolute;
-				right: 0;
+				right: 24rpx;
 				top: 0;
-				z-index: 60;
+				padding: 0 10rpx;
+				z-index: 100;
 			}
-			input{
-				width: 448rpx;
-				height: 70rpx;
-				background-color: #F0F0F0;
-				font-size: 26rpx;
+			.input{
+				width: 400rpx;
+				height: 100%;
+				float: left;
+				font-size: $font-size-24;
 			}
 		}
 		.search-btn{
-			width: 118rpx;
+			width: 120rpx;
 			height: 70rpx;
 			line-height: 70rpx;
-			color: $color-system;
-			font-size: 30rpx;
+			float: right;
 			text-align: center;
-			float: left;
-		}
-		.voice-icon{
-			width: 36rpx;
-			height: 36rpx;
-			padding: 16rpx 20rpx 16rpx 0;
-			position: absolute;
-			left: 16rpx;
-			top: 4rpx;
-			z-index: 10;
+			color: $color-system;
+			font-size: $font-size-24;
 		}
-		
 	}
 	.search-container{
 		padding-top: 96rpx;

pages/tabBar/home/home.vue

@@ -254,9 +254,10 @@
 							if(response.data.userIdentity ==1){
 								this.$api.navigateTo('/seller/pages/index/index')
 							}else if(response.data.userIdentity === 3){
-								this.$api.navigateTo('/supplier/pages/index/index')
+								// this.$api.navigateTo('/supplier/pages/index/index')
 							}
 							this.getHomeInformation()
+							this.GetHomeFloorInfo()
 							this.getOrganizeProducts()
 						}).catch(error =>{
 							this.isLogin = false;
@@ -265,11 +266,19 @@
 							uni.setStorageSync('sessionid','JSESSIONID='+error.data)
 							this.$store.commit('updateStatus',error.data)
 							this.getHomeInformation()
+							this.GetHomeFloorInfo()
 							this.getOrganizeProducts()
 						})
 					})
 				})
 			},		
+			GetHomeFloorInfo(){//初始化首页楼层数据
+				this.CommonService.GetHomeFloorInfo().then(response =>{
+					console.log(response)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
 			getHomeInformation(){//初始化首页数据	
 				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
 					let data = res.data;

pages/tabBar/home/index.vue

@@ -11,13 +11,13 @@
 		</view>	
 		<view class="container-section tui-skeleton">
 			<!-- 推荐专区 -->
-			<hot-product :list="organizeProducts" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+			<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
 			<!-- 楼层 -->
-			<pages-product v-if="isRequest"></pages-product>
+			<pages-product :list="pagesList" v-if="isRequest"></pages-product>
 			<!-- 商品专题 -->
-			<special-product v-if="isRequest"></special-product>
+			<special-product :list="specialList" :listB="specialProList" v-if="isRequest"></special-product>
 			<!-- 供应商专题 -->
-			<supplier-list v-if="isRequest"></supplier-list>
+			<supplier-list :list="supplierList" v-if="isRequest"></supplier-list>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top v-if="isScrollTop"></scroll-top>
@@ -69,11 +69,15 @@
 				mode:'round',
 				modallayer:false,
 				isLogin:false,
-				bannerImageList:[],
-				navBarsList:[],
 				skeletonShow: true,
 				userIdentity:'',
+				bannerImageList:[],//轮播
+				navBarsList:[],//导航分类
+				pagesList:[],//楼层
 				RecommendList:[],//热门推荐
+				specialList:[],//商品专题轮播
+				specialProList:[],//商品专题商品
+				supplierList:[],//供应商列表
 				organizeProducts:[],//常用商品
 				productsClassifyList:[
 					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
@@ -130,8 +134,9 @@
 							if(response.data.userIdentity ==1){
 								this.$api.navigateTo('/seller/pages/index/index')
 							}else if(response.data.userIdentity === 3){
-								this.$api.navigateTo('/supplier/pages/index/index')
+								// this.$api.navigateTo('/supplier/pages/index/index')
 							}
+							this.GetHomeFloorInfo()
 							this.getHomeInformation()
 						}).catch(error =>{
 							this.isLogin = false;
@@ -139,12 +144,38 @@
 							uni.removeStorageSync('sessionid')
 							uni.setStorageSync('sessionid','JSESSIONID='+error.data)
 							this.$store.commit('updateStatus',error.data)
+							this.GetHomeFloorInfo()
 							this.getHomeInformation()
 							
 						})
 					})
 				})
 			},		
+			GetHomeFloorInfo(){//初始化首页楼层数据
+				this.CommonService.GetHomeFloorInfo({}).then(response =>{
+					let data = response.data
+					data.forEach((item,index) => {
+						switch(item.type){
+							case 3:
+								this.supplierList = item.floorData
+								console.log(this.supplierList)
+								break;	
+							case 4:
+								this.specialList = item.floorData
+								console.log(this.specialList)
+								break;	
+							case 5:
+								this.specialProList = item.floorData
+								break;	
+							case 6:
+								this.pagesList = item.subFloors
+								break;
+						}
+					})
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
 			getHomeInformation(){//初始化首页数据	
 				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
 					let data = res.data;
@@ -157,14 +188,14 @@
 					this.thirdModulesName= data.thirdModulesName
 					this.productsClassifyList = data.productsClassifyList
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
-					this.getOrganizeProducts()				
+					this.GetHomeRecommendInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
 			GetHomeRecommendInfo(){//首页热门推荐
 				this.CommonService.GetHomeRecommendInfo().then(response =>{
-					this.RecommendList=response.data
+					this.RecommendList = response.data
 					this.getProductPrice()
 				})
 			},
@@ -179,13 +210,13 @@
 			getProductPrice(){//获取商品或者活动价格
 				let productIdArr = [];
 				let productIds ='';
-				this.organizeProducts.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.productID)
+				this.RecommendList.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
+					productIdArr.push(item.id)
 				})
 				productIds = productIdArr.join(",");
 				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
-					this.organizeProducts = this.ReturnNewProducts(this.organizeProducts,response.data);
-					console.log(this.organizeProducts)
+					this.RecommendList = this.ReturnNewProducts(this.RecommendList,response.data);
+					console.log(this.RecommendList)
 					this.skeletonShow = false;
 					this.isRequest = true
 				}).catch(error =>{
@@ -196,7 +227,7 @@
 				let NewArray = []
 				Array.map(item=>{
 					for (let i = 0; i < list.length; i++) {
-						if( item.productID == list[i].productId ){
+						if( item.id == list[i].productId ){
 							NewArray.push(Object.assign(item,list[i])) 
 						}
 					}

services/ajax.env.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'

services/common.service.js

@@ -22,5 +22,13 @@ export default class CommonService {
 	QueryAfterSale (data = {}) {
 		return this.AjaxService.get({ url:'/home/afterSale', data, isLoading: false })
 	}
+	/* 首页金刚区分类 */
+	GetHomeInit (data = {}) {
+		return this.AjaxService.get({ url:'/home/init', data, isLoading: false })
+	}
+	/* 首页楼层 */
+	GetHomeFloorInfo (data = {}) {
+		return this.AjaxService.get({ url:'/home/floor', data, isLoading: false })
+	}
 	
 }

services/product.service.js

@@ -95,4 +95,12 @@ export default class ProductService {
 	shoppingCartDelete (data = {}) {
 		return this.AjaxService.post({ url:'/shoppingCart/delete', data, isLoading: true })
 	}
+	/* 二级列表 */
+	GetPageTopic (data = {}) {
+		return this.AjaxService.get({ url:'/page/topic', data, isLoading: false })
+	}
+	/* 二级列表banner */
+	GetPageTopicBanner (data = {}) {
+		return this.AjaxService.get({ url:'/page/topic/info', data, isLoading: false })
+	}
 }