开发联调挑战记录

pages/index/index.js

@@ -36,22 +36,15 @@ Page({
         selected: 1
       })
     }
-    let uid = wx.getStorageSync('uid')
-    if (uid) {
-      getApp().callBack = (res) => {
-        this.getLocUserInfo()
-        this.resetData()
-      }
+    this.getLocUserInfo()
+    if (Object.keys(this.data.userInfo).length > 0) {
+      this.resetData()
     } else {
       getApp().callBack = (res) => {
         this.getLocUserInfo()
         this.resetData()
       }
     }
-    /*    getApp().callBack = (res) => {
-         this.getLocUserInfo()
-         this.resetData()
-       } */
     let {
       desktopTips
     } = app.globalData
@@ -62,7 +55,6 @@ Page({
         })
       }, 6000)
     }
-
   },
   onUnload() {
     this.storeBindings.destroyStoreBindings()

pages/match/index.js

@@ -65,7 +65,6 @@ Page({
   },
   async getSelfReadRanking() {
     let res = await getSelfReadRanking()
-    console.log(res);
     this.setData({
       list: res
     })

pages/pkPage/index.js

@@ -1,5 +1,4 @@
 import behavior from '~/mixins/video'
-import reachBottom from '~/mixins/reachBottom'
 import share from '~/mixins/share'
 import {
   getreadInfo
@@ -8,10 +7,11 @@ import {
   getPkRecord
 } from '~/api/works'
 Page({
-  behaviors: [behavior, share, reachBottom],
+  behaviors: [behavior, share, ],
   data: {
     videoInfo: {},
-    videoId: ''
+    videoId: '',
+    recordList: []
   },
   /**
    * 生命周期函数--监听页面加载
@@ -23,7 +23,7 @@ Page({
       videoId
     })
     this.getreadInfo(videoId)
-    this.resetData()
+    this.getPkRecord()
   },
   async getreadInfo(videoId) {
     let videoInfo = await getreadInfo(videoId)
@@ -34,10 +34,21 @@ Page({
       videoInfo
     })
   },
-  loadMore() {
-    this.getData(getPkRecord, {
+  async getPkRecord() {
+    let recordList = await getPkRecord({
       userReadId: this.data.videoId
     })
+    this.setData({
+      recordList
+    })
+    console.log(recordList);
+  },
+  jumpUserInfo({
+    currentTarget
+  }) {
+    wx.navigateTo({
+      url: `/pages/personal/index?uid=${currentTarget.dataset.uid}&type=user`,
+    })
   },
   onHide() {
     this.setData({

pages/pkPage/index.less

@@ -1,93 +1,91 @@
 .pkBox {
-    height: 100vh;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+
+  .pkRecord {
+    flex: 1;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
+    margin-top: 20rpx;
 
-    .pkRecord {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-        margin-top: 20rpx;
-
-        .title {
-            position: relative;
-            padding: 0px 60rpx;
-            font-size: 32rpx;
-        }
+    .title {
+      position: relative;
+      padding: 0px 60rpx;
+      font-size: 32rpx;
+    }
 
-        .title::before {
-            position: absolute;
-            left: 30rpx;
-            top: 4rpx;
-            width: 10rpx;
-            height: 90%;
-            background-color: #4CC4FF;
-            content: '';
-            border-radius: 50rpx;
-        }
+    .title::before {
+      position: absolute;
+      left: 30rpx;
+      top: 4rpx;
+      width: 10rpx;
+      height: 90%;
+      background-color: #4CC4FF;
+      content: '';
+      border-radius: 50rpx;
+    }
 
-        .scrollBox {
-            height: 100%;
-            margin-top: 20rpx;
-            padding: 0rpx 26rpx 60rpx;
-            box-sizing: border-box;
-            border-top-left-radius: 20rpx;
-            border-top-right-radius: 20rpx;
-            background-color: white;
+    .scrollBox {
+      height: 100%;
+      margin-top: 20rpx;
+      padding: 0rpx 26rpx 60rpx;
+      box-sizing: border-box;
+      border-top-left-radius: 20rpx;
+      border-top-right-radius: 20rpx;
+      background-color: white;
 
-            .record {
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                padding: 32rpx 0rpx;
-                border-bottom: 2rpx solid #DDDDDD;
+      .record {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 32rpx 0rpx;
+        border-bottom: 2rpx solid #DDDDDD;
 
-                .record-left {
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
+        .record-left {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
 
-                    .rl-avatar {
-                        .avatar {
-                            width: 64rpx;
-                            height: 64rpx;
-                            border-radius: 50%;
-                            background-color: #e4e1e1;
-                        }
-                    }
+          .avatar {
+            width: 64rpx;
+            height: 64rpx;
+            border-radius: 50%;
+            background-color: #e4e1e1;
+          }
 
-                    .rl-info {
-                        margin-left: 20rpx;
+          .rl-info {
+            margin-left: 20rpx;
 
-                        .nickName {
-                            font-size: 30rpx;
-                        }
+            .nickName {
+              font-size: 30rpx;
+            }
 
-                        .time {
-                            margin-top: 6rpx;
-                            font-size: 20rpx;
-                        }
-                    }
-                }
+            .time {
+              margin-top: 6rpx;
+              font-size: 20rpx;
+            }
+          }
+        }
 
-                .record-right {
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
+        .record-right {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
 
-                    .score {
-                        font-size: 34rpx;
-                        color: #30C866;
-                    }
+          .score {
+            font-size: 34rpx;
+            color: #30C866;
+          }
 
-                    .play {
-                        margin: 0rpx 10rpx 0rpx 26rpx;
-                        width: 40rpx;
-                        height: 36rpx;
-                    }
-                }
-            }
+          .play {
+            margin: 0rpx 10rpx 0rpx 26rpx;
+            width: 40rpx;
+            height: 40rpx;
+          }
         }
+      }
     }
+  }
 }

pages/pkPage/index.wxml

@@ -1,3 +1,4 @@
+<wxs src="../../utils/filter.wxs" module="filters" />
 <view class="pkBox">
   <videoPreview videoInfo="{{videoInfo}}" currentId="{{currentId}}" data-id="{{videoInfo.userRead.id}}"
     bind:playVideo="playVideo" bind:playAudio="playAudio" data-audio="{{videoInfo.userRead.audioPath}}"
@@ -7,19 +8,17 @@
     <view class="title">挑战记录</view>
     <scroll-view scroll-y="true" class="scrollBox" enhanced="true" show-scrollbar="{{false}}"
       bindscrolltolower='loadMore'>
-      <view class="record" wx:for="{{20}}" wx:key="index">
+      <view class="record" wx:for="{{recordList}}" wx:key="id">
         <view class="record-left">
-          <view class="rl-avatar">
-            <image src="/static/contact.png" mode="" class="avatar" />
-          </view>
+          <image src="{{item.user.avatar}}" class="avatar" bindtap="jumpUserInfo" data-uid='{{item.user.uid}}' />
           <view class="rl-info">
-            <view class="nickName">叮当猫</view>
-            <view class="time">2023-02-12 13:13</view>
+            <view class="nickName">{{item.user.nickName||item.user.eid}}</view>
+            <view class="time">{{filters.formatDate(item.userRead.gmtCreated,1)}}</view>
           </view>
         </view>
         <view class="record-right">
           <view class="score">
-            96分
+            {{item.userRead.score}}分
           </view>
           <image src="/static/play.png" class="play" mode="" />
         </view>

pages/pkPage/index.wxss

@@ -46,7 +46,7 @@
   align-items: center;
   justify-content: space-between;
 }
-.pkBox .pkRecord .scrollBox .record .record-left .rl-avatar .avatar {
+.pkBox .pkRecord .scrollBox .record .record-left .avatar {
   width: 64rpx;
   height: 64rpx;
   border-radius: 50%;
@@ -74,5 +74,5 @@
 .pkBox .pkRecord .scrollBox .record .record-right .play {
   margin: 0rpx 10rpx 0rpx 26rpx;
   width: 40rpx;
-  height: 36rpx;
+  height: 40rpx;
 }

pages/score/index.js

@@ -18,7 +18,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    console.log(options);
     this.storeBindings = createStoreBindings(this, {
       store,
       fields: {
@@ -43,7 +42,6 @@ Page({
   },
   creatShare() {
     let video = this.data.readDetail
-    console.log(video);
     return new Promise((resolve, reject) => {
       let context = wx.createSelectorQuery();
       context

utils/filter.wxs

@@ -1,64 +1,64 @@
 var formatNumber = function (n) {
-    n = n.toString()
-    return n[1] ? n : '0' + n
+  n = n.toString()
+  return n[1] ? n : '0' + n
 }
 /**
  * 将时间戳(1570550400)格式转为 yyyy-MM-dd格式
  */
 //时间戳转时间
 function formatDate(time, flag) {
-    if (!time) {
-        return
-    }
-    var time = time * 1
-    var t = getDate(time);
-    var tf = function (i) {
-        return (i < 10 ? '0' : '') + i
-    };
-    var year = t.getFullYear();
-    var month = tf(t.getMonth() + 1);
-    var day = tf(t.getDate());
-    var hour = tf(t.getHours());
-    var minute = tf(t.getMinutes());
-    if (flag == 1) {
-        return month + '月' + day + '日' + ' ' + hour + ':' + minute;
-    } else if (flag == 2) {
-        return year + '.' + month + '.' + day
-    } else if (flag == 3) {
-        return month + '-' + day + ' ' + hour + ':' + minute;
-    } else if (flag == 4) {
-        return year + '年' + month + '月' + day + '日';
-    } else if (flag == 5) {
-        return day.toString().substring(1, 2)
-    } else if (flag == 6) {
-        return month + '.' + day;
-    }
+  if (!time) {
+    return
+  }
+  var time = time * 1
+  var t = getDate(time);
+  var tf = function (i) {
+    return (i < 10 ? '0' : '') + i
+  };
+  var year = t.getFullYear();
+  var month = tf(t.getMonth() + 1);
+  var day = tf(t.getDate());
+  var hour = tf(t.getHours());
+  var minute = tf(t.getMinutes());
+  if (flag == 1) {
+    return year + '-' + month + '-' + day + '' + ' ' + hour + ':' + minute;
+  } else if (flag == 2) {
+    return year + '.' + month + '.' + day
+  } else if (flag == 3) {
+    return month + '-' + day + ' ' + hour + ':' + minute;
+  } else if (flag == 4) {
+    return year + '年' + month + '月' + day + '日';
+  } else if (flag == 5) {
+    return day.toString().substring(1, 2)
+  } else if (flag == 6) {
+    return month + '.' + day;
+  }
 }
 
 function gradeFilter(grade) {
-    if (!grade) {
-        return '暂无'
-    }
-    var gradeObj = {
-      "PRIMARY_FIRST_GRADE": "一年级",
-      "PRIMARY_SECOND_GRADE": "二年级",
-      "PRIMARY_THREE_GRADE": "三年级",
-      "PRIMARY_SENIOR_GRADE": "四年级",
-      "PRIMARY_FIVE_GRADE":"五年级",
-      "PRIMARY_SIX_GRADE":"六年级",
-      "PRESCHOOL": "学前班",
-    }
-    return gradeObj[grade]
+  if (!grade) {
+    return '暂无'
+  }
+  var gradeObj = {
+    "PRIMARY_FIRST_GRADE": "一年级",
+    "PRIMARY_SECOND_GRADE": "二年级",
+    "PRIMARY_THREE_GRADE": "三年级",
+    "PRIMARY_SENIOR_GRADE": "四年级",
+    "PRIMARY_FIVE_GRADE": "五年级",
+    "PRIMARY_SIX_GRADE": "六年级",
+    "PRESCHOOL": "学前班",
+  }
+  return gradeObj[grade]
 }
 // 数字满万补w
 function numFilter(num) {
-    if (!num || num < 10000) {
-        return num
-    }
-    return Math.floor(num / 100) / 100 + 'w'
+  if (!num || num < 10000) {
+    return num
+  }
+  return Math.floor(num / 100) / 100 + 'w'
 }
 module.exports = {
-    formatDate: formatDate,
-    gradeFilter: gradeFilter,
-    numFilter: numFilter
+  formatDate: formatDate,
+  gradeFilter: gradeFilter,
+  numFilter: numFilter
 }