Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !154

src/pages/productDetail/productDetail.js

@@ -36,11 +36,12 @@ wxService.page({
         fromZc: options.fromZc == 1
       });
       //不是从种草过来的， 需要清除本地临时的触点信息
-      if (!options.fromZc) {
-        wx.removeStorageSync('TEMP_TENTACLE_INFO');
-        wx.removeStorageSync('TIME_EXPIRATION');
-      }
+      // if (!options.fromZc) {
+      //   wx.removeStorageSync('TEMP_TENTACLE_INFO');
+      //   wx.removeStorageSync('TIME_EXPIRATION');
+      // }
     }
+    console.log('options',options)
 
     let memberId = options.memberId;
     if (memberId) {

src/subPackage/page/pages/orderBenefit/orderBenefit.json

 {
   "enablePullDownRefresh": true,
-  "navigationBarTitleText": "订单收益",
+  "navigationBarTitleText": "收益",
   "usingComponents": {
     "go-home": "/component/goHome/goHome"
   }

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

@@ -13,14 +13,14 @@
         </view>
 
         <view class="bottom-info">
-          <!-- <view class="benefit-order">订单号：{{item.id}}</view> -->
+          <view class="benefit-order" wx:if="{{item.tradeId}}">订单号：{{item.tradeId}}</view>
           <view class="benefit-time">{{item.createTime}}</view>
         </view>
       </view>
     </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 />