开发联调Ta的主页

components/videoPreview/index.js

@@ -212,7 +212,7 @@ Component({
     },
     jumpUserInfo() {
       wx.navigateTo({
-        url: `/pages/personal/index?uid=${this.data.videoInfoCopy.user.uid}`,
+        url: `/pages/personal/index?uid=${this.data.videoInfoCopy.user.uid}&type=user`,
       })
     },
     // 控制音频播放

pages/personal/index.js

@@ -1,31 +1,45 @@
 import {
   getUserInfo,
-  setFans
+  setFans,
+  getUserRead
 } from '~/api/user'
+import reachBottom from '~/mixins/reachBottom'
 Page({
-
+  behaviors: [reachBottom],
   /**
    * 页面的初始数据
    */
   data: {
-    userInfo: {}
+    userInfo: {},
+    // type为pk，顶部显示为pk时样式，user为默认样式
+    type: 'user'
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    console.log(options.uid);
+    console.log(options);
+    this.setData({
+      type: options.type || 'user'
+    })
     this.getUserInfo(options.uid)
   },
   async getUserInfo(uid) {
     let res = await getUserInfo({
       uid
     })
-    console.log(res);
     this.setData({
       userInfo: res
     })
+    this.resetData()
+  },
+  loadMore() {
+    this.getData(getUserRead, {
+      uid: this.data.userInfo.user.uid
+    })
+  },
+  bindscrolltolower() {
+    console.log('111');
   },
   // 关注
   async setFans() {

pages/personal/index.less

@@ -95,10 +95,10 @@
         padding: 18rpx 0rpx;
 
         .count {
-          width: 33%;
+          flex: 1;
           font-size: 28rpx;
           color: rgba(0, 0, 0, 0.6);
-          text-align: center;
+          text-align: left;
 
           .countNum {
             margin-left: 10rpx;
@@ -157,24 +157,32 @@
           margin-left: 26rpx;
 
           .title {
+            max-width: 310rpx;
             font-size: 32rpx;
             font-weight: bold;
             margin-bottom: 10rpx;
           }
 
-          .statistic {
+          .statistics {
             display: flex;
             align-items: center;
-            justify-content: space-between;
-
-            .playImg {
-              width: 34rpx;
-              height: 28rpx;
-            }
 
-            .num {
-              font-size: 26rpx;
-              color: #666666;
+            .statistic {
+              margin-right: 20rpx;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+
+              .playImg {
+                width: 22rpx;
+                height: 22rpx;
+              }
+
+              .num {
+                margin-left: 4rpx;
+                font-size: 22rpx;
+                color: #666666;
+              }
             }
           }
         }

pages/personal/index.wxml

@@ -16,31 +16,32 @@
           <text>{{userInfo.like?'已关注':'关注'}}</text>
         </view>
       </view>
-      <!-- <view class="uRBtm">
+      <view class="uRBtm" wx:if="{{type=='user'}}">
         <view class="count countFirst">
-          总场<text class="countNum textOver">{{filters.numFilter(userInfo.readAmount)|| 0}}</text>
-        </view>
-        <view class="count countFirst">
-          胜<text class="countNum textOver">{{filters.numFilter(userInfo.readAmount)|| 0}}</text>
+          作品<text class="countNum textOver">{{filters.numFilter(userInfo.readAmount)|| 0}}</text>
         </view>
         <view class="count">
-          平<text class="countNum textOver">{{filters.numFilter(userInfo.fansAmount)|| '0'}}</text>
+          粉丝<text class="countNum textOver">{{filters.numFilter(userInfo.fansAmount)|| '0'}}</text>
         </view>
         <view class="count countEnd">
-          负<text class="countNum textOver">{{filters.numFilter(userInfo.playAmount) || 0}}</text>
+          播放<text class="countNum textOver">{{filters.numFilter(userInfo.playAmount) || 0}}</text>
         </view>
-      </view> -->
-      <view class="uRBtm">
+      </view>
+      <view class="uRBtm" wx:if="{{type=='pk'}}">
         <view class="count countFirst">
-          作品<text class="countNum textOver">{{filters.numFilter(userInfo.readAmount)|| 0}}</text>
+          总场<text class="countNum textOver">{{filters.numFilter(userInfo.readAmount)|| 0}}</text>
+        </view>
+        <view class="count countFirst">
+          胜<text class="countNum textOver">{{filters.numFilter(userInfo.readAmount)|| 0}}</text>
         </view>
         <view class="count">
-          粉丝<text class="countNum textOver">{{filters.numFilter(userInfo.fansAmount)|| '0'}}</text>
+          平<text class="countNum textOver">{{filters.numFilter(userInfo.fansAmount)|| '0'}}</text>
         </view>
         <view class="count countEnd">
-          播放<text class="countNum textOver">{{filters.numFilter(userInfo.playAmount) || 0}}</text>
+          负<text class="countNum textOver">{{filters.numFilter(userInfo.playAmount) || 0}}</text>
         </view>
       </view>
+
     </view>
   </view>
   <view class="divider">
@@ -49,15 +50,23 @@
   <view style="flex: 1;overflow: hidden;">
     <scroll-view class="worksList" scroll-y="true" enhanced show-scrollbar="{{false}}" scroll-top="{{scrollTop}}"
       bindscrolltolower='bindscrolltolower'>
-      <view class="worksBox" wx:for="{{16}}" wx:key="index">
+      <view class="worksBox" wx:for="{{list}}" wx:key="index">
         <view class="left">
-          <image src="https://yfklxt-image.ai160.com/reader/20211012/1634004843742426.jpg" class="cover" />
+          <image src="{{item.userRead.coverImg}}" class="cover" />
           <view class="work">
-            <view class="title">狼来了</view>
+            <view class="title textOver">{{item.userRead.title}}</view>
             <view class="statistics">
               <view class="statistic">
-                <image src="/static/play.png" class="playImg" mode="" />
-                <view class="num">1234</view>
+                <image src="/static/f.png" class="playImg" mode="" />
+                <view class="num">分享</view>
+              </view>
+              <view class="statistic">
+                <image src="/static/p.png" class="playImg" mode="" />
+                <view class="num">{{item.userRead.commentAmount}}</view>
+              </view>
+              <view class="statistic">
+                <image src="/static/d.png" class="playImg" mode="" />
+                <view class="num">{{item.userRead.likeAmount}}</view>
               </view>
             </view>
           </view>

pages/personal/index.wxss

@@ -84,10 +84,10 @@
   padding: 18rpx 0rpx;
 }
 .personalBox .userBox .userRight .uRBtm .count {
-  width: 33%;
+  flex: 1;
   font-size: 28rpx;
   color: rgba(0, 0, 0, 0.6);
-  text-align: center;
+  text-align: left;
 }
 .personalBox .userBox .userRight .uRBtm .count .countNum {
   margin-left: 10rpx;
@@ -136,21 +136,28 @@
   margin-left: 26rpx;
 }
 .personalBox .worksList .worksBox .left .work .title {
+  max-width: 310rpx;
   font-size: 32rpx;
   font-weight: bold;
   margin-bottom: 10rpx;
 }
-.personalBox .worksList .worksBox .left .work .statistic {
+.personalBox .worksList .worksBox .left .work .statistics {
+  display: flex;
+  align-items: center;
+}
+.personalBox .worksList .worksBox .left .work .statistics .statistic {
+  margin-right: 20rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.personalBox .worksList .worksBox .left .work .statistic .playImg {
-  width: 34rpx;
-  height: 28rpx;
+.personalBox .worksList .worksBox .left .work .statistics .statistic .playImg {
+  width: 22rpx;
+  height: 22rpx;
 }
-.personalBox .worksList .worksBox .left .work .statistic .num {
-  font-size: 26rpx;
+.personalBox .worksList .worksBox .left .work .statistics .statistic .num {
+  margin-left: 4rpx;
+  font-size: 22rpx;
   color: #666666;
 }
 .personalBox .worksList .worksBox .goRead {

pages/ranking/index.js

@@ -30,9 +30,15 @@ Page({
     })
   },
   jumpIntro() {
-    console.log();
     wx.navigateTo({
       url: `/pages/rankIntro/index?type=${this.data.rankingType}`,
     })
-  }
+  },
+  jumpUserInfo({
+    currentTarget
+  }) {
+    wx.navigateTo({
+      url: `/pages/personal/index?uid=${currentTarget.dataset.uid}&type=${this.data.rankingType==4?'pk':'user'}`,
+    })
+  },
 })

pages/ranking/index.wxml

@@ -4,7 +4,7 @@
     <view class="tips2">周榜</view>
     <view class="podiumContent">
       <view class="user first">
-        <image src="/static/tj2.png" class="avatar" />
+        <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='e953c4e4607749b09ec14fd3d44b6cb6' />
         <view class="iconBox">
           <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
           <view class="num">333</view>
@@ -14,7 +14,7 @@
         </view>
       </view>
       <view class="user second">
-        <image src="/static/tj2.png" class="avatar" />
+        <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='e953c4e4607749b09ec14fd3d44b6cb6' />
         <view class="iconBox">
           <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
           <view class="num">333</view>
@@ -24,7 +24,7 @@
         </view>
       </view>
       <view class="user third">
-        <image src="/static/tj2.png" class="avatar" />
+        <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='e953c4e4607749b09ec14fd3d44b6cb6' />
         <view class="iconBox">
           <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
           <view class="num">333</view>
@@ -40,7 +40,7 @@
       <view class="row" wx:for="{{20}}" wx:key="index">
         <view class="left">
           <view class="num">4</view>
-          <image src="/static/tj2.png" class="avatar" />
+          <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='{{item.user.uid}}' />
           <view class="nickName textOver">奥克斯</view>
         </view>
         <view class="right">