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

src/component/waterFlowLayout/waterFlowLayout.js

 // component/waterFlowLayout/waterFlowLayout.js
 const wxService = require('../../utils/wxService')
+const utils = require('../../utils/util')
 
 Component({
   /**
@@ -25,7 +26,7 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    // imageheight: 0
   },
 
   /**
@@ -33,6 +34,7 @@ Component({
    */
   methods: {
     onTapLike(e) {
+      if (e.currentTarget.dataset.currentType != 2) return;
       const { memberId } = wx.getStorageSync('_baseUserInfo')
       let params = {
         contentId: e.currentTarget.dataset.id,
@@ -42,6 +44,7 @@ Component({
       this.triggerEvent('updataLike', params)
     },
     onTapShare(e) {
+      if (e.currentTarget.dataset.currentType != 2) return;
       console.log(e)
       let params = {
         url: e.currentTarget.dataset.url,
@@ -61,8 +64,24 @@ Component({
       if (this.data.type == 1) {
         wxService.router(`/pages/wantToBuyDetail/wantToBuyDetail?id=${e.currentTarget.dataset.id}`)
       } else if (this.data.type == 2) {
-        wxService.router(`/subPackage/page/pages/myReleaseDetail/myReleaseDetail?id=${e.currentTarget.dataset.id}`)
+        if (e.currentTarget.dataset.currentType == 2){
+          wxService.router(`/subPackage/page/pages/myReleaseDetail/myReleaseDetail?id=${e.currentTarget.dataset.id}`)
+        }
       }
-    }
+    },
+
+    //获取图片高度
+    // imageLoad(e) {
+    //   console.log('height', utils.imageUtil(e))
+    //   let imageSize = utils.imageUtil(e)
+    //   this.data.imageData.forEach((item)=>{
+    //     item.imageheight = imageSize.imageHeight
+    //   })
+    //   // this.setData({
+    //   //   // imagewidth: imageSize.imageWidth,
+    //   //   imageheight: imageSize.imageHeight
+    //   // })
+    //   console.log('imageData',this.data.imageData)
+    // }
   }
 })

src/component/waterFlowLayout/waterFlowLayout.wxml

@@ -13,16 +13,20 @@
     </view>
   </view>
   <template name="water-list">
-  <view class="item" bindtap="gotoDetail" data-id="{{id}}">
-    <image class="item-img" src="{{url}}" mode="widthFix"></image>
+  <view class="item" bindtap="gotoDetail" data-id="{{id}}" data-currentType="{{currentType}}">
+  
+    <view class="no-audited" wx:if="{{currentType != 2}}">
+      待审核
+    </view>
+    <image class="item-img" src="{{url}}" mode="widthFix" bindload="imageLoad"></image>
     <view class="item-title-box">
       <view class="item-title">{{headline}}</view> 
     </view>
      <view class="share-wrap">
-        <view class="share-oprate" catchtap="onTapLike" data-id="{{id}}" data-type="{{type}}">
+        <view class="share-oprate" catchtap="onTapLike" data-id="{{id}}" data-type="{{type}}" data-currentType="{{currentType}}">
           <image class="share-img" src="{{type ? '/assets/imgs/heart-primary.png'  : '/assets/imgs/heart-default.png'}}"></image>
           <text class="share-number">{{enjoySum || 0}}</text>
-        </view>                                                                                                                               <view class="share-oprate" catchtap="onTapShare" data-title="{{headline}}" data-url="{{url}}" data-headline="{{headline}}" data-describe="{{describe}}" data-id="{{id}}">
+        </view>                                                                                                                               <view class="share-oprate" catchtap="onTapShare" data-title="{{headline}}" data-url="{{url}}" data-headline="{{headline}}" data-describe="{{describe}}" data-id="{{id}}" data-currentType="{{currentType}}">
           <image class="share-img" src="/assets/imgs/share.png"></image> 
           <text class="share-number">{{transmitSum || 0}}</text>
           </view>

src/component/waterFlowLayout/waterFlowLayout.wxss

@@ -11,6 +11,7 @@
   border-radius: 10rpx;
   box-shadow: 0px 2px 5px 0px rgba(199, 199, 199, 0.5);
   background-color: #ffffff;
+  position: relative;
 
 }
 .item-ava{
@@ -76,4 +77,17 @@
 }
 .right{
   float: right;
+}
+.no-audited{
+  width: 100rpx;
+  height: 40rpx;
+  position: absolute;
+  top: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.5);
+  color: #ffffff;
+  font-size: 24rpx;
+  text-align: center;
+  line-height: 40rpx;
+  border-radius: 20rpx;
 }
\ No newline at end of file

src/pages/addAddress/addAddress.js

@@ -177,6 +177,7 @@ wxService.page({
 
   //提交
   formSubmit(e){
+    const { memberId } = wx.getStorageSync('_baseUserInfo')
     if (!e.detail.value.name){
       wx.showToast({
         title: `请输入姓名`,

src/subPackage/page/pages/myInvite/myInvite.wxml

@@ -18,7 +18,7 @@
   <!-- </navigator> -->
   <view class="order-benefit-wrap">
     <view class="order-benefit-list" wx:for="{{inviteMemberList}}" wx:key="{{index}}">
-    <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type=10" hover-class="none">
+    <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type=10&id={{item.memberId}}" hover-class="none">
       <view class="top-info">
         <!-- 暂时先把头像去掉 -->
         <!-- <image class="invite-avatar" src="{{item.headimgurl}}"></image> -->

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

@@ -5,7 +5,7 @@
         <view class="top-info">
           <view class="benefit-type">
             <image class="benefit-img" src="{{item.awardType  == 1 ? '/assets/imgs/7_1_0/integral-icon.png' : '/assets/imgs/7_1_0/rmb.png'}}" mode="widthFix"></image>
-            <text class="benefit-desc">{{item.awardDetails}}</text>
+            <text class="benefit-desc">{{item.awardType  == 1 ? item.awardDetails : item.couponName}}</text>
           </view>
           <view class="benefit-way">
             {{item.typeName}}
@@ -13,7 +13,7 @@
         </view>
 
         <view class="bottom-info">
-          <view class="benefit-order">订单号：{{item.id}}</view>
+          <!-- <view class="benefit-order">订单号：{{item.id}}</view> -->
           <view class="benefit-time">{{item.createTime}}</view>
         </view>
       </view>