commit -m 修复上线问题

components/cm-module/homeIndex/banner.vue

@@ -55,34 +55,38 @@
 				this.current = index;
 			},
 			NavToDetailPage(floor) {//跳转
-				/**
-				 * 页面跳转类型
-				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-				 **/
-				 if(floor.linkType){
-					 const typeMap = {
-					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
-						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
-					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	7:`/supplier/pages/user/my-shop?shopId=${floor.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=${floor.title}`,
-					 	13:`/h5/pages/article/page?link=${floor.link}`,
-					 	14:`/h5/pages/article/page?link=${floor.link}`,
-					 	15:`/h5/pages/article/page?link=${floor.link}`,
-					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/page?link=${floor.link}`,
-					 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
+				if(floor.linkParam.id == '276'){
+					return
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+					 **/
+					 if(floor.linkType){
+						 const typeMap = {
+						 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
+						 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
+							4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
+						 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
+						 	7:`/supplier/pages/user/my-shop?shopId=${floor.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=${floor.title}`,
+						 	13:`/h5/pages/article/page?link=${floor.link}`,
+						 	14:`/h5/pages/article/page?linkType=${floor.linkType}`,
+						 	15:`/h5/pages/article/page?link=${floor.link}`,
+						 	17:`/pages/login/register-select`,
+						 	18:`/h5/pages/article/page?link=${floor.link}`,
+						 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
+						 }
+						 const url = typeMap[floor.linkType];
+						 this.$api.navigateTo(url)
 					 }
-					 const url = typeMap[floor.linkType];
-					 this.$api.navigateTo(url)
-				 }
+				}
 			}
 		}
 	}

components/cm-module/productDetails/recommend.vue

@@ -47,7 +47,7 @@
 		},
 		methods:{
 			infoRecommend(id,type){
-				this.ProductService.queryProductDetilsRelevant({productId:id,recommendType:type}).then(response =>{
+				this.ProductService.queryProductDetilsRelevant({ productId:id,recommendType:type ? type : 0 }).then(response =>{
 					if( response.data && response.data.length > 0){
 						this.isEmpty = false
 						this.recommendList = response.data

h5/pages/article/page.vue

@@ -34,6 +34,9 @@
 				case '7':
 					this.activityPath = 'https://www.caimei365.com/repair.html'
 					break;
+				case '14':
+					this.activityPath = 'https://www.caimei365.com/investment.html'
+					break;
 			}
 			// console.log(this.activityPath)
 			// uni.setNavigationBarTitle({title:'多重精华,多重修复'});

services/ajax.env.js

@@ -4,11 +4,11 @@ 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.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
-	URL_CONFIG = 'https://spi-b.caimei365.com'
-    // URL_CONFIG = 'https://spi.caimei365.com'
+	// URL_CONFIG = 'https://spi-b.caimei365.com'
+    URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG