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

src/component/selectRelatedGoods/selectRelatedGoods.wxml

@@ -23,7 +23,7 @@
 		</view>
 
 		<view class="empty-coupon" wx:if="{{!proList || proList.length < 1}}">
-			暂无订单
+			暂无订单商品哦~
 		</view>
 	</view>
 

src/subPackage/page/pages/orderBenefit/orderBenefit.wxml

@@ -20,7 +20,7 @@
     </view>
     <view class="empty" wx:if="{{!orderBenefitList || orderBenefitList.length < 1}}">暂无订单收益~</view>
   <view class="benefit-tips">
-    <text>邀请好友只显示前50名</text>
+    <text>促成订单默认显示前50笔</text>
   </view>
   	<!--goHome-->
 	<go-home />

src/utils/Http.js

@@ -89,8 +89,8 @@ class Http {
         method: 'GET',
         header: {
           'buyer-token': this.getToken(),
-          // 'TENTACLE_CONTENT': this.getTentacle(),
-          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
+          'tentacle-content': this.getTentacle(),
+          // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },
         data: parmas
       })
@@ -100,8 +100,8 @@ class Http {
         method: 'GET',
         header: {
           'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
-          // 'TENTACLE_CONTENT': this.getTentacle(),
-          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
+          'tentacle-content': this.getTentacle(),
+          // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
 
         },
         data: parmas
@@ -120,8 +120,8 @@ class Http {
         method: 'POST',
         header: {
           'buyer-token': this.getToken(),
-          // 'TENTACLE_CONTENT': this.getTentacle()
-          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
+          'tentacle-content': this.getTentacle()
+          // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },
         data: parmas,
         channel: channel
@@ -132,8 +132,8 @@ class Http {
         method: 'POST',
         header: {
           'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
-          // 'TENTACLE_CONTENT': this.getTentacle()
-          'TENTACLE_CONTENT': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
+          'tentacle-content': this.getTentacle()
+          // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
         },
         data: parmas,
         channel: channel
@@ -214,13 +214,11 @@ class Http {
   getTentacle(){
     let time = Date.parse(new Date())
     let TIME_EXPIRATION = wx.getStorageSync('TIME_EXPIRATION')
-    let storage = wx.getStorageSync('TENTACLE_CONTENT') , tentacle = null;
+    let storage = wx.getStorageSync('TENTACLE_CONTENT') , tentacle = '';
+
     if (storage){
       tentacle = storage.obj;
     }
-    
-    console.log(tentacle)
-
     if (tentacle && TIME_EXPIRATION > time){
       wx.setStorageSync('TIME_EXPIRATION', time + 30*60*1000);
       return JSON.stringify(tentacle);
@@ -228,6 +226,8 @@ class Http {
       wx.removeStorageSync('TENTACLE_CONTENT')
       wx.removeStorageSync('TIME_EXPIRATION')
     }
+
+    return JSON.stringify({});
   }
 }