commit -m 修改跳转方式

common/config/caimeiApi.js

@@ -233,13 +233,13 @@ const caimeiApi = {
 				 	9:`/second/pages/form/introduce`,
 				 	10:`/second/pages/product/product-list`,
 				 	11:`/second/pages/form/form`,
-				 	12:`/search/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}`,
+				 	12:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
+				 	13:`/h5/pages/article/path?link=${pros.link}`,
+				 	14:`/h5/pages/article/path?link=${pros.link}`,
+				 	15:`/h5/pages/article/path?link=${pros.link}`,
 				 	17:`/pages/login/register-select`,
-				 	18:`/h5/pages/article/page?link=${pros.link}`,
-				 	19:`/search/pages/search/search-supplier?keyWord=${pros.name}`
+				 	18:`/h5/pages/article/path?link=${pros.link}`,
+				 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
 				}
 				const url = typeMap[pros.linkType];
 				uni.navigateTo({
@@ -261,11 +261,11 @@ const caimeiApi = {
 				10:`/second/pages/product/product-list`,
 				11:`/second/pages/form/form`,
 				12:`/search/pages/search/search?keyWord=${keyword}`,
-				13:`/h5/pages/article/page?link=${linkHref}`,
-				14:`/h5/pages/article/page?link=${linkHref}`,
-				15:`/h5/pages/article/page?link=${linkHref}`,
+				13:`/h5/pages/article/path?link=${linkHref}`,
+				14:`/h5/pages/article/path?link=${linkHref}`,
+				15:`/h5/pages/article/path?link=${linkHref}`,
 				17:`/pages/login/register-select`,
-				18:`/h5/pages/article/page?link=${linkHref}`,
+				18:`/h5/pages/article/path?link=${linkHref}`,
 				19:`/search/pages/search/search-supplier?keyWord=${keyword}`
 			}
 			const url = typeMap[linkType];

components/cm-module/homeIndex/pageSpecial.vue

@@ -101,7 +101,37 @@
 				this.$api.navigateTo('/h5/pages/activity/activity-list')
 			},
 			NewActivityListPath(pros){
-				this.$api.FlooryNavigateTo(pros)
+				/**
+				 * 页面跳转类型
+				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+				 **/
+				if(pros.linkType){
+					console.log(pros.linkType)
+					const typeMap = {
+					 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
+					 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
+						4:`/h5/pages/activity/activity?title=${pros.title}&link=${pros.appletsLink}`,
+					 	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:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
+					 	13:`/h5/pages/article/path?link=${pros.link}`,
+					 	14:`/h5/pages/article/path?link=${pros.link}`,
+					 	15:`/h5/pages/article/path?link=${pros.link}`,
+					 	17:`/pages/login/register-select`,
+					 	18:`/h5/pages/article/path?link=${pros.link}`,
+					 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
+					}
+					const url = typeMap[pros.linkType];
+					uni.navigateTo({
+					  	url:url
+					})
+				}
 			},
 			LiveGoPath(){//查看直播
 				this.$api.navigateTo('/h5/pages/article/path-live')

components/cm-module/productDetails/instrument-recommend.vue

@@ -95,7 +95,7 @@
 			float: left;
 			margin-right: 20rpx;
 			margin-bottom: 20rpx;
-			border-radius: 2rpx;
+			border-radius: 20rpx;
 			background: #FFFFFF;
 			&:nth-child(2n){
 				margin-right: 0;
@@ -103,11 +103,11 @@
 			.list-image{
 				width: 100%;
 				height: 340rpx;
-				border-radius: 2rpx 2rpx 0 0;
+				border-radius: 20rpx 20rpx 0 0;
 				image{
 					width: 100%;
 					height: 340rpx;
-					border-radius: 2rpx 2rpx 0 0;
+					border-radius: 20rpx 20rpx 0 0;
 				}
 			}	
 			.list-name{

components/cm-module/productDetails/recommend.vue

@@ -99,7 +99,7 @@
 			float: left;
 			margin-right: 20rpx;
 			margin-bottom: 20rpx;
-			border-radius: 2rpx;
+			border-radius: 20rpx;
 			background: #FFFFFF;
 			&:nth-child(2n){
 				margin-right: 0;
@@ -107,11 +107,11 @@
 			.list-image{
 				width: 100%;
 				height: 340rpx;
-				border-radius: 2rpx 2rpx 0 0;
+				border-radius: 20rpx 20rpx 0 0;
 				image{
 					width: 100%;
 					height: 340rpx;
-					border-radius: 2rpx 2rpx 0 0;
+					border-radius: 20rpx 20rpx 0 0;
 				}
 			}	
 			.list-name{

components/cm-module/productDetails/secondRecommend.vue

@@ -100,7 +100,7 @@
 			float: left;
 			margin-right: 20rpx;
 			margin-bottom: 20rpx;
-			border-radius: 2rpx;
+			border-radius: 20rpx;
 			background: #FFFFFF;
 			&:nth-child(2n){
 				margin-right: 0;
@@ -108,11 +108,11 @@
 			.list-image{
 				width: 100%;
 				height: 340rpx;
-				border-radius: 2rpx 2rpx 0 0;
+				border-radius: 20rpx 20rpx 0 0;
 				image{
 					width: 100%;
 					height: 340rpx;
-					border-radius: 2rpx 2rpx 0 0;
+					border-radius: 20rpx 20rpx 0 0;
 				}
 			}	
 			.list-name{

h5/pages/article/page.vue

@@ -22,27 +22,12 @@
 		onLoad(option) {
 			// console.log(option)
 			switch(option.linkType){
-				case '3':
-					this.activityPath = 'https://www.caimei365.com/info/center-2-1.html'
-					break;
-				case '5':
-					this.activityPath = 'https://www.caimei365.com/topic.html?type=6'
-					break;
-				case '6':
-					this.activityPath = 'https://www.caimei365.com/investment.html'
-					break;
 				case '7':
 					this.activityPath = 'https://www.caimei365.com/repair.html'
 					break;
-				case '14':
-					this.activityPath = 'https://www.caimei365.com/investment.html'
-					break;
 				case '99':
 					this.activityPath = 'https://www.caimei365.com/help/1000.html'
 					break;
-				case '100':
-					this.activityPath = 'https://www.caimei365.com/info/detail-5856-1.html'
-					break;
 				case '101':
 					this.activityPath = 'https://www.caimei365.com/repair/form.html'
 					break;

search/pages/search/search.vue

@@ -36,7 +36,7 @@
 				<view class="list">
 					<view class="list-title">产品</view>
 					<view class="list-main">
-						<view v-for="(item,index) in productHotSearch" :key="index" @click="keywordsClick(item.name)" :class="item.isHot == '1' ? 'list-active' : ''">
+						<view v-for="(item,index) in productHotSearch" :key="index" @click="keywordsClickPath(item)" :class="item.isHot == '1' ? 'list-active' : ''">
 							{{item.name}}
 							<text class="iconfont icon-resou" v-if="item.isHot === '1'"></text>
 						</view>
@@ -45,7 +45,7 @@
 				<view class="list">
 					<view class="list-title">仪器</view>
 					<view class="list-main">
-						<view v-for="(item,index) in instrumentHotSearch" :key="index" @click="keywordsClick(item.name)" :class="item.isHot == '1' ? 'list-active' : ''">
+						<view v-for="(item,index) in instrumentHotSearch" :key="index" @click="keywordsClickPath(item)" :class="item.isHot == '1' ? 'list-active' : ''">
 							{{item.name}}
 							<text class="iconfont icon-resou" v-if="item.isHot === '1'"></text>
 						</view>
@@ -392,6 +392,9 @@
 				this.isFocus = false
 				this.subMitSearch();
 			},
+			keywordsClickPath(item){
+				this.$api.FlooryNavigateTo(item)
+			},
 			confirmDetele() {//清空历史记录
 				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
 					this.ProductService.GetDeleteProductSearchHistory({userId:this.userID}).then(response =>{
@@ -787,7 +790,7 @@
 				padding:0 16rpx;
 				font-size: $font-size-20;
 				margin-left: 15rpx;
-				margin-top:15px;
+				margin-top:15rpx;
 				border: 1px solid #E15616;
 				float: right;
 			}

supplier/pages/user/my-shop.vue

@@ -670,7 +670,7 @@
 				color: $text-color;
 				background: #FFFFFF;
 				line-height: 36rpx;
-				border-radius: 2rpx;
+				border-radius: 20rpx;
 				margin-bottom: 20rpx;
 				float: left;
 				box-sizing: border-box;
@@ -681,7 +681,7 @@
 				.item-img{
 					width: 341rpx;
 					height: 341rpx;
-					border-radius: 2rpx 2rpx 0 0;
+					border-radius: 20rpx 20rpx 0 0;
 					display: block;
 					margin-bottom: 20rpx;
 				}