zhengjinyi 4 vuotta sitten
vanhempi
commit
f52766c41d

+ 36 - 40
components/cm-module/homeIndex/navbars.vue

@@ -22,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(){
@@ -42,40 +33,45 @@
 		},
 		methods:{
 			initData(list){
-				this.navList = this.ReturnNewNavList(this.navList,list)
+				this.navList = list
 			},
-			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(item,index) {//跳转
-				console.log(index)
+			NavToDetailPage(pros,index) {//跳转
 				/**
 				 * 页面跳转类型
-				 * 0、1、2、二级页面,
-				 * 3、5、6、7、嵌h5页面
-				 * 4、二手商品列表
+				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
 				 **/
-				 const typeMap = {
-					0:`/pages/goods/goods-secondary?linkId=${item.id}`,
-					1:`/pages/goods/goods-secondary?linkId=${item.id}`,
-					2:`/pages/goods/goods-secondary?linkId=${item.id}`,
-					3:`/h5/pages/article/page?linkType=${index}`,
-					4:`/second/pages/product/product-list`,
-					5:`/h5/pages/article/page?linkType=${index}`,
-					6:`/h5/pages/article/page?linkType=${index}`,
-					7:`/h5/pages/article/page?linkType=${index}`,
-				 }
-				 const url = typeMap[index];
-				 console.log(url)
-				 this.$api.navigateTo(url)
+				if(pros.linkType){
+					if(pros.linkType === 3){
+						uni.navigateToMiniProgram({
+							appId: 'wx92d650b253f8f2e3',
+							path: '/pages/index/index',
+							extraData: {
+								'data1': 'test'
+							},
+							envVersion: 'develop',
+							success(res) {
+								console.log(res)
+								// 打开成功
+							}
+						})
+					 }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`,
+						 	14:`/h5/pages/other/brand`,
+						 	15:`/h5/pages/other/repair`,
+						 	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)
+					 }
+				}
 			}
 		}
 	}

+ 1 - 1
components/cm-module/listTemplate/secondHand.vue

@@ -243,7 +243,7 @@
 			},
 			navToDetailPage(id) {
 				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/secondProduct?id=${id}`);
+				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
 				this.isModallayer = false;
 			},
 			onShowClose () {//输入框失去焦点时触发

+ 38 - 3
components/cm-module/pageFloorTemplate/templateA.vue

@@ -3,7 +3,7 @@
 		<view class="floor-item ad_02">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
 		</view>
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -160,8 +160,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageFloorTemplate/templateB.vue

@@ -6,7 +6,7 @@
 		<view class="floor-item ad_02">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
 		</view>
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -163,8 +163,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageFloorTemplate/templateC.vue

@@ -6,7 +6,7 @@
 		<view class="floor-item ad_02">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" mode="aspectFill"></image>
 		</view>
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -163,8 +163,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageFloorTemplate/templateD.vue

@@ -9,7 +9,7 @@
 		<view class="floor-item ad_03">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage3" mode="aspectFill"></image>
 		</view>
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -166,8 +166,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageFloorTemplate/templateE.vue

@@ -3,7 +3,7 @@
 		<view class="floor-item ad_01">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" mode="aspectFill"></image>
 		</view>
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -160,8 +160,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageFloorTemplate/templateF.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="section_page_main clearfix">
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -157,8 +157,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateA.vue

@@ -3,7 +3,7 @@
 		<view class="floor-item ad_02">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" 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.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -160,8 +160,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateB.vue

@@ -6,7 +6,7 @@
 		<view class="floor-item ad_02">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" 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.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -163,8 +163,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateC.vue

@@ -6,7 +6,7 @@
 		<view class="floor-item ad_02">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage2" 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.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -163,8 +163,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateD.vue

@@ -9,7 +9,7 @@
 		<view class="floor-item ad_03">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage3" 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.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -166,8 +166,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateE.vue

@@ -3,7 +3,7 @@
 		<view class="floor-item ad_01">
 			<image class="item-img-gg" :src="floorData.floorContent.pcAdsImage1" 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.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -160,8 +160,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateF.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="section_page_main clearfix">
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 4" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -160,8 +160,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateG.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="section_page_main clearfix">
-		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 4" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+		<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>
 			<view class="floor-item_tag" v-if="item.listType == 2">
 				<text>{{ item.label }}</text>
@@ -157,8 +157,43 @@
 				}
 				return false
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 38 - 3
components/cm-module/pageTemplate/templateH.vue

@@ -3,7 +3,7 @@
 		<view class="recommend-list">
 			<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
 				<swiper-item v-for="(product,index) in productList" :key="index">
-					<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 4" :key="idx" @click.stop="navToDetailPage(item.product.productId)">
+					<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>
 						<view class="floor-item_tag" v-if="item.listType == 2">
 							<text>{{ item.label }}</text>
@@ -187,8 +187,43 @@
 				const index = e.detail.current;
 				this.swiperCurrent = index;
 			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			navToDetailPage(pros) {//跳转商品详情页
+				if(pros.listType == 1){
+					if(pros.product.productCategory == '1'){
+						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
+					}else{
+						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
+					}
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(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:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+						 	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=${pros.name}`,
+						 	13:`/h5/pages/article/page?link=${pros.link}`,
+						 	14:`/h5/pages/article/page?link=${pros.link}`,
+						 	15:`/h5/pages/article/page?link=${pros.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${pros.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+						 }
+						 const url = typeMap[pros.linkType];
+						 this.$api.navigateTo(url)
+					}
+				}
 			}
 		}
 	}

+ 93 - 0
h5/pages/other/brand.vue

@@ -0,0 +1,93 @@
+<template>
+	<view class="container clearfix" >
+		<view class="banner" :style="{paddingBottom :isIphoneX ? '120rpx' : '60rpx'}" v-if="isBannerHome">
+			<image class="banner-img" :src="item" mode="" v-for="(item,index) in image1" :key="index"></image>
+		</view>	
+		<view class="banner" :style="{paddingBottom :isIphoneX ? '120rpx' : '60rpx'}" v-if="isBannerOems">
+			<image class="banner-img" :src="item" mode="" v-for="(item,index) in image2" :key="index"></image>
+		</view>	
+		<view class="banner three" :style="{paddingBottom :isIphoneX ? '120rpx' : '60rpx'}" v-if="isBannerOhtr">
+			<image :src="banner" mode=""></image>
+		</view>	
+		<view class="container-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
+			<view class="btn" @click="NavToH5Page">申请维修</view>
+		</view>
+	</view>
+</template> 
+
+<script>
+	import { mapState,mapMutations} from 'vuex';
+	
+	export default{
+		data(){
+			return{
+				isIphoneX:this.$store.state.isIphoneX,
+				isBannerHome:true,
+				isBannerOems:false,
+				isBannerOhtr:false,
+				banner:'https://img.caimei365.com/group1/M00/03/82/Cmis214EJ4KANeefABcT34GgAI8964.jpg',
+				image1:[
+					'https://www.caimei365.com//img/investment/h5_1.jpg',
+					'https://www.caimei365.com//img/investment/h5_2.jpg',
+					'https://www.caimei365.com//img/investment/h5_3.jpg'
+				],
+				image2:[
+					'https://www.caimei365.com//img/investment/h5_4.jpg',
+					'https://www.caimei365.com//img/investment/h5_5.jpg'
+				]
+			}
+		},
+		onLoad(option) {
+			
+		},
+		methods:{
+			NavToH5Page() {//跳转H5超皮秒防伪查询
+				 this.$api.navigateTo(`/h5/pages/article/page?linkType=101`)
+			}
+		},
+		onShow() {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #FFFFFF;
+	}
+	.container{
+		width: 100%;
+		height: auto;
+		.container-btn{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 7rpx 24rpx;
+			background-color: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 999;
+			.btn{
+				width: 100%;
+				height: 100%;
+				background-image: $btn-confirm;
+				line-height: 84rpx;
+				border-radius: 42rpx;
+				text-align: center;
+				font-size: 26rpx;
+				color: #FFFFFF;
+			}
+		}
+		.banner{
+			width: 702rpx;
+			height: auto;
+			float: left;
+			padding: 0 24rpx;
+			image{
+				width: 100%;
+				height: auto;
+				display: block;
+			}
+		}
+	}
+</style>

+ 6 - 6
pages.json

@@ -119,12 +119,6 @@
 				"navigationBarTitleText": "商品详情",
 				"navigationStyle":"custom"
 			}
-		},{
-			"path": "pages/goods/secondProduct",
-			"style": {
-				"navigationBarTitleText": "商品详情",
-				"navigationStyle":"custom"
-			}
 		},{
 			"path": "pages/goods/instrument-details",
 			"style": {
@@ -524,6 +518,12 @@
 					"style": {
 						"navigationBarTitleText": "维修"
 					}
+				},
+				{
+					"path": "pages/other/brand",
+					"style": {
+						"navigationBarTitleText": "品牌招商"
+					}
 				}
 			]	
 		},{

+ 1 - 0
pages/goods/good-floor.vue

@@ -45,6 +45,7 @@
 			}
 		},
 		onLoad(option) {
+			console.log(option)
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.clubStatus = resolve.clubStatus
 				this.userID = resolve.userID ? resolve.userID : 0;

+ 0 - 1217
pages/goods/secondProduct.vue

@@ -1,1217 +0,0 @@
-<template>
-	<view class="product" :style="{paddingBottom: userIdentity==1 ? '0rpx' :'188rpx'}">
-		<custom-p   v-if="isHeaderPoduct"
-					:systeminfo='systeminfo' 
-					:navbar-data='nvabarData' 
-					:headerBtnPosi ="headerBtnPosi" 
-					:headerColor="headerColor" 
-					:type="isShareType"
-					:page='backPage'>
-		</custom-p>
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-product tui-skeleton">
-			<view class="product-top">
-				<view class="banner-section">
-					<uni-swiper-dot :info="productImage" :current="current" field="content" :mode="mode" >
-						<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :duration='800' :autoplay="false" :circular="false" >
-							<swiper-item v-for="(item, index) in productImage" :key="index" class="banner-item"> 
-								<image :src="item" @click="previewImg(index)" class="product-img" />
-							</swiper-item>
-						</swiper>
-						<view class="swiper__dots-box">
-							<view v-for="(item,idx) in productImage" 
-								  :key="idx" 
-								  :class="[idx===current?'swiper__dots-long':'none']" 
-								  :data-index="current" class="swiper__dots-item">
-							</view>	  
-						</view>
-					</uni-swiper-dot>
-				</view>
-				<view class="product-wrap clearfix">
-					<view class="wrap-top" :class="goodsData.isNoneDisabled ? 'none' : ''">
-						<view class="p-title tui-skeleton-fillet">
-							{{product.name == undefined ? '' : product.name}}
-						</view>
-						<view class="wrap-top-price" v-if="!goodsData.isNoneDisabled">
-							<view class="cm-price">
-								<second-price v-if="isRequest"
-											  :product="product"
-											  :userIdentity="userIdentity"
-											  :ladderPriceList="ladderPriceList"
-											  :retailPrice="retailPrice"
-											  :smallMoney="smallMoney"
-											  :minBuyNumber="minBuyNumber"/>
-							</view>
-						</view>
-					</view>
-					<view class="attributes">
-						<second-attributes v-if="isRequest" :product="product" :goodsData="goodsData" />
-					</view>
-				</view>			
-			</view>
-			<view class="product-details">
-				<!-- 头部 -->
-				<view class="navbar" 
-					  :class="navbarFiexd" 
-					  :style="{top:headerBtnPosi.bottom + (headerBtnPosi.bottom - headerBtnPosi.height - systeminfo.statusBarHeight) +'px'}"
-				>
-					<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
-						<text>商品详情</text>
-						<text class="line"></text>
-					</view>
-					<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 1 }" @click="tabClick(1)">
-						<text>品牌信息</text>
-						<text class="line"></text>
-					</view>	
-					<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 2 }" @click="tabClick(2)">
-						<text>相关推荐</text>
-						<text class="line"></text>
-					</view>	
-				</view>
-				<!-- 商品详情,品牌信息,相关推荐-->
-				<view class="content tui-banner tui-skeleton-rect" v-if="tabCurrentIndex === 0">
-					<secondDeatail :product="product"></secondDeatail>
-				</view>
-				<view class="content band" v-if="tabCurrentIndex === 1">
-					<secondBrand :product="product"></secondBrand>
-					<!-- <recommend :query-productid="product.productID" v-if="isRecommend"></recommend> -->
-				</view>
-				<view class="content hot" v-if="tabCurrentIndex === 2">
-					<recommend :query-productid="product.productID" v-if="isRecommend"></recommend>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
-	import secondPrice from "@/components/cm-module/productDetails/second-price.vue" //价格显示
-	import secondAttributes from "@/components/cm-module/productDetails/second-attributes.vue" //规格信息
-	import authorize from '@/common/config/authorize.js'
-	import parser from "@/components/jyf-Parser/index" //富文本处理
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import recommend from "@/components/cm-module/productDetails/secondRecommend" //相关推荐
-	import secondDeatail from "@/components/cm-module/productDetails/secondDeatail" // 商品信息
-	import secondBrand from "@/components/cm-module/productDetails/secondBrand" // 品牌信息
-	import wxLogin from "@/common/config/wxLogin.js"
-	var isPreviewImg;
-	export default{
-		components:{
-			customP,
-			parser,
-			tuiSkeleton,
-			recommend,
-			secondPrice,
-			secondAttributes,
-			secondDeatail,
-			secondBrand
-		},
-		data(){
-			return{			
-				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
-				disabledTabNavList:[{name:'相关推荐'}],
-				mode:'round',
-				specClass: '',//规格弹窗css类,控制开关动画
-				isBtnType:'',
-				isRequest:false,
-				current:0,
-				isShareType:'',
-				isHeaderPoduct:false,
-				navbarFiexd:'none',
-				ladderPriceFlag:'',
-				ladderPriceList:'',
-				isRecommend:false,
-				isRarameter:true,
-				isService:false,
-				isEvaluate:false,
-				isAnimation:false,
-				skeletonShow:true,
-				isQuantity:false,
-				isStock:false,
-				disabled:false,
-				isNoneDisabled:false,
-				tabCurrentIndex:0,
-				userID:'',
-				productID:0,
-				userIdentity:'',//用户类型
-				goodsData:{},//自定义数据
-				shop:{},//供应商信息
-				product:{},//采美
-				productImage:[],
-				retailPrice:0,
-				buyRetailPrice:0,
-				buyRetailPriceStep:1,
-				stock:0,
-				number:0,
-				minBuyNumber:0,
-				productsList:[],
-				goodListData:[],
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				isIphoneX:this.$store.state.isIphoneX,
-				windowHeight: '',
-				headerColor:false,
-				backPage:1,
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: ''		// 导航栏 中间的标题
-				}
-			}
-		},
-		onLoad(option) {
-			this.productID = option.id;//获取商品ID
-			this.isShareType = option.type
-			this.isHeaderPoduct = true
-			if(option.page == 2){
-				this.backPage = option.page
-			}
-			if(this.isShareType =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-		},
-		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
-		},
-		methods:{
-			initData(){// 初始化商品详情查询
-			this.SellerService.ProductDetail({productId:this.productID}).then(response =>{	
-					console.log(response)
-					this.skeletonShow = false
-					this.productImage = response.data.imageList
-					this.shop = response.data
-					this.product = response.data
-					this.ladderPriceFlag = this.product.ladderPriceFlag;
-					this.html = this.product.productDetail == null ? this.html : this.$api.adaptRichTextImg(this.product.productDetail.detailInfo)
-					this.stock = this.product.stock
-					this.buyRetailPriceStep = this.product.step
-					this.number = this.product.minBuyNumber
-					this.minBuyNumber = this.product.minBuyNumber
-					//购物车数量
-					this.goodsData.cartCount = this.product.productCount
-					//处理阶梯价格
-					if(this.product.ladderPriceList!=null){
-						this.ladderPriceList = this.product.ladderPriceList;
-					}
-					//拆分金额并转千分位格式显示
-					if(this.product.retailPrice!=null){
-						this.retailPrice = this.product.retailPrice.toFixed(2);
-						this.buyRetailPrice = this.product.retailPrice;
-					}
-					//处理下架商品和售罄商品
-
-					if(this.product.validFlag =='3' || this.stock == 0 ){
-						this.disabled = true
-						this.isNoneDisabled = true
-						this.tabCurrentIndex = 2;// 页面显示是默认选中第一
-						this.isRecommend = true
-						this.goodsData.disabledText = '下架'
-					}else{
-						this.disabled = false
-						this.isNoneDisabled = false
-						this.tabCurrentIndex = 0;// 页面显示是默认选中第三
-						this.goodsData.disabledText = ''
-					}
-					if(this.product.price1TextFlag == "1"){
-						this.disabled = true
-					}
-					if(this.product.price1TextFlag == "2"){
-						if(this.userIdentity == 4){	
-							this.disabled = true
-						}else{
-							this.disabled = false
-						}
-					}
-					this.goodsData.disabled = this.disabled
-					this.goodsData.isNoneDisabled = this.isNoneDisabled
-					if(this.product.validFlag =='3'){
-						this.goodsData.disabledText = '下架'
-					}
-					if(this.stock == 0){
-						this.goodsData.disabledText = '售罄'
-					}
-					this.isRequest = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			swiperChange(e) {//顶部商品图片切换
-				const index = e.detail.current;
-				this.current = index;
-			},
-			previewImg (index) {//顶部商品图片预览
-				isPreviewImg = true
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片,本地图片无效
-					longPressActions:''
-				})
-			},
-			tabClick(index) {//商品详情&&供应商信息tab切换
-				this.tabCurrentIndex = index;
-				switch(this.tabCurrentIndex){
-					case 0:
-						this.isRarameter = true
-						break;
-					case 1:
-						this.isService = true
-						break;
-					case 2:
-						this.isRecommend = true
-						break;
-				}
-			},
-			handleContact(e){//跳转小程序客服
-
-			},
-			buyProductCart(){//底部购物车按钮点击
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						if(this.hasLogin){
-							this.$api.navigateTo('/pages/goods/cart')
-						}else{					
-							this.$api.navigateTo('/pages/login/login?type=1')
-						}
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})	
-			},
-			btnGetConfirm(type){//加入购物车&&立即购买点击
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						if(this.hasLogin){
-							this.showSpec(type);
-						}else{
-							this.$api.navigateTo('/pages/login/login?type=1')
-						}
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}	
-				})
-			},	
-			changeCountAdd(){//popup弹窗数量增加按钮
-				if(this.buyRetailPriceStep == 2){
-					this.number+=this.minBuyNumber
-				}else{
-					this.number++
-				}
-				this.processActivityPrice()
-			},
-			changeCountSub(){//popup弹窗数量减按钮
-				if(this.number<=this.minBuyNumber){
-					this.number= this.minBuyNumber
-					this.isQuantity =true
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
-					return
-				}else{
-					if(this.buyRetailPriceStep == 2){
-						this.number-=this.minBuyNumber
-					}else{
-						this.number--
-					}
-					this.processActivityPrice()
-					this.isQuantity =false
-				}
-			 },
-			changeNumber(e){
-				let _value = e.detail.value;
-				if(!this.$api.isNumber(_value)){
-					this.number = this.minBuyNumber
-				}else if(_value < this.minBuyNumber){	
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
-					this.number = this.minBuyNumber
-				}else if( _value % this.minBuyNumber !=0 ){
-					this.$util.msg(`购买量必须为起订量的整数倍`,2000);
-					this.number = this.minBuyNumber
-				}else{
-					this.number = e.detail.value
-				}
-				this.processActivityPrice()
-			},
-			processActivityPrice(){//单独处理活动价格和阶梯价格
-				if(this.ladderPriceFlag == '0' && this.product.actStatus == 0){
-					this.buyRetailPrice = this.product.retailPrice
-				}else{
-					this.ladderPriceList.forEach((item,index)=>{
-						if(this.number>=item.buyNum){
-							this.buyRetailPrice = item.buyPrice
-						}
-					})
-				}
-			},
-			showSpec(type) {//显示选择数量确认弹窗
-				this.isBtnType = type
-				this.specClass = 'show';
-			},
-			hideSpec() {//关闭选择数量确认弹窗
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			btnConfirm() {//加入购物车&&立即购买跳转订单页并关闭弹窗
-				if(this.isBtnType == 'add'){				
-					this.getAddProductCart()				
-				}else{
-					this.toConfirmation()
-				}
-			},
-			toConfirmation(){//跳转确认订单页面
-				this.specClass = 'hide';
-				let productStp ={
-						allPrice:this.number*this.buyRetailPrice,
-						allCount:this.number,
-						productID:this.product.productID,
-						productCount:this.number
-				}	
-				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			getAddProductCart(){//增加购物车成功和toast弹窗提示成功	
-				this.ProductService.shoppingAddCart({productID:this.productID,userID:this.userID,productCount:this.number}).then(response => {
-					this.specClass = 'hide';
-					this.$util.msg('加入购物车成功',1500,true,'success')
-					this.isAnimation = true
-					setTimeout(() => {this.specClass = 'none'}, 200)
-					setTimeout(() => {this.isAnimation = false},2000)
-					this.goodsData.cartCount = response.data;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			navToLogin(){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						this.$api.navigateTo(`/pages/login/login?type=detilType&id=${this.productID}`)
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})	
-			},
-			setHeaderBtnPosi(){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo(){
-				let systeminfo;
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
-			getOptionFn(e){
-				this.isShareType = e.type
-			},
-			discard(){
-				//丢弃
-			}
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>50){
-				this.headerColor = true
-				this.nvabarData={							
-					showCapsule: 1, 
-					title: '商品详情', 		
-				}
-			}else{
-				this.headerColor = false
-				this.nvabarData={
-					showCapsule: 1, 
-					title: '', 		
-				}
-			}
-			if(e.scrollTop>700){
-				this.navbarFiexd = 'fixed'
-			}else{
-				this.navbarFiexd = 'none'
-			}
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `${this.product.name}`,
-			  path: `pages/goods/product?type=share&id=${this.productID}`,
-			  imageUrl:`${this.productImage[0]}`
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID ? resolve.userID : '';	
-				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
-				if (isPreviewImg) {
-					isPreviewImg = false;
-					return;
-				} else {
-					this.initData();
-				}
-			}).catch(error =>{
-				this.initData();
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.productRemarks{
-		color: #FF2A2A;
-		font-size: 24rpx;
-		margin-bottom: 16rp
-	}
-	.banner-section{
-		width: 100%;
-		height: 750rpx;
-		position: relative;
-		border-bottom: 1px solid #EBEBEB;
-	}	
-	.banner{
-		width: 100%;
-		height: 750rpx;
-		.product-img{
-			width: 750rpx;
-		}
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.swiper__dots-box{
-		position: absolute;
-		bottom: 24px;
-		right: 24rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		height: 12rpx;
-		padding: 10rpx;
-		background: rgba(174,174,174,0.6);
-		border-radius:16rpx;
-		.swiper__dots-item{
-			width: 12rpx;
-			height: 12rpx;
-			border-radius: 100%;
-			margin: 6rpx;
-			background: rgba(62,62,62,1);
-		}
-		.none{
-			background:#FFFFFF;
-		}
-		.swiper__dots-long{
-			background: rgba(62,62,62,1);
-			transition: all 0.1s;
-		}
-	}
-	.product-wrap{
-		width: 100%;
-		height: auto;
-		padding: 24rpx 0 0 0;
-		background-color: #FFFFFF;
-		border-bottom: 20rpx solid #F7F7F7;
-		.wrap-top{
-			width: 702rpx;
-			padding: 0 24rpx;
-			height: auto;
-			float: left;
-			padding-bottom: 24rpx;
-			border-bottom: 1px solid #F8F8F8;
-			&.none{
-				.p-title{
-					color:#999999
-				}
-			}
-			.p-title{
-				line-height: 40rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				font-weight: Bold;
-				-o-text-overflow: ellipsis;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-				overflow: hidden;
-				margin-bottom: 16rpx;
-			}
-			.wrap-main-pricenone{
-				line-height: 44rpx;
-				color: #FF2A2A;
-				font-size: $font-size-28;
-				font-weight: 600;
-			}
-			.wrap-main-text{
-				display: block;
-				float: left;
-				font-weight: normal;
-			}
-			.wrap-main-none{
-				display: block;
-				width: 256rpx;
-				height: 44rpx;
-				padding-left: 20rpx;
-				border-radius: 11rpx;
-				background: $btn-confirm;
-				float: right;
-				line-height: 44rpx;
-				color: #FFFFFF;
-				text-align: center;
-				font-size: $font-size-24;
-			}
-			.p-active{
-				width: 130rpx;
-				height: 44rpx;
-				display: flex;
-				align-items: center;
-				flex-direction: row;
-				float: left;
-				.icon-active{
-					width: 124rpx;
-					height: 30rpx;
-					display: block;
-				}
-			}
-			.p-price{
-				height: 44rpx;
-				line-height: 44rpx;
-				float: left;
-				
-				.txt{
-					color: #FF2A2A;
-					margin:0 2rpx;
-				}
-				.txt.sm{
-					font-size: $font-size-24;
-				}
-				.txt.big{
-					font-size: $font-size-32;
-				}
-			}
-			.p-minBuy{
-				height: 44rpx;
-				line-height: 44rpx;
-				float: right;
-				padding: 0 18rpx;
-				border-radius: 22rpx;
-				background-color: #EBEBEB;
-				color: #7F7F7F;
-				font-size: 24rpx;
-				text-align: center;
-				.min-text{
-					margin: 0 6rpx;
-				}
-			}
-			.p-login{
-				height: 44rpx;
-				line-height: 44rpx;
-				color: $color-system;
-				font-size: $font-size-24;
-				&.grade{
-					margin-bottom: 20rpx;
-				}
-				.p-no{
-					float: left;
-					margin-right: 5rpx;
-					font-size: $font-size-28;
-				}
-				.p-login-btn{
-					display: block;
-					height: 44rpx;
-					padding: 0 10rpx 0 20rpx;
-					border-radius: 11rpx;
-					background: $btn-confirm;
-					float: right;
-					line-height: 44rpx;
-					color: #FFFFFF;
-					text-align: center;
-					font-size: $font-size-24;
-				}
-			}
-		}
-		.wrap-active{
-			width: 100%;
-			float: left;
-			height: 80rpx;
-			background: linear-gradient(225deg,rgba(255,143,101,1) 0%,rgba(248,79,57,1) 100%);
-			line-height: 80rpx;
-			font-size: $font-size-26;
-			color: #FFFFFF;
-			text-align: center;
-		}
-		.wrap-ladder{
-			float: left;
-			width: 702rpx;
-			border-bottom: 1px solid #F8F8F8;
-			.ladder-text{
-				height: 34rpx;
-				line-height: 34rpx;
-				margin-bottom: 24rpx;
-				font-size: 24rpx;
-				color: #999999;
-				.ladder-p{
-					font-size: 20rpx;
-				}
-			}
-			.ladder-main{
-				width: 654rpx;
-				height: 102rpx;
-				padding: 24rpx;
-				background: url(https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_WASybTAAI2gyWbunM918.png);
-				background-size: cover;
-				border-radius: 20rpx;
-				display: flex;
-				.ladder-left{
-					flex: 1.5;
-					line-height: 51rpx;
-					font-size: 24rpx;
-					.ladder-b{
-						text-align-last: justify;
-					}
-				}
-				.ladder-right{
-					height: 100%;
-					display: flex;
-					align-items: center;
-					flex: 8.5;
-					.ladder-li{
-						height: 100%;
-						flex: 1;
-						display:flex;
-						flex-flow: column;
-						align-items: center;
-						.ladder-a{
-							flex: 1;
-							height: 51rpx;
-							line-height: 51rpx;
-							font-size: 26rpx;
-							text-align: justify;
-							color: #FA6400;	
-							font-weight: bold;
-						}
-					}
-				}
-			}
-		}
-		.wrap-label{
-			float: left;
-			width: 702rpx;
-			padding: 24rpx 24rpx 0 24rpx;
-			border-bottom: 1px solid #F8F8F8;
-			.label-a{
-				padding: 0 18rpx;
-				line-height: 40rpx;
-				font-size: $font-size-24;
-				color: #FFFFFF;
-				text-align: center;
-				border-radius: 20rpx;
-				background:#A69DFE;
-				margin: 0 22rpx 22rpx 0;
-				display: inline-block;
-			}
-		}
-		.wrap-info{
-			float: left;
-			width: 702rpx;
-			padding: 24rpx 24rpx 0 24rpx;
-			border-bottom: 1px solid #F8F8F8;
-			.info-viewT{
-				width: 100%;
-				min-height: 40rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				line-height: 40rpx;
-				text-align: left;
-				&.none{
-					color: #999999;
-				}
-				.info-viewL{
-					min-width: 350rpx;
-					float: left;
-					margin-bottom: 24rpx;
-				}
-				.info-viewR{
-					min-width: 352rpx;
-					float: left;
-					margin-bottom: 24rpx;
-				}
-			}
-			.info-viewB{
-				width: 100%;
-				height: auto;
-			}
-			.info-f{
-				width: 50%;
-				float: left;
-				font-size: $font-size-28;
-				color: $text-color;
-				line-height: 40rpx;
-				margin-bottom: 24rpx;
-				text-align: left;
-			}
-	
-		}
-		.wrap-seve{
-			float: left;
-			width: 702rpx;
-			padding: 0 24rpx;
-			height: 72rpx;
-			line-height: 72rpx;
-			font-size: $font-size-28;
-			color: $text-color;
-			border-bottom: 1px solid #F8F8F8;
-			&.none{
-				color: #999999;
-				.text{
-					color: #999999;
-				}
-			}
-			.iconfont{
-				color: $color-system;
-				margin-left: 20rpx;
-				font-size: $font-size-24;
-			}
-			.text{
-				font-size: $font-size-24;
-				color: $text-color;
-				margin-left: 10rpx;
-			}
-		}
-	}
-	.product-details {
-		height: 100%;
-		background: #FFFFFF;
-		.navbar {
-			width: 702rpx;
-			height: 96rpx;
-			padding: 0 24rpx;
-			background: #fff;
-			z-index: 10;
-			display: flex;
-			border-bottom: 1px solid #F8F8F8;
-			&.fixed{
-				position: fixed;
-				left: 0;
-			}
-			.nav-item {
-				display: flex;
-				flex: 1;
-				justify-content: center;
-				align-items: center;
-				height: 96rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				position: relative;
-				float: left;
-				position: relative;
-				.line{
-					width: 60%;
-					height: 2px;
-					border-radius: 1px;
-					background: #FFFFFF;
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					margin-left: -30%;
-				}
-				&.current{
-					color:$color-system;
-					.line{
-						background: $color-system;
-					}
-				}
-			}
-		}
-		.content{
-			width: 100%;
-			min-height: 750rpx;
-		}
-	}
-	.isLower{
-		width: 100%;
-		height: 116rpx;
-		line-height: 116rpx;
-		text-align: center;
-		color: #000000;
-		font-size: $font-size-32;
-		font-weight: bold;
-	}
-	.bottom-btn{
-		width: 100%;
-		height: 110rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 99;
-		.bottom-le{
-			width: 302rpx;
-			height: 86rpx;
-			padding:12rpx 24rpx;
-			float: left;
-			.item-bt{
-				width: 86rpx;
-				height: 100%;
-				margin-right:22rpx;
-				display: flex;
-				float: left;
-				flex-direction: column;
-				align-items: center;
-				font-size: $font-size-24;
-				color: $text-color;
-				line-height: 34rpx;
-				position: relative;
-				.animation-num{
-					font-size:$font-size-32 ;
-					color: #FF2A2A;
-					position: absolute;
-					top: -12rpx;
-					right: 4rpx;
-					font-weight: bold;
-				}
-				.animation{
-					animation: showAmnation 2.2s ease-in-out both;
-				}
-				.restion{
-					animation: hideAmnation 1s ease-in-out both;
-				}
-				.icon-num{
-					position: absolute;
-					right:-12rpx;
-					top: -9rpx;
-				}
-				.icon-num.goleft{
-					right: 4rpx;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
-				image {
-					width: 40rpx;
-					height: 40rpx;
-					margin-bottom: 8rpx;
-				}
-				button.contact-btn{
-					width: 100%;
-					height: 100%;
-					margin: 0;
-					padding: 0;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					box-sizing: border-box;
-					font-size: $font-size-24;
-					text-align: center;
-					text-decoration: none;
-					line-height: 34rpx;
-					border-radius: 0;
-					-webkit-tap-highlight-color: transparent;
-					overflow: hidden;
-					color: $text-color;
-					background-color:#FFFFFF;
-				}
-			}
-		}
-		.bottom-ri{
-			width: 400rpx;
-			height: 100%;
-			float: right;
-			display: flex;
-			.btn{
-				flex: 1;
-				width: 200rpx;
-				line-height: 110rpx;
-				text-align: center;
-				font-size: $font-size-28;
-				color: #FFFFFF;
-			}
-			.btn-cart{
-				background-color: #EFAF00;
-			}
-			.btn-cart.disabled{
-				background-color: rgba(239, 175, 0, 0.5);
-			}
-			.btn-bay{
-				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-			}
-			.btn-bay.disabled{
-				background-color: linear-gradient(135deg,rgba(242,143,49,0.5) 0%,rgba(225,86,22,0.5) 100%);;
-			}
-		}
-	}
-	.uni-badge--small {
-		-webkit-transform: scale(.8);
-		-ms-transform: scale(.8);
-		transform: scale(.8);
-		-webkit-transform-origin: center center;
-		-ms-transform-origin: center center;
-		transform-origin: center center;
-	}
-	.uni-badge {
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		font-size: 12px;
-		line-height: 1;
-		display: inline-block;
-		padding: 3px 6px;
-		color: #333;
-		border-radius: 100px;
-		background-color: #f1f1f1;
-	}
-	.uni-badge-error {
-		color: #fff;
-		background-color: #dd524d;
-	}
-	/* 加入购物模态层*/
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-		100% {
-			opacity: 1;
-		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
-		}
-		100% {
-			opacity: 0;
-		}
-	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(0);
-		}
-		100% {
-			transform: translateY(-100%);
-		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(-100%);
-		}
-		100% {
-			transform: translateY(0);
-		}
-	}
-	@keyframes showAmnation {
-		0% {
-			top: -12rpx;
-			opacity: 0;
-		}
-		50% {
-			top: -60rpx;
-			opacity: 1;
-		}
-		100% {
-			top: -100rpx;
-			opacity: 0;
-		}
-	}
-	@keyframes hideAmnation {
-		0% {
-			top: -100rpx;
-			opacity: 0;
-		}
-		100% {
-			top: -12rpx;
-			opacity: 0;
-		}
-	}
-	.popup {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 999;
-		display: none;
-		.mask{
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
-		}
-		.layer {
-			position: fixed;
-			z-index: 22;
-			bottom: -294rpx;
-			width: 702rpx;
-			padding: 24rpx 24rpx 36rpx 24rpx;
-			height: 260rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #fff;
-			display: flex;
-			flex-wrap: wrap;
-			align-content: space-between;
-			.content {
-				width: 100%;
-			}
-			.btn {
-				width: 100%;
-				height: 88rpx;
-				margin-top: 20rpx;
-				.button {
-					width: 100%;
-					height: 88rpx;
-					color: #fff;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					background: $btn-confirm;
-					font-size: $font-size-28;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		
-		&.show {
-			display: block;
-			.mask{
-				animation: showPopup 0.2s linear both;
-			}
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
-		}
-		&.hide {
-			display: block;
-			.mask{
-				animation: hidePopup 0.2s linear both;
-			}
-			
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
-		}
-		&.none {
-			display: none;
-		}
-		&.service {
-			.row {
-				margin: 30upx 0;
-				.title {
-					font-size: 30upx;
-					margin: 10upx 0;
-				}
-				.description {
-					font-size: 28upx;
-					color: #999;
-				}
-			}
-		}
-		.layer-smimg{
-			width: 114rpx;
-			height: 114rpx;
-			float: left;
-			border-radius: 10rpx;
-			margin-right: 24rpx;
-			image{
-				width: 114rpx;
-				height: 114rpx;	
-				border-radius: 10rpx;
-			}
-		}
-		.layer-nunbox{
-			justify-content: space-between;
-			align-items: center;
-			width: 536rpx;
-			height: auto;
-			float: left;
-			.layer-nunbox-t{
-				width: 100%;
-				height:44rpx;
-				position:relative;
-				display: flex;
-				margin-bottom: 10rpx;
-				.text{
-					font-size: $font-size-24;
-					line-height: 48rpx;
-					color: #999999;
-				}
-				.layer-nunbox-text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-				}
-				.number-box{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					.iconfont{
-						font-size: $font-size-32;
-						padding:0 20rpx;
-						font-size: $text-color;
-					}
-					.btn-input{
-						width: 62rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #F8F8F8;
-						border-radius: 4rpx;
-						text-align: center;
-						font-size: $font-size-28;
-					}
-				}
-				.product-step{
-					position: absolute;
-					left: 45rpx;
-					bottom: 0;
-					height: 44rpx;
-					background: #FFFFFF;
-				}
-			}
-			.layer-nunbox-b{
-				width: 100%;
-				height:44rpx;
-				margin-top: 13rpx;
-			}
-			.text{
-				line-height: 44rpx;
-				font-size: $font-size-28;
-				.p{
-					color: #FF2A2A;
-				}
-				.p:first-child{
-					margin-left: 30rpx;
-				}
-				.p.sm{
-					font-size: $font-size-24;
-				}
-			}
-		}
-	}
-	/*富文本样式*/
-	rich-text.p{
-		width: 702rpx !important;
-		padding: 0 24rpx;
-		text-align: justify;
-	}
-	rich-text.img{
-		width: 100%;
-		height: auto;
-	}
-</style>

+ 1 - 1
pages/tabBar/category/index.vue

@@ -7,7 +7,7 @@
 		<view class="category-list">
 			<!-- 左侧分类导航 -->
 			<scroll-view class="left-aside" scroll-y="true" scroll-with-animation :scroll-top="verticalNavTop" :style="{top:(CustomBar+38)+'px',height:(windowHeight-CustomBar+38)+'px'}">
-				<view class="row" v-if="m.smalltypeList.length > 0" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory($event,index)" :data-id="index">
+				<view class="row" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory($event,index)" :data-id="index">
 					<view class="text">{{m.name}}</view>
 					<view class="block"></view>
 				</view>

+ 2 - 67
pages/tabBar/home/index.vue

@@ -115,7 +115,7 @@
 				})
 			},		
 			GetHomeInit(){//金刚区分类
-				this.CommonService.GetHomeInit({}).then(response =>{
+				this.CommonService.GetHomeInit({source:2}).then(response =>{
 					let data = response.data
 					this.navBarsList = data.topMenuList
 				}).catch(error =>{
@@ -143,39 +143,19 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			
 			getHomeInformation(){//初始化首页数据	
 				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
 					let data = res.data;
 					this.bannerImageList = data.bannerImageList
 					this.mallPageModules = data.mallPageModules
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
-					// this.GetHomeInit()
+					this.GetHomeInit()
 					this.GetHomeFloorInfo()
 					this.GetHomeTopDataInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.current = index;
-			},
-			formatMoney(num){
-				return num.toString().replace(/\d+/, function (n) { // 先提取整数部分
-					return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) { // 对整数部分添加分隔符
-						return $1 + ",";
-					});
-				});
-			},
-			handleBannerActivity(item,index){
-				switch(index){
-					case 0:
-						this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-						break;
-				}
-			},
 			handleClick(data){
 				this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
 				this.$store.commit('setActivity',data)
@@ -183,51 +163,6 @@
 			handleCancelClick(data){
 				this.$store.commit('setActivity',data)
 			},
-			navToListPage(nav){//三个分类模块跳转
-				let self = this;
-				uni.setStorage({
-					key: 'commodity_id',
-					data: nav.id,
-					success: function () {
-						self.$api.navToListPage({type:'0',value:nav.classifyName,id:nav.id});
-					}
-				})
-			},
-			navigateToGoods(nav){//分类导航跳转
-				let self = this;
-				uni.setStorage({
-					key: 'commodity_id',
-					data: nav.id,
-					success: function () {
-						self.$api.navigateToGoods({type:'0',value:nav.classifyName,id:nav.id});
-					}
-				})
-			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.modallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			},
-			handleContact(e){
-				console.log(e.detail.path)
-				console.log(e.detail.query)
-			},
-			navto(url){
-				this.$api.navigateTo(url)
-			},
-			swiperNavtopage(link){
-				this.$api.navigateTo(`/h5/pages/activity/activity?productID=4204&path=${link}`)
-			},
-			telPhoneTo(){
-				let self = this;
-				this.$api.get('/home/afterSale',{organizeID:this.userOrganizeID}, 
-					response => {
-						console.log(response.data.contactNumber)
-						uni.makePhoneCall({
-							phoneNumber:response.data.contactNumber //仅为示例
-						});
-					}
-				)	
-			}
 		},
 		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>50){

+ 1 - 6
second/pages/product/product-details.vue

@@ -209,18 +209,13 @@
 					}
 				})	
 			}
-			this.SecondService.ProductCount({productId:this.productID}).then(res =>{
-			         console.log(res)
-			        }).catch(error =>{
-						this.$util.msg(error.msg,2000);
-					});
 		},
 		computed: {
 			...mapState(['hasLogin','isWxAuthorize'])
 		},
 		methods:{
 			initData(){// 初始化商品详情查询
-				this.SellerService.ProductDetail({productId:this.productID}).then(response =>{	
+				this.SecondService.ProductDetail({productId:this.productID}).then(response =>{	
 					this.skeletonShow = false
 					this.productImage=[];
 					this.shop = response.data.shop

+ 9 - 3
services/second.service.js

@@ -1,8 +1,8 @@
 // 二手商品
-export default class SecondApi {
+export default class SecondService {
 	constructor(AjaxService) {
 		Object.assign(this, { AjaxService })
-		this.name = 'SecondApi'
+		this.name = 'SecondService'
 	}
 	/**
 	 *二手商品列表
@@ -25,5 +25,11 @@ export default class SecondApi {
 	ProductCount (data = {}) {
 		return this.AjaxService.get({ url:'/product/updateSecondHandProductCount', data, isLoading: true })
 	}
-
+	/**
+	 *@二手商品详情
+	 *@param productId:商品ID(数字类型,必传)
+	 */
+	ProductDetail (data={}){//商品详情
+		return this.AjaxService.get({ url:'/product/getSecondHandProductDetail', data, isLoading: true })
+	}
 }

+ 0 - 7
services/sellse.service.js

@@ -106,13 +106,6 @@ export default class SellerService {
 	GetSettlementBySencondProduct (data = {}) {
 		return this.AjaxService.post({ url:'/seller/settlementBySencondProduct', data, isLoading: true })
 	}
-	/**
-	 *@协销-二手商品详情
-	 *@param productId:商品ID(数字类型,必传)
-	 */
-	ProductDetail (data={}){//商品详情
-		return this.AjaxService.get({ url:'/product/getSecondHandProductDetail', data, isLoading: true })
-	}
 	/**
 	 *@协销-二手商品推荐
 	 *@param productId:商品ID(数字类型,必传)