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

src/pages/extendProduct/extendProduct.wxml

@@ -118,7 +118,7 @@
 			 wx:for-item="extendItem"
       
 			>
-        <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type={{extendItem.tentacleContent.type}}&id={{extendItem.tentacleContent.id}}" hover-class="none">
+        <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?id={{extendItem.tentacleContent.id}}" hover-class="none">
           <view class="order-header">
             <view class="order-number">
               <text>{{extendItem.tentacleContent.createTime}}</text>

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml

@@ -56,7 +56,7 @@
 					<view class="action-edit"> 编辑 </view>
 				</navigator>
 			</view>
-      <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?id={{contentInfo.id}}&type=6" hover-class="none">
+      <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?id={{contentInfo.id}}" hover-class="none">
 			  <view class="action-check"> 查看收益 </view>
       </navigator>
 		</view>

src/subPackage/page/pages/orderBenefit/orderBenefit.js

@@ -63,6 +63,9 @@ wxService.page({
       userId: memberId,
       type: this.data.type,
       sourceId: this.data.id
+      // userId: '616205595376377856',
+      // // type: this.data.type,
+      // sourceId: '623097221046603776'
     }
     wxService.post(`/marketing/awardRecord/queryAward?pageNum=${pageNum}&pageSize=${pageSize}`, params).then(res => {
       if (res) {