Merge branch 'dev_7.1.0' into fixbug-ZYW

src/pages/extendProduct/extendProduct.wxml

@@ -39,7 +39,7 @@
 		</view>
 		<view class="buy-product-wrap">
 			<view class="buy-product-content">
-				<view class="buy-list" wx:for="{{extendProList}}" wx:key="{{index}}">
+				<view class="buy-list" wx:if="{{extendProList.length}}" wx:for="{{extendProList}}" wx:key="{{index}}">
 					<view class="prod-img">
 						<image src="{{item.productImgUrl}}" />
 					</view>
@@ -80,7 +80,7 @@
 
 			</view>
 		</view>
-		<view class="share-wrap">
+		<view class="share-wrap" wx:if="{{extendProList.length}}">
 			<view class="share-button" bindtap="onTapPoster">
 				<image mode="widthFix" />
 				<text>快速分享</text>
@@ -90,6 +90,9 @@
 				<text>生成海报</text>
 			</view>
 		</view>
+		<view class="df no-list" wx:if="{{!extendProList.length}}">
+			暂无推广商品
+		</view>
 	</scroll-view>
 	<!-- </swiper-item>
       <swiper-item> -->

src/pages/extendProduct/extendProduct.wxss

@@ -4,6 +4,11 @@ page{
   background: #ffffff;
   padding-bottom: 100rpx;
 }
+.no-list {
+  padding-top:100rpx;
+  font-size: 28rpx;
+  color: #666666;
+}
 scroll-view{
   height: 100%;
 }

src/utils/wxService.js

@@ -108,7 +108,7 @@ class WXService extends Http {
           // 重新登陆之前判断是否登陆过 重新登陆
           const baseUserInfo = this.getBaseUserInfo()
           if (baseUserInfo) {
-            this.reLogin()
+            // this.reLogin()
             return false
           }
         }