Merge remote-tracking branch 'origin/master' into develop/3.2.5

# Conflicts:
#	pages/index/index.wxml

pages/index/index.wxml

@@ -78,7 +78,7 @@
     <view wx:else>
 
       <!-- 频道 -->
-      <view wx:if="{{deviceListSelect!=null&&deviceList.length>deviceListSelect&&deviceList[deviceListSelect].connectType===3}}" class="mair" style="height: calc(100vh - 105rpx - {{safeBottomHeight}}rpx - 22rpx - {{navBarHeight}}px);">
+      <view wx:if="{{indexPage==1&&deviceListSelect!=null&&deviceList.length>deviceListSelect&&deviceList[deviceListSelect].connectType===3}}" class="mair" style="height: calc(100vh - 105rpx - {{safeBottomHeight}}rpx - 22rpx - {{navBarHeight}}px);">
         <view class="play-info">
           <view class="info">
             <image src="./../../img/blak.png" class="black" mode="scaleToFill"></image>

pages/index/index.wxss

@@ -727,6 +727,7 @@
 }
 
 /************************ banner ************************/
+
 .banner_container {
   width: 100%;
   height: 264rpx;

pages/login/login.wxml

@@ -6,7 +6,7 @@
     <image mode="widthFix" src="./../../img/k.png"></image>
     <view class="loginbut">
       <view class="mode" wx:if="{{!isAgree}}" catchtap="notlogin"></view>
-      <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">微信手机号快速登录</button>
+      <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快速登录</button>
     </view>
     <view class="ys">
       <image bindtap="egree" mode="aspectFill" src="./../../img/{{isAgree ? 'h' : 'j'}}.png"></image>