调整

components/videoPreview/index.wxml

@@ -61,43 +61,46 @@
   <view class="workContent" wx:else>
     <view class="audioBox">
       <image src=" {{videoInfoCopy.userReadExtend.backgroundVirtualImg}}" class="audioBg" mode="aspectFill" />
-    <view class="audioPlay" bindtap="audioPlay">
-      <image src="/static/audioBg.png" class="audioPlayBg {{videoInfoCopy.userRead.id==currentId?'circle':''}}" />
-      <image src="/static/zhen.png" class="audioPlayZhen" />
-      <image src="{{videoInfoCopy.userRead.coverImg}}" class="cover {{videoInfoCopy.userRead.id==currentId?'circle':''}}"
-        mode="" />
-    </view>
-    <view class="titleBox">
-      <view class="textOver">
-        {{videoInfoCopy.userRead.title}}
+      <view class="audioPlay" bindtap="audioPlay">
+        <image src="/static/audioBg.png" class="audioPlayBg {{videoInfoCopy.userRead.id==currentId?'circle':''}}" />
+        <image src="/static/zhen.png" class="audioPlayZhen" />
+        <image src="{{videoInfoCopy.userRead.coverImg}}"
+          class="cover {{videoInfoCopy.userRead.id==currentId?'circle':''}}" mode="" />
+      </view>
+      <view class="titleBox">
+        <view class="textOver">
+          {{videoInfoCopy.userRead.title}}
+        </view>
       </view>
     </view>
   </view>
-</view>
-<view class="workFooter" wx:if="{{videoInfo.userRead.status!='CHECK'}}">
-  <button class="resetBtn mangeL-box" open-type="share" data-info='{{videoInfo}}'>
-    <image src="/static/share.png" mode="" class="icon" />
-    <view class="icon-name">分享</view>
-  </button>
-  <view class="mangeL-box" bindtap="collect">
-    <image src="{{videoInfoCopy.isFavorites ? '/static/star_colored.png' : '/static/star.png'}}" mode="" class="icon" />
-    <view class="icon-name">{{videoInfoCopy.isFavorites?'已收藏':'收藏'}}</view>
-  </view>
-  <view class="mangeL-box" bindtap="openComment">
-    <image src="/static/comment.png" mode="" class="icon" />
-    <view class="icon-name">{{filters.numFilter(videoInfoCopy.userRead.commentAmount)}}</view>
-  </view>
-  <view class="mangeL-box" bindtap="likeVideo">
-    <image src="{{videoInfoCopy.isLike ? '/static/heart_colored.png' : '/static/heart.png'}}" mode="" class="icon" />
-    <view class="icon-name">{{filters.numFilter(videoInfoCopy.userRead.likeAmount)}}</view>
+  <view class="workFooter" wx:if="{{videoInfo.userRead.status!='CHECK'}}">
+    <button class="resetBtn mangeL-box" open-type="share" data-info='{{videoInfo}}'>
+      <image src="/static/share.png" mode="" class="icon" />
+      <view class="icon-name">分享</view>
+    </button>
+    <view class="mangeL-box" bindtap="collect">
+      <image src="{{videoInfoCopy.isFavorites ? '/static/star_colored.png' : '/static/star.png'}}" mode=""
+        class="icon" />
+      <view class="icon-name">{{videoInfoCopy.isFavorites?'已收藏':'收藏'}}</view>
+    </view>
+    <view class="mangeL-box" bindtap="openComment">
+      <image src="/static/comment.png" mode="" class="icon" />
+      <view class="icon-name">{{filters.numFilter(videoInfoCopy.userRead.commentAmount)}}</view>
+    </view>
+    <view class="mangeL-box" bindtap="likeVideo">
+      <image src="{{videoInfoCopy.isLike ? '/static/heart_colored.png' : '/static/heart.png'}}" mode="" class="icon" />
+      <view class="icon-name">{{filters.numFilter(videoInfoCopy.userRead.likeAmount)}}</view>
+    </view>
   </view>
-</view>
-<view class="toReading" bindtap="toPkPage" wx:if="{{videoType=='pk'||videoType=='excellent'}}">
-  <image src="/static/reading.png" class="reading" mode="" />
-  <view class="reading-text">挑战PK</view>
-</view>
-<view class="toReading" bindtap="toPkPage" wx:if="{{videoType=='public'}}">
-  <image src="/static/reading.png" class="reading" mode="" />
-  <view class="reading-text">去朗读</view>
-</view>
+  <block wx:if="{{videoType!='my'}}">
+    <view class="toReading" bindtap="toPkPage" wx:if="{{videoInfo.userRead.type=='READ'}}">
+      <image src="/static/reading.png" class="reading" mode="" />
+      <view class="reading-text">挑战PK</view>
+    </view>
+    <view class="toReading" bindtap="toPkPage" wx:if="{{videoInfo.userRead.type=='EXAMPLE'}}">
+      <image src="/static/reading.png" class="reading" mode="" />
+      <view class="reading-text">去朗读</view>
+    </view>
+  </block>
 </view>

mixins/reachBottom.js

@@ -33,8 +33,6 @@ module.exports = Behavior({
         });
       })
       list = [...this.data.list, ...list]
-      console.log(list,
-        totalSize);
       this.setData({
         pageNo: ++this.data.pageNo,
         list,

pages/reading/index.js

@@ -95,12 +95,19 @@ Page({
     wx.setNavigationBarTitle({
       title: videoInfo.userRead.title
     })
-    let data = JSON.parse(videoInfo.userReadExtend.lessonText)
-    data = data.map((item, index) => {
-      item.time = Number(item.time)
-      item.readTime = data[index + 1] ? data[index + 1].time - item.time : ''
-      return item
-    })
+    let data
+    console.log(videoInfo);
+    if (videoInfo.userReadExtend) {
+      data = JSON.parse(videoInfo.userReadExtend.lessonText)
+      data = data.map((item, index) => {
+        item.time = Number(item.time)
+        item.readTime = data[index + 1] ? data[index + 1].time - item.time : ''
+        return item
+      })
+    } else {
+      data = videoInfo.userRead.lessonText.split('\n'),
+      console.log(data);
+    }
     this.setData({
       article: data,
       videoInfo