Merge remote-tracking branch 'remotes/origin/developer' into developerC

components/cm-module/homeIndex/pageSpecial.vue

@@ -114,7 +114,7 @@
 					 	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}`,
+					 	// 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

@@ -197,10 +197,10 @@
 								<image src="../../static/icon-home-active@3x.png"></image>
 								<text>首页</text>
 							</view>
-							<view class="item-bt" @click="goSupplier">
-								<image src="../../static/icon-shop@3x.png"></image>
-								<text>店铺</text>
-							</view>
+							<button class="item-bt" open-type="contact" @click="handleContact">
+								<image src="../../static/severs@3x.png"></image>
+								<text>客服</text>
+							</button>
 							<view class="item-bt" @click="buyProductCart()">
 								<image src="https://static.caimei365.com/app/img/icon/icon-cart-active@3x.png"></image>
 								<text>购物车</text>
@@ -480,7 +480,8 @@
 				}).exec()
 			},
 			handleContact(e){//跳转小程序客服
-
+				console.log(e.detail.path)
+				console.log(e.detail.query)
 			},
 			buyProductCart(){//底部购物车按钮点击
 				authorize.checkLogin()

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'
 }
 export default URL_CONFIG