feature: 加入下午好和banner功能

pages/index/index.js

@@ -18,6 +18,11 @@ Page({
 
 
   data: {
+    banner: [{
+      "image": "",
+      "image": "",
+      "image": "",
+    }, ],
     indexPage: 0,
     showChannel: false,
     ////首页
@@ -498,14 +503,17 @@ Page({
     // });
     this.subscribeCurrDevice();
   },
+
   getThisDeviceID() {
     return `AIrSMArT_${this.data.deviceList[this.data.deviceListIndex].name.split("BLUFI_")[1]}`
   },
+
   goLogin() {
     wx.navigateTo({
       url: './../login/login',
     });
   },
+
   goDeviceConnect() {
     // routeUtil.jump(route_constant.deviceList)
     // return;
@@ -516,11 +524,13 @@ Page({
       isShowDevicelist: false
     })
   },
+
   getchannelData(clientType) {
     let _this = this;
     if (this.data.deviceListIndex === null) {
       return;
     };
+
     listByDevice({
       clientType
     }).then((res) => {
@@ -566,6 +576,7 @@ Page({
 
     })
   },
+
   showDelete() {
     // wx.navigateTo({
     //   url: './../deviceRoter3/deviceRoter3',

pages/index/index.wxml

@@ -4,7 +4,19 @@
 </nav-bar>
 
 <view class="container">
-  <view wx:if="{{indexPage==0}}" class="mair" style="height: calc(100vh - 150rpx - {{navBarHeight}}px);">
+  <view wx:if="{{indexPage==0}}" class="mair" style="height: calc(100vh - 140rpx - {{navBarHeight}}px);">
+
+    <view style="font-size: 28rpx;">下午好，Demon</view>
+
+    <!-- banner-->
+    <swiper wx:if="{{banner.length>0}}" class="banner_container" indicator-dots="{{banner.length>1}}" autoplay="true" interval="2000" duration="500" circular="true">
+      <block wx:for="{{banner}}" wx:key="index">
+        <swiper-item>
+          <image class="banner_item" src="{{item.image}}" mode="aspectFill" bindtap="clickActivity" data-item="{{item}}" lazy-load="true"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+
     <view class='nav-wrap' style='height: calc({{navBarHeight}}px - {{MenuButtonTop}}px); padding-top: {{MenuButtonTop}}px;'>
       <view wx:if="{{deviceList && deviceList.length > 0 && !showLogin}}" bindtap="isShowDevicelistFun" class="nav-info" style="height: {{ MenuButtonheight }}px;">
         <image class="device-pic" mode="heightFix" src="./../../img/min.png"></image>
@@ -45,7 +57,7 @@
 
   <view wx:else>
     <!-- 连接设备启用以下版本 -->
-    <view wx:if="{{indexPage==1}}" class="mair" style="height: calc(100vh - 150rpx - {{navBarHeight}}px);">
+    <view wx:if="{{indexPage==1}}" class="mair" style="height: calc(100vh - 140rpx - {{navBarHeight}}px);">
       <view class="play-info">
         <view class="info">
           <image src="./../../img/blak.png" class="black" mode="scaleToFill"></image>
@@ -119,7 +131,7 @@
         </view>
       </view>
 
-      <view wx:else class="me" style="height: calc(100vh - 132rpx - {{navBarHeight}}px);">
+      <view wx:else class="me" style="height: calc(100vh - 120rpx - {{navBarHeight}}px);">
         <view class="head-logo">
           <image mode="scaleToFill" src="{{userPic}}"></image>
           <text class="userName" wx:if="{{userName}}">{{userName}}</text>
@@ -152,20 +164,20 @@
     </view>
   </view>
 
-  <view style="height: 130rpx;">
+  <view style="height: 120rpx;">
     <view class="line"></view>
-    <view style="height: 128rpx; text-align: center; display: flex; flex: 1; align-items: center;">
+    <view style="height: 118rpx; text-align: center; display: flex; flex: 1; align-items: center;">
       <view class="bottom_view" data-index="0" bind:tap="onTapIndex">
         <image class="bottom_image" mode="widthFix" src="{{indexPage==0?'./../../img/index_action.png':'./../../img/index_unaction.png'}}"></image>
-        <view style="font-size: 30rpx;color: {{indexPage==0?'#A4D099':'black'}}; padding-top: 0rpx;margin-top: 0rpx;"> 首页</view>
+        <view style="font-size: 25rpx;color: {{indexPage==0?'#A4D099':'black'}}; padding-top: 0rpx;margin-top: 0rpx;"> 首页</view>
       </view>
       <view class="bottom_view" data-index="1" bind:tap="onTapIndex">
         <image class="bottom_image" mode="widthFix" src="{{indexPage==1?'./../../img/me_action.png':'./../../img/me_unaction.png'}}"></image>
-        <view style="font-size: 30rpx;color: {{indexPage==1?'#A4D099':'black'}};"> 频道</view>
+        <view style="font-size: 25rpx;color: {{indexPage==1?'#A4D099':'black'}};"> 频道</view>
       </view>
       <view class="bottom_view" data-index="2" bind:tap="onTapIndex">
         <image class="bottom_image" mode="widthFix" src="{{indexPage==2?'./../../img/me_action.png':'./../../img/me_unaction.png'}}"></image>
-        <view style="font-size: 30rpx;color: {{indexPage==2?'#A4D099':'black'}};"> 我的</view>
+        <view style="font-size: 25rpx;color: {{indexPage==2?'#A4D099':'black'}};"> 我的</view>
       </view>
     </view>
   </view>

pages/index/index.wxss

@@ -727,6 +727,18 @@
  }
 
  .bottom_image {
-   width: 60rpx;
-   height: 60rpx;
+   width: 55rpx;
+   height: 55rpx;
+ }
+
+ .banner_container {
+   height: 270rpx;
+   width: 90%;
+   margin-top: 40rpx;
+ }
+
+ .banner_item {
+   background-color: lightgray;
+   height: 270rpx;
+   border-radius: 15rpx;
  }