fix: 气球bug

package-lock.json

@@ -2885,7 +2885,7 @@
         },
         "fsevents": {
           "version": "1.2.13",
-          "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
           "optional": true,
@@ -5621,6 +5621,11 @@
       "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
+    "flicker-vue-hooks": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/flicker-vue-hooks/-/flicker-vue-hooks-1.0.10.tgz",
+      "integrity": "sha512-kwymoCA12H5Z4Y5xpkUnL8O+94UYahQzIZoWFLn/QP08arkXry2Xeh4wa6s8l9ghb/b+KASSsL2SVQRg2u5kwQ=="
+    },
     "flush-write-stream": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
@@ -5969,7 +5974,7 @@
     },
     "fsevents": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "optional": true

package.json

@@ -14,6 +14,7 @@
     "@types/qrcode": "^1.5.0",
     "axios": "^1.3.4",
     "dayjs": "^1.11.7",
+    "flicker-vue-hooks": "^1.0.10",
     "html2canvas": "^1.4.1",
     "lib-flexible": "^0.3.2",
     "normalize.css": "^8.0.1",

src/hook/appHook.ts

@@ -33,8 +33,6 @@ const getToken = () => {
 
   return new Promise( (resolve) => {
     window.returnToken = token => {
-      console.log('app返回token:', token);
-      
       useTokenStore().set(token) 
       resolve(token)
     }

src/pages/LearnPlan/views/LearnReport/index.vue

@@ -25,7 +25,8 @@
         <div class="learn-preview-data" >
           <div class="data-item"  >
             <div class="staticsc" >
-              <span>{{state.report?.totalDuration ? Math.floor( state.report?.totalDuration! / 60) : 0 }}</span>
+              <!-- 为什么要加个220呢 因为刘丰源说根据他的加权平均法算出所有视频平均的时长是220s -->
+              <span>{{state.report?.totalDuration ? Math.floor( (state.report?.totalDuration! + 220) / 60) : 0 }}</span>
               <div class="unit" >分钟</div>
             </div>
             <div class="data-item-desc" >
@@ -97,7 +98,7 @@
             style="margin-bottom: 12px;"
             :title="item.capability"
             :index="index"
-            :count="item.correctQuantity"
+            :count="item.correctQuantity - ( item.totalQuantity - item.correctQuantity)"
             v-for="(item, index) in state.report?.exerciseCardResultList"
             :key="item.capability"
           />
@@ -188,6 +189,9 @@ import { useAppRouter, useAppFunc } from '@/hook/appHook'
 import { Overlay, ActionSheet } from 'vant'
 import OpenApp from '@/components/OpenApp/index.vue'
 import { registerWxopenButton } from '@/utils/utils'
+import f from 'flicker-vue-hooks'
+
+
 
 export interface QueryParams {
   i: string,
@@ -323,6 +327,7 @@ const _getReportByUser = async () => {
   fco.src = data.report.userLearnShareAudio
   state.report = data.report
   userId.value = data.userId
+  state.shared = data.shared
 
   getQrcodeUrl()
 }

src/pages/LearnPlan/views/TPage/index.vue

@@ -19,10 +19,10 @@
     <div class="back-icon" >
       <img :src="staticImg.backIcon" alt="" @click="backAppPage" >
     </div>
-    <div class="opra-container" >
-      <div id="rive-ani" >
-        <canvas width="200" height="200"  id="rive-canvas" style="scale: 1;" ></canvas>
+    <div id="rive-ani" >
+        <canvas width="200" height="200"  id="rive-canvas"></canvas>
       </div>
+    <div class="opra-container" >
       <div class="countdown-container" >
         <div class="countdown" >{{countDown}}s</div>
         <div class="desc" >即将进入下一个环节</div>
@@ -43,6 +43,7 @@ import { useDeviceDire, useScheduler, useSchedulerOnce } from '@/hook/index'
 import { onMounted } from 'vue';
 import { useRoute } from "vue-router"
 import { Rive } from "@rive-app/canvas"
+// console.log(HOOK.);
 
 const staticImg = {
   backIcon: require('@LP/assets/back-icon.png'),
@@ -90,7 +91,6 @@ console.log(document.getElementById('rive-canvas'));
 
 const canvas = document.getElementById('rive-canvas')
 
-
 const a = new Rive({
   src: "https://res-game.luojigou.vip/qiqiu3.riv",
   canvas: canvas,
@@ -98,8 +98,6 @@ const a = new Rive({
   // stateMachines: "bumpy",
   artboard:'reqiqiu-dog',
   onLoad: () => {
-    console.log(a);
-    
     a.play('idle')
     a.resizeToCanvas()
   },
@@ -199,8 +197,7 @@ onMounted(() => {
 
 #rive-ani {
   width: 100vw;
-  // height: 300px;
-  position: absolute;
+  position: fixed;
   left: 50%;
   transform: translateX(-50%);
   top: 2%;
@@ -247,11 +244,7 @@ onMounted(() => {
     position: absolute;
     height: 1px;
     width: 100%;
-  
-  }
-  #rive-ani {
-    position: absolute;
-    top: -200px;
+    scale: 0.7;
   }
   .countdown-container {
     position: absolute;