diff --git a/config/api.js b/config/api.js
index 5418c8f..67ab49b 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,15 +4,13 @@
  */
 // 开发环境
 const dev = {
-      common: "http://192.168.0.113:8890",
-      buyer: "http://192.168.0.113:8898",
-      im: "http://192.168.0.113:8885",
-      
-	  // common: "https://common-api.pickmall.cn",
-	  // buyer: "https://buyer-api.pickmall.cn",
+    im: "https://im-api.pickmall.cn",
+	  common: "https://common-api.pickmall.cn",
+	  buyer: "https://buyer-api.pickmall.cn",
 };
 // 生产环境
 const prod = {
+  im: "https://im-api.pickmall.cn",
   common: "https://common-api.pickmall.cn",
   buyer: "https://buyer-api.pickmall.cn",
 };
diff --git a/manifest.json b/manifest.json
index 2359a9d..c75443d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -74,8 +74,8 @@
                     "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许"
                 },
                 "autoSdkPermissions" : false
-                //安卓自添加 权限  应用市场 过度索取权限
             },
+            //安卓自添加 权限  应用市场 过度索取权限
             "ios" : {
                 "idfa" : false,
                 "privacyDescription" : {
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 0a9a7b8..18f843b 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -601,23 +601,17 @@ export default {
 
     linkMsgDetail () {
       // lili 基础客服
-<<<<<<< HEAD
 
       uni.navigateTo({
         url: `/pages/mine/im/index?userId=${this.goodsDetail.storeId}&goodsid=${this.routerVal.goodsId}&skuid=${this.routerVal.id}`
       });
 
-=======
-      this.$options.filters.talkIm(this.storeDetail.storeId)
-  
->>>>>>> f84f9ab696c10447c7aa8a27382cfccd3d5729d8
       // udesk 代码  
       // if (this.storeDetail.merchantEuid) {
       //   uni.navigateTo({
       //     url: `/pages/tabbar/home/web-view?src=${this.IM}`,
       //   });
       // }
-<<<<<<< HEAD
 
 
       // 客服 云智服代码 
@@ -649,39 +643,6 @@ export default {
       // });
       // // #endif
 
-=======
-		  
-		  
-        // 客服 云智服代码 
-        // // #ifdef MP-WEIXIN
-        // const params = {
-        //   storeName: this.storeDetail.storeName,
-        //   goodsName: this.goodsDetail.goodsName,
-        //   goodsId: this.goodsDetail.goodsId,
-        //   goodsImg: this.goodsDetail.thumbnail,
-        //   price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
-        //   // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
-        //   uuid: storage.getUuid(),
-        //   token: storage.getAccessToken(),
-        //   sign: this.storeDetail.yzfSign,
-        //   mpSign: this.storeDetail.yzfMpSign,
-        // };
-        // uni.navigateTo({
-        //   url:
-        //     "/pages/product/customerservice/index?params=" +
-        //     encodeURIComponent(JSON.stringify(params)),
-        // });
-        // // #endif
-        // // #ifndef MP-WEIXIN
-        // const sign = this.storeDetail.yzfSign;
-        // uni.navigateTo({
-        //   url:
-        //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
-        //     sign,
-        // });
-        // // #endif
-    
->>>>>>> f84f9ab696c10447c7aa8a27382cfccd3d5729d8
     },
     /**选择商品 */
     changedGoods (val) {
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 0ee335f..6c1fe03 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -331,7 +331,6 @@ export default {
       // 店铺信息
       this.getStoreData();
     },
-<<<<<<< HEAD
     /**
      * 联系客服
      */
@@ -365,8 +364,6 @@ export default {
       // });
       // #endif
     },
-=======
->>>>>>> f84f9ab696c10447c7aa8a27382cfccd3d5729d8
 
     /** 获取店铺分类 */
     async getCategoryData() {