Merge branch 'dev_7.1.0' into dev_7.2.0

src/pages/userCenter/userCenter.js

@@ -64,8 +64,8 @@ wxService.page({
     // 邀请奖励弹框
     if (options && options['scene']) {
       let idParam = decodeURIComponent(options['scene']).split('&')[0]
-      let shareId = idParam && idParam.split('=')[1] || 0
-      if (shareId == 10){
+      let TYPE = idParam && idParam.split('=')[1] || 0
+      if (TYPE == '-1'){
         this.setData({
           shareBenefitModalShow: true
         })

src/subPackage/page/pages/grassCommunity/grassCommunity.js

@@ -307,10 +307,12 @@ wxService.page({
       })
       return;
     }
-    
+    const { memberId } = wx.getStorageSync('_baseUserInfo')
+
     this.setData({
       'params.headline': e.detail.value.headline,
-      'params.article': e.detail.value.article
+      'params.article': e.detail.value.article,
+      'params.userId': memberId
     })
     this.data.params.sspList.forEach((item,index) => {
       if (index == 0){

src/subPackage/page/pages/grassCommunity/grassCommunity.wxml

@@ -38,7 +38,8 @@
       <grass-item pro-goods="{{proGoods}}"/>
     </view>
   </view>
-  <button class="post-notes fixed-bottom0" form-type="submit">发布笔记</button>
+  <button wx:if="{{!currentHasUserInfo}}" class="post-notes fixed-bottom0"  bindgetuserinfo="_getUserInfo" data-jflag="false" open-type='getUserInfo'>发布笔记</button>
+  <button wx:if="{{currentHasUserInfo}}" class="post-notes fixed-bottom0" form-type="submit">发布笔记</button>
 </form>
 	<!--goHome-->
 <go-home />

src/subPackage/page/pages/share/share.js

@@ -118,7 +118,7 @@ wxService.page({
     let data = {
       "autoColor": true,
       "page": 'pages/userCenter/userCenter',
-      "scene": 'type=' + app.globalData.contants.SHARE_TYPE.INVITE_FRIENDS,
+      "scene": 'type=-1',
       "width": 100
     }
     wxService.post(`/marketing/quickMark/getAppQrCodePicture`, data).then(res => {