调整活动样式、排行榜样式、联调朋友页面接口

components/activityList/index.less

@@ -40,8 +40,8 @@
         color: white;
 
         .backIcon {
-          width: 12rpx;
-          height: 22rpx;
+          width: 14rpx;
+          height: 24rpx;
         }
       }
     }
@@ -186,8 +186,8 @@
         color: white;
 
         .backIcon {
-          width: 12rpx;
-          height: 22rpx;
+          width: 14rpx;
+          height: 24rpx;
         }
       }
     }

components/activityList/index.wxml

@@ -12,7 +12,7 @@
           <view class="title">{{item.title}}</view>
         </view>
         <view class="toAll" bindtap="activityEvent" data-info="{{item}}">查看全部
-          <image src="/static/rBtn.png" class="backIcon" />
+          <image src="/static/rbtn.png" class="backIcon" />
         </view>
       </view>
       <view class="body">
@@ -55,7 +55,7 @@
           <view class="title">{{item.title}}</view>
         </view>
         <view class="toAll" bindtap="activityEvent" data-info="{{item}}">查看全部
-          <image src="/static/rBtn.png" class="backIcon" />
+          <image src="/static/rbtn.png" class="backIcon" />
         </view>
       </view>
       <view class="body">
@@ -75,7 +75,7 @@
         </view>
       </view>
     </view>
-    <view class="activityBox" wx:if="{{item.bannerType==4}}">
+    <!--     <view class="activityBox" wx:if="{{item.bannerType==4}}">
       <image src="{{item.icon}}" class="cover-small " />
       <view class="footer">
         <view class="info">
@@ -93,7 +93,7 @@
         <view class="btn {{item.second=='00'?'closingBtn':''}}" data-info='{{item}}' bindtap="drawVoucher">立即领取
         </view>
       </view>
-    </view>
+    </view> -->
   </block>
 </view>
 <Voucher id="voucher" />

components/activityList/index.wxss

@@ -37,8 +37,8 @@
   color: white;
 }
 .activityList .ranking-class-1 .header .toAll .backIcon {
-  width: 12rpx;
-  height: 22rpx;
+  width: 14rpx;
+  height: 24rpx;
 }
 .activityList .ranking-class-1 .body {
   padding: 24rpx 10rpx 38rpx 10rpx;
@@ -160,8 +160,8 @@
   color: white;
 }
 .activityList .ranking-class-2 .header .toAll .backIcon {
-  width: 12rpx;
-  height: 22rpx;
+  width: 14rpx;
+  height: 24rpx;
 }
 .activityList .ranking-class-2 .body {
   width: 100%;

mixins/video.js

@@ -55,7 +55,6 @@ module.exports = Behavior({
         currentTime: '00:00',
         sliderValue: 0
       })
-      console.log(currentTarget.dataset.audio,'bbbbbbbbbbb');
       this.innerAudioContext.src = currentTarget.dataset.audio
       setTimeout(() => {
         this.innerAudioContext.play();

pages/follow/index.js

@@ -8,14 +8,10 @@ Page({
    * 页面的初始数据
    */
   data: {
-    // 1我的关注;2我的粉丝 ;3相互关注
+    // 1我的关注;2我的粉丝
     currentType: 1
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
+  onShow() {
     this.resetData()
   },
   setType({
@@ -41,5 +37,5 @@ Page({
     wx.navigateTo({
       url: `/pages/personal/index?uid=${uid}`,
     })
-  }
+  },
 })

pages/follow/index.less

@@ -4,11 +4,12 @@
   .screening {
     display: flex;
     align-items: flex-end;
-    justify-content: space-between;
-    padding: 0rpx 64rpx;
+    justify-content: space-around;
+    padding: 0rpx 24rpx;
     box-sizing: border-box;
 
     .type {
+      padding: 10rpx 20rpx;
       color: #666;
       font-size: 26rpx;
     }
@@ -21,7 +22,7 @@
   }
 
   .follow {
-    margin-top: 40rpx;
+    margin-top: 20rpx;
     box-sizing: border-box;
     width: 100%;
     background-color: white;
@@ -33,6 +34,7 @@
     justify-content: space-between;
 
     .userInfo {
+      flex: 1;
       display: flex;
 
       .avatar {
@@ -69,7 +71,7 @@
     }
 
     .state {
-      padding: 0rpx 30rpx;
+      width: 100rpx;
       text-align: center;
 
       .stateImg {
@@ -83,4 +85,8 @@
       }
     }
   }
+
+  .empty {
+    margin-top: 200rpx;
+  }
 }

pages/follow/index.wxml

@@ -1,13 +1,12 @@
 <view class="followBox">
   <view class="screening">
-    <view class="type {{currentType==3?'currentType':''}}" data-type="3" bindtap="setType">相互关注</view>
     <view class="type {{currentType==1?'currentType':''}}" data-type="1" bindtap="setType">我的关注</view>
     <view class="type {{currentType==2?'currentType':''}}" data-type="2" bindtap="setType">我的粉丝</view>
   </view>
-  <view class="follow" wx:for="{{ list }}" wx:key="*this">
+  <view class="follow" wx:for="{{list}}" wx:key="*this" bindtap="jumpUserInfo" data-uid='{{item.user.uid}}'>
     <view class="userInfo">
       <view class='avatar'>
-        <image class='avatar-image' src="{{ item.user.avatar }}" bindtap="jumpUserInfo" data-uid='{{item.user.uid}}' />
+        <image class='avatar-image' src="{{ item.user.avatar }}" />
         <view class="user-profession">{{item.user.profession}}</view>
       </view>
       <view class="nickName">
@@ -15,9 +14,10 @@
       </view>
     </view>
     <view class="state">
-      <image class='stateImg' src="{{item.isEachOther?'/static/concernback.png':'/static/concerned.png'}}" />
-      <view class="stateText">{{ item.isEachOther?'互相关注':'已关注' }}</view>
+      <image class='stateImg'
+        src="{{currentType==1?'/static/concernback.png':item.isEachOther?'/static/concerned.png':'/static/concernRespond.png'}}" />
+      <view class="stateText">{{ currentType==1?'已关注':item.isEachOther?'互相关注':'回关'}}</view>
     </view>
   </view>
-  <!--   <emptyBg wx:if="{{list.length==0}}" message='您还没有关注哦'></emptyBg> -->
+  <emptyBg wx:if="{{nullList}}" message='快去寻找小伙伴吧！' />
 </view>

pages/follow/index.wxss

@@ -4,11 +4,12 @@
 .followBox .screening {
   display: flex;
   align-items: flex-end;
-  justify-content: space-between;
-  padding: 0rpx 64rpx;
+  justify-content: space-around;
+  padding: 0rpx 24rpx;
   box-sizing: border-box;
 }
 .followBox .screening .type {
+  padding: 10rpx 20rpx;
   color: #666;
   font-size: 26rpx;
 }
@@ -18,7 +19,7 @@
   font-size: 34rpx;
 }
 .followBox .follow {
-  margin-top: 40rpx;
+  margin-top: 20rpx;
   box-sizing: border-box;
   width: 100%;
   background-color: white;
@@ -30,6 +31,7 @@
   justify-content: space-between;
 }
 .followBox .follow .userInfo {
+  flex: 1;
   display: flex;
 }
 .followBox .follow .userInfo .avatar {
@@ -61,7 +63,7 @@
   margin-top: 2rpx;
 }
 .followBox .follow .state {
-  padding: 0rpx 30rpx;
+  width: 100rpx;
   text-align: center;
 }
 .followBox .follow .state .stateImg {
@@ -72,3 +74,6 @@
   color: #686868;
   font-size: 20rpx;
 }
+.followBox .empty {
+  margin-top: 200rpx;
+}

pages/index/index.js

@@ -17,7 +17,7 @@ Page({
   data: {
     navBarHeight: app.globalData.navBarHeight,
     background: ['demo-text-1', 'demo-text-2', 'demo-text-3'],
-    currentType: '1',
+    currentType: '2',
     // 控制一级分类是否固定
     isFixed: false,
     desktopTips: app.globalData.desktopTips,

pages/index/index.less

@@ -57,7 +57,7 @@
     justify-content: space-between;
 
     .type {
-      padding: 10rpx 0rpx;
+      padding: 14rpx 0rpx;
       width: 200rpx;
       box-sizing: border-box;
       text-align: center;

pages/index/index.wxss

@@ -50,7 +50,7 @@
   justify-content: space-between;
 }
 .recommend .selectType .type {
-  padding: 10rpx 0rpx;
+  padding: 14rpx 0rpx;
   width: 200rpx;
   box-sizing: border-box;
   text-align: center;

pages/my/index.wxml

@@ -119,7 +119,7 @@
         data-type='{{tasks[0].id}}'>
         {{tasks[0].completed?'已签到':'签到'}}</view>
     </view>
-    <view class="task">
+    <!--     <view class="task">
       <view class="taskLeft">
         <image class="img" src="/static/task1.png" alt="" mode="" />
         <view class="taskContent">
@@ -132,7 +132,7 @@
       <view class="taskRight {{tasks[0].completed?'taskRight-close':''}}" bindtap="submitTask"
         data-type='{{tasks[0].id}}'>
         {{tasks[0].completed?'已绑定':'绑定'}}</view>
-    </view>
+    </view> -->
     <view class="task">
       <view class="taskLeft">
         <image class="img" src="/static/task2.png" alt="" mode="" />

pages/ranking/index.less

@@ -10,7 +10,7 @@
     background-size: cover;
 
     .dateBox {
-      margin-top: 54rpx;
+      margin-top: 56rpx;
       font-size: 28rpx;
       color: white;
       .dataTitle{

pages/ranking/index.wxss

@@ -10,7 +10,7 @@
   background-size: cover;
 }
 .rankingBox .podiumBox .dateBox {
-  margin-top: 54rpx;
+  margin-top: 56rpx;
   font-size: 28rpx;
   color: white;
 }