开发音乐pk

components/uploadFile/index.js

@@ -109,16 +109,16 @@ Component({
             wx.setStorageSync('shareVideoId', res.id)
             let _data = this.data.readDetail
             let scoreRes = {}
-            if (_data.businessType != 2) {
-                scoreRes = await postWorksScore({
-                    userReadId: res.id,
-                    complete: _data.integrity,
-                    accuracy: _data.accuracy,
-                    speed: _data.fluency,
-                    intonation: _data.tone,
-                    score: _data.myOverall,
-                })
-            }
+            // if (_data.businessType != 2) {
+            scoreRes = await postWorksScore({
+                userReadId: res.id,
+                complete: _data.integrity,
+                accuracy: _data.accuracy,
+                speed: _data.fluency,
+                intonation: _data.tone,
+                score: _data.myOverall,
+            })
+            // }
             console.log(scoreRes, 'scoreRes');
             this.setData({
                 uploadFlag: false,

pages/pkResult/index.js

@@ -172,12 +172,14 @@ Page({
                         }
                         ctx.fillText(dName, rnamex, rnamey)
                         ctx.font = '19px PingFang';
-                        var lnumx = this.data.equal ? 100 : 100,
-                            lnumy = this.data.equal ? 150 : 140;
-                        ctx.fillText(this.data.victory.userRead.score + '分', lnumx, lnumy)
-                        var rnumx = this.data.equal ? 280 : 280,
-                            rnumy = this.data.equal ? 150 : 165;
-                        ctx.fillText(this.data.defeated.userRead.score + '分', rnumx, rnumy)
+                        if (this.data.victory.userReadExtend.businessType != 2) {
+                            var lnumx = this.data.equal ? 100 : 100,
+                                lnumy = this.data.equal ? 150 : 140;
+                            ctx.fillText(this.data.victory.userRead.score + '分', lnumx, lnumy)
+                            var rnumx = this.data.equal ? 280 : 280,
+                                rnumy = this.data.equal ? 150 : 165;
+                            ctx.fillText(this.data.defeated.userRead.score + '分', rnumx, rnumy)
+                        }
                         ctx.font = '13px PingFang';
                         var ltimex = this.data.equal ? 136 : 136,
                             ltimey = this.data.equal ? 252.5 : 239.5;

pages/pkResult/index.wxml

@@ -1,42 +1,44 @@
 <wxs src="../../utils/filter.wxs" module="filters" />
 <view class="pkResult">
-  <view class="title">{{victory.userRead.title}}</view>
-  <view class="time">{{filters.formatDate(pkRecord.gmtCreated,1)}}</view>
-  <view class="body">
-    <view class="left {{equal?'equal':''}}">
-      <image src="{{victory.user.avatar}}" class="avatar avatarL" />
-      <view class="bodyTitle textOver">{{victory.user.nickName||victory.user.eid}}</view>
-      <view class="bodyScore">{{victory.userRead.score}}分</view>
-      <image src="{{vState?'/static/work.png':'/static/play-big.png'}}" class="bodyPlay" bindtap="playAudio"
-        data-type="victory" />
-      <progress percent="{{vProgress}}" stroke-width="4" class="progress" style="margin-right:48rpx;" />
-      <view class="duration">
-        <view class="start">{{vStart}}</view>
-        <view class="end">{{vEnd}}</view>
-      </view>
+    <view class="title">{{victory.userRead.title}}</view>
+    <view class="time">{{filters.formatDate(pkRecord.gmtCreated,1)}}</view>
+    <view class="body">
+        <view class="left {{equal?'equal':''}}">
+            <image src="{{victory.user.avatar}}" class="avatar avatarL" />
+            <view class="bodyTitle textOver">{{victory.user.nickName||victory.user.eid}}</view>
+            <view class="bodyScore" wx:if="{{victory.userReadExtend.businessType!=2}}">{{victory.userRead.score}}分
+            </view>
+            <image src="{{vState?'/static/work.png':'/static/play-big.png'}}" class="bodyPlay" bindtap="playAudio"
+                data-type="victory" />
+            <progress percent="{{vProgress}}" stroke-width="4" class="progress" style="margin-right:48rpx;" />
+            <view class="duration">
+                <view class="start">{{vStart}}</view>
+                <view class="end">{{vEnd}}</view>
+            </view>
+        </view>
+        <view class="right {{equal?'equalRight':''}}">
+            <image src="{{defeated.user.avatar}}" class="avatar avatarR" />
+            <view class="bodyTitle textOver">{{defeated.user.nickName||defeated.user.eid}}</view>
+            <view class="bodyScore" wx:if="{{victory.userReadExtend.businessType!=2}}">{{defeated.userRead.score}}分
+            </view>
+            <image src="{{dState?'/static/work.png':'/static/play-big.png'}}" class="bodyPlay" bindtap="playAudio"
+                data-type="defeated" />
+            <progress percent="{{dProgress}}" stroke-width="4" class="progress" />
+            <view class="duration">
+                <view class="start">{{dStart}}</view>
+                <view class="end">{{dEnd}}</view>
+            </view>
+        </view>
     </view>
-    <view class="right {{equal?'equalRight':''}}">
-      <image src="{{defeated.user.avatar}}" class="avatar avatarR" />
-      <view class="bodyTitle textOver">{{defeated.user.nickName||defeated.user.eid}}</view>
-      <view class="bodyScore">{{defeated.userRead.score}}分</view>
-      <image src="{{dState?'/static/work.png':'/static/play-big.png'}}" class="bodyPlay" bindtap="playAudio"
-        data-type="defeated" />
-      <progress percent="{{dProgress}}" stroke-width="4" class="progress" />
-      <view class="duration">
-        <view class="start">{{dStart}}</view>
-        <view class="end">{{dEnd}}</view>
-      </view>
+    <view class="footer" wx:if="{{!isplayback}}">
+        <view class="stBtn" bindtap="result" data-type="reading">重新挑战</view>
+        <button class="resetBtn btn" open-type="share">
+            分享战绩
+        </button>
+    </view>
+    <view class="footer" wx:else>
+        <view class="stBtn" bindtap="result" data-type="wantPlay">我也要玩</view>
+        <view class="btn" bindtap="result" data-type="index">回到首页</view>
     </view>
-  </view>
-  <view class="footer" wx:if="{{!isplayback}}">
-    <view class="stBtn" bindtap="result" data-type="reading">重新挑战</view>
-    <button class="resetBtn btn" open-type="share">
-      分享战绩
-    </button>
-  </view>
-  <view class="footer" wx:else>
-    <view class="stBtn" bindtap="result" data-type="wantPlay">我也要玩</view>
-    <view class="btn" bindtap="result" data-type="index">回到首页</view>
-  </view>
 </view>
 <canvas id='share' type="2d"> </canvas>

pages/reading/index.js

@@ -384,6 +384,11 @@ Page({
                 tempFilePath: res.tempFilePath,
             });
             let detail = {
+                integrity: 80,
+                tone: 80,
+                accuracy: 80,
+                fluency: 80,
+                myOverall: 80,
                 businessType: this.data.videoInfo.userReadExtend.businessType,
                 tempFilePath: this.data.tempFilePath,
                 title: this.data.videoInfo.userRead.title,
@@ -528,13 +533,22 @@ Page({
                     "intonation": _data.tone,
                     "score": _data.myOverall
                 }, 'score', scoreRes, 'scoreRes');
-                let data = {
-                    challengerUserReadId: uploadRes.id,
-                    userReadId: this.data.pkData.id,
-                    winnerUId: this.data.pkData.score > _data.myOverall ? this.data.pkData.uid : this.data.pkData.score == _data.myOverall ? '' : wx.getStorageSync('uid')
+                let data = {}
+                if (_data.businessType != 2) {
+                    data = {
+                        challengerUserReadId: uploadRes.id,
+                        userReadId: this.data.pkData.id,
+                        winnerUId: this.data.pkData.score > _data.myOverall ? this.data.pkData.uid : this.data.pkData.score == _data.myOverall ? '' : wx.getStorageSync('uid')
+                    }
+                } else {
+                    data = {
+                        challengerUserReadId: uploadRes.id,
+                        userReadId: this.data.pkData.id,
+                        winnerUId: ''
+                    }
                 }
-                console.log('data----', this.data.pkData.score, _data.myOverall, data);
                 let result = await uploadPk(data)
+                console.log(result,'rrrr');
                 await userEvent({
                     action: 'WXPKUPLOAD',
                 })