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

Fixbug zyw

See merge request !140

src/pages/extendProduct/extendProduct.wxml

@@ -92,9 +92,9 @@
 				<text>生成海报</text>
 			</view>
 		</view>
-		<view class="df no-list" wx:if="{{!extendProList.length}}">
+		<!-- <view class="df no-list" wx:if="{{!extendProList.length}}">
 			暂无推广商品
-		</view>
+		</view> -->
 	</scroll-view>
 	<!-- </swiper-item>
       <swiper-item> -->
@@ -151,14 +151,14 @@
 	<!-- </swiper-item>
 	</swiper> -->
 </view>
-<share-modal show="{{showShareModal}}" />
-<card-modal
+<!-- <share-modal show="{{showShareModal}}" /> -->
+<!-- <card-modal
  show-card-modal="{{showCardModal}}"
  card-title="{{cardTitle}}"
  card-url="{{cardUrl}}"
  page-path="{{pagePath}}"
 />
-<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
+<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}"  productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster> -->
 <!--goHome-->
 <go-home/>
 

src/pages/extendProduct/extendProduct.wxss

@@ -150,7 +150,7 @@ swiper {
   justify-content: space-around;
   height: 88rpx;
   align-items: center;
-  z-index: 99;
+  z-index: 9999;
 }
 .share-button{
   width: 200rpx;

src/subPackage/page/pages/myInvite/myInvite.js

@@ -105,6 +105,7 @@ wxService.page({
         const { result, data } = res.data
         if (result == 0) {
           wx.hideLoading()
+          
           this.setData({
             inviteMemberList: data
           }, () => {

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

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

src/subPackage/page/pages/myInvite/myInvite.wxss

@@ -67,7 +67,8 @@ page{
 .benefit-tips{
   width: 750rpx;
   height: 53rpx;
-  background-color: rgba(0, 0, 0, 0.25);
+  /* background-color: rgba(0, 0, 0, 0.25); */
+  background-color: #ccc;
   position: fixed;
   bottom: 0;
   line-height: 53rpx;

src/subPackage/page/pages/myRelease/myRelease.js

@@ -2,6 +2,7 @@
 const app = getApp()
 const wxService = require('../../../../utils/wxService')
 const utils = require('../../../../utils/util')
+const CEvent = require('../../../../utils/event')
 const envInfo = require('../../../../config/index').envInfo
 const { memberId, member } = wx.getStorageSync('_baseUserInfo')
 import { Integer } from '../../../../utils/integerDigitalConvertion'
@@ -44,6 +45,8 @@ wxService.page({
 
       this.generatePointObject(tentacleInfo);
     }
+    //获取内容列表
+    this.getContentList();
 
   },
   /**
@@ -61,8 +64,8 @@ wxService.page({
         plus: 0
       })
     }
+    
     this.getBannerInfo()
-    this.getContentList()
     this.getContentPermission()
     this.data.currentShareContent = null;
     
@@ -126,7 +129,11 @@ wxService.page({
             contentList: this.data.pageNum == 1 ? [...data.content] : [...this.data.contentList, ...data.content],
             totalPages: data.totalPages,
             totalElements: data.totalElements
+          },() => {
+            console.log(this.data.contentList)
           })
+
+
         } else {
           this.setData({
             contentList: []

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

@@ -36,6 +36,8 @@ wxService.page({
       }
      
     }
+
+    this.getOrderBenefit(1, 10)
   },
 
   /**
@@ -49,7 +51,7 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.getOrderBenefit(1,10)
+    
   },
 
   getOrderBenefit(pageNum, pageSize){