commit-m 修改

common/config/caimeiApi.js

@@ -228,7 +228,7 @@ const caimeiApi = {
 				 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
 					4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
 				 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-				 	7:`/supplier/pages/user/my-shop?shopId=${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`,
@@ -257,7 +257,7 @@ const caimeiApi = {
 				2:`/pages/goods/instrument-details?id=${linkId}`,
 				4:`/h5/pages/activity/activity?id=${linkId}`,
 				5:`/pages/goods/product?id=${linkId}`,
-				7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
+				// 7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
 				8:`/h5/pages/activity/activity-list`,
 				9:`/second/pages/form/introduce`,
 				10:`/second/pages/product/product-list`,

components/cm-custom/custom-floor.vue

@@ -9,7 +9,7 @@
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
 	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
-				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
+				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/项目仪器</view>
 			</view>
 	  	</view>
 	</view>

components/cm-custom/custom-p.vue

@@ -9,7 +9,7 @@
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
 	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
-				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
+				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/项目仪器</view>
 			</view>
 	  	</view>
 	</view>

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

@@ -49,7 +49,7 @@
 					 	1:`/pages/goods/goods-instrument?linkId=${value.linkParam.id}&title=${value.title}`,
 						2:`/pages/goods/instrument-details?id=${value.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${value.linkParam.id}`,
-					 	7:`/supplier/pages/user/my-shop?shopId=${value.linkParam.id}`,
+					 	// 7:`/supplier/pages/user/my-shop?shopId=${value.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,
 					 	10:`/second/pages/product/product-list`,

components/uni-search/cat-search.vue

@@ -4,7 +4,7 @@
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
 	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',left:navbarBtn.height/2+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width)-20+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
-				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
+				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/项目仪器</view>
 			</view>
 	  	</view>
 		<view class="category-tab">

pages/goods/good-floorMore.vue

@@ -53,7 +53,7 @@
 		data(){
 			return{
 				clickPath:'/search/pages/search/search',
-				hotSearchText:'搜索商品/供应商/项目仪器',	
+				hotSearchText:'搜索商品/项目仪器',	
 				userIdentity:0,
 				skeletonShow:true,
 				isRequest:false,

pages/goods/goods-instrument.vue

@@ -102,7 +102,7 @@
 					 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
 						4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
 					 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-					 	7:`/supplier/pages/user/my-shop?shopId=${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`,

pages/goods/product.vue

@@ -14,7 +14,7 @@
 					<view class="search-icon">
 						<text class="iconfont icon-iconfonticonfontsousuo1"></text>
 					</view>
-					<view class="search-text">搜索商品/供应商/项目仪器</view>
+					<view class="search-text">搜索商品/项目仪器</view>
 				</view>
 			</view>
 			<view class="navbar">

services/ajax.env.js

@@ -9,7 +9,7 @@ if(process.env.NODE_ENV === 'development'){
 	// 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

services/config.env.js

@@ -6,7 +6,7 @@ if(process.env.NODE_ENV === 'development'){
 	URL_CONFIG = 'https://core-b.caimei365.com'
 }else{
     // 生产环境
-	// URL_CONFIG = 'https://core.caimei365.com'
-	URL_CONFIG = 'https://core-b.caimei365.com'
+	URL_CONFIG = 'https://core.caimei365.com'
+	// URL_CONFIG = 'https://core-b.caimei365.com'
 }
 export default URL_CONFIG