bayi преди 2 години
родител
ревизия
24c0a23e82
променени са 7 файла, в които са добавени 15 реда и са изтрити 13 реда
  1. 1 1
      app.json
  2. 3 2
      components/videoPreview/index.js
  3. 8 6
      pages/pkResult/index.js
  4. 1 1
      pages/pkResult/index.wxml
  5. 1 0
      pages/reading/index.js
  6. 1 1
      pages/reading/index.wxml
  7. 0 2
      store/index.js

+ 1 - 1
app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/pkResult/index",
     "pages/index/index",
+    "pages/pkResult/index",
     "pages/score/index",
     "pages/reading/index",
     "pages/pkPage/index",

+ 3 - 2
components/videoPreview/index.js

@@ -193,13 +193,14 @@ Component({
     },
     toPkPage() {
       let videoInfo = this.data.videoInfoCopy
-      console.log(this.data.videoInfoCopy);
       if (this.properties.videoType == 'pk') {
+        console.log(videoInfo);
         this.setPkData({
           nickName: videoInfo.user.nickName || videoInfo.user.eid,
           avatar: videoInfo.user.avatar,
           score: videoInfo.userRead.score,
-          audioPath: videoInfo.userRead.audioPath
+          audioPath: videoInfo.userRead.audioPath,
+          exampleId:videoInfo.userRead.exampleId
         })
       }
       let readId = videoInfo.userRead.id

+ 8 - 6
pages/pkResult/index.js

@@ -40,19 +40,19 @@ Page({
     this.innerAudioContext = wx.createInnerAudioContext()
   },
   compareScore() {
-    let pkData = {
+    /* let pkData = {
       audioPath: "https://reader-wx.ai160.com/audio/reader/103138024.mp3",
       avatar: "wxfile://,tmp_ba795553cc21cd941badc3ce06597c245f08fd6a674fe165.jpg",
       nickName: "小舞",
       score: 96,
-    }
-    // let pkData = this.data.pkData
+    } */
+    let pkData = this.data.pkData
     let score = pkData.score
     let myResult = {
-      audioPath: this.data.readDetail.tempFilePath || 'https://reader-wx.ai160.com/reader/resource/20221228/1672193630349721.mp3',
+      audioPath: this.data.readDetail.tempFilePath,
       nickName: this.data.userInfo.nickName || this.data.userInfo.uid,
       avatar: this.data.userInfo.avatar,
-      score: this.data.readDetail.myOverall || 100
+      score: this.data.readDetail.myOverall
     }
     this.setData({
       victory: myResult.score > score ? myResult : pkData,
@@ -130,7 +130,9 @@ Page({
     })
   },
   result() {
-
+    wx.redirectTo({
+      url: `/pages/reading/index?videoId=${this.data.pkData.exampleId}&readingType=pk`,
+    })
   },
   /**
    * 生命周期函数--监听页面隐藏

+ 1 - 1
pages/pkResult/index.wxml

@@ -1,5 +1,5 @@
 <view class="pkResult">
-  <view class="title">秋天</view>
+  <view class="title">{{readDetail.title}}</view>
   <view class="time">2023-01-12 13:13</view>
   <view class="body">
     <view class="left">

+ 1 - 0
pages/reading/index.js

@@ -264,6 +264,7 @@ Page({
       scrollTop: 0
     })
   },
+  // 测试的
   pkResult() {
     wx.redirectTo({
       url: `/pages/pkResult/index`,

+ 1 - 1
pages/reading/index.wxml

@@ -72,7 +72,7 @@
     </view>
   </view>
   <view class="controller">
-    <image src="{{state?'/static/readingNow.gif':'/static/work.png'}}" class="playImg" bindtap="pkResult" />
+    <image src="{{state?'/static/readingNow.gif':'/static/work.png'}}" class="playImg" bindtap="setCountDown" />
     <view class="text">{{state?'完成录制':readingReset?'点击重录':readingType=='public'?'开始朗读':'开始挑战'}}</view>
     <uploadFile wx:if="{{readingReset}}" class="btnPosition" />
   </view>

+ 0 - 2
store/index.js

@@ -29,11 +29,9 @@ export const store = observable({
     this.userInfo = step
   }, ),
   setReadDetail: action(function (detail) {
-    console.log('store中的', detail);
     this.readDetail = detail
   }),
   setPkData: action(function (data) {
-    console.log(data);
     this.pkData = data
   })
 })