Merge branch 'dev_7.2.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.2.0

src/shoppingGuid/component/tabBar/tabBar.wxml

 <!--subPackage/component/tabBar/tabBar.wxml-->
+<!-- <cover-view class='bottom-container'>
+  
+</cover-view> -->
 <view class='bottom-tab-bar'>
   <view class='tab-bar-item' 
   bindtap='onTapToPage' 
@@ -10,4 +13,4 @@
   wx:for-item="item">
     <image src='{{item.isActive ? item.activeUrl : item.defaultUrl}}' mode='widthFix'></image>
   </view>
-</view>
+</view>
\ No newline at end of file

src/shoppingGuid/page/pages/welfare/welfare.js

@@ -159,7 +159,7 @@ wxService.page({
         let inner_tentacleId = Integer.digit(tentacleId, 10, 64);
         var path = 'pages/productDetail/productDetail' + '?i=' + inner_id + '&t=' + inner_tentacleId;
         // let path = 'pages/productDetail/productDetail';
-        console.log('推荐商品path-----', path)
+        // console.log('推荐商品path-----', path)
         //打开企业微信通讯录选择会员
         wx.qy.shareToExternalContact({
           appid: app.globalData.appId,//小程序的appid

src/utils/Http.js

@@ -82,7 +82,7 @@ class Http {
 
   get (url, parmas) {
     let baseUserInfo = wx.getStorageSync('_baseUserInfo')
-    
+    console.log(this.getTentacle())
     if(baseUserInfo){
       return this.request({
         url,
@@ -116,6 +116,7 @@ class Http {
   post (url, parmas, channel) {
     let baseUserInfo = wx.getStorageSync('_baseUserInfo')
     let guideUserInfo = wx.getStorageSync('guidBaseInfo');
+    console.log('getTentacle------',this.getTentacle())
     // console.log('--------------header-----------------', this.getTentacle())
     // console.log('--------------token-----------------', this.getToken())
 

src/utils/wxService.js

@@ -590,21 +590,20 @@ class WXService extends Http {
             if (item['i']) {
               item['id'] = Integer.digit(item['i'], 64, 10);
             }
+            // id = item['memberId'];
           }
           if (item['scene']) {
             pageIsFromShare = true;
-            let idParam = decodeURIComponent(item['scene']).split('&')[0]
-            console.log('idParam---', idParam)
+            let idParam = decodeURIComponent(item['scene']).split('&')[0];
             let shareId = idParam && idParam.split('=')[1] || 0
             item['id'] = Integer.digit(shareId, 64, 10)
-            id = Integer.digit(shareId, 64, 10);
+            id = item['id'];
           }
 
         });
         //如果打开的是分享界面则进行触点对象信息请求并存储到本地 放到后续的header中
         if (pageIsFromShare) {
           //调用接口
-          console.log(id)
           _self.getTentacleContentByTentacleId(id);
         }