更新打包

dist/index.html

@@ -35,12 +35,12 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/index.6128cbfe.js"></script>
+    <script type="module" crossorigin src="./assets/index.d27812dd.js"></script>
     <link rel="modulepreload" href="./assets/vendor.75c233d7.js">
     <link rel="modulepreload" href="./assets/index.5fbd8f08.js">
     <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
     <link rel="stylesheet" href="./assets/index.0475a194.css">
-    <link rel="stylesheet" href="./assets/index.5062a520.css">
+    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
 
@@ -49,7 +49,7 @@
     
     <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f282cbd3.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.bf17198b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.1f0f96f6.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.59f5bb4d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

dist/teacher.html

@@ -35,12 +35,12 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/teacher.0e786ddc.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.6e20597a.js"></script>
     <link rel="modulepreload" href="./assets/vendor.75c233d7.js">
     <link rel="modulepreload" href="./assets/index.5fbd8f08.js">
     <link rel="stylesheet" href="./assets/index.0475a194.css">
     <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
-    <link rel="stylesheet" href="./assets/index.5062a520.css">
+    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
 
@@ -48,7 +48,7 @@
     <div id="app"></div>
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f282cbd3.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.f480bfcb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.1f0f96f6.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.413f6e82.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/components/col-upload-video/index.module.less

@@ -9,7 +9,7 @@
     position: absolute;
     top: 8px;
     right: 10px;
-    z-index: 99;
+    z-index: 99999;
     font-size: 16px;
     background-color: #333;
     color: #fff;

src/student/teacher-dependent/model/teacher-header.module.less

@@ -110,7 +110,7 @@
 }
 
 .iconVip {
-  height: 15px;
+  width: 34px !important;
   margin-right: 5px;
 }
 

src/teacher/income-consus/echarts.ts

@@ -28,7 +28,8 @@ export const lineChartOption = {
     '#BE7E2E',
     '#1C96DD',
     '#D22CFF',
-    '#FF3C3C'
+    '#FF3C3C',
+    '#c0dcff'
   ],
   series: [
     {
@@ -198,6 +199,27 @@ export const lineChartOption = {
       name: '商品推荐',
       type: 'line',
       emphasis: { lineStyle: { width: 1 } }
+    },
+    {
+      lineStyle: { width: 1 },
+      data: [
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00',
+        '0.00'
+      ],
+      symbol: 'circle',
+      name: '乐谱推荐',
+      type: 'line',
+      emphasis: { lineStyle: { width: 1 } }
     }
   ],
   title: { show: false },
@@ -241,7 +263,8 @@ export const pieChartOption = {
         { name: '小酷Ai推广', value: '0.00' },
         { name: '直播课推荐', value: '0.00' },
         { name: '视频课推荐', value: '0.00' },
-        { name: '商品推荐', value: '0.00' }
+        { name: '商品推荐', value: '0.00' },
+        { name: '乐谱推荐', value: '0.00' }
       ],
       type: 'pie',
       radius: ['50%', '80%']
@@ -263,6 +286,7 @@ export const pieChartOption = {
     '#BE7E2E',
     '#1C96DD',
     '#D22CFF',
-    '#FF3C3C'
+    '#FF3C3C',
+    '#c0dcff'
   ]
 }

src/teacher/income-consus/index.module.less

@@ -83,6 +83,9 @@
   .color7 {
     background: linear-gradient(180deg, #ff6f6f 0%, #ff3c3c 100%);
   }
+  .color8 {
+    background: linear-gradient(180deg, #baffe7 0%, #c0dcff 100%);
+  }
 
   .type {
     span {
@@ -139,7 +142,7 @@
 }
 
 .rateAll {
-  font-size: 14px;
+  font-size: 12px;
   color: #666;
   line-height: 1;
   display: flex;
@@ -159,7 +162,7 @@
   }
 
   .rate {
-    padding-left: 8px;
+    padding-left: 4px;
     font-size: 14px;
     font-weight: 600;
     color: #333333;
@@ -219,6 +222,9 @@
   .pie4 {
     background: #ff3c3c;
   }
+  .pie5 {
+    background: #c0dcff;
+  }
   .pieTitle {
     display: inline-block;
     padding-left: 9px;

src/teacher/income-consus/index.tsx

@@ -94,6 +94,8 @@ export default defineComponent({
   data() {
     return {
       moneyInfo: {
+        totalSingleRate: 0,
+        totalShareRate: 0,
         totalInAmount: 0,
         practiceAmount: 0,
         practiceRate: 0,
@@ -102,7 +104,17 @@ export default defineComponent({
         videoAmount: 0,
         videoRate: 0,
         musicAmount: 0,
-        musicRate: 0
+        musicRate: 0,
+        vipShareAmount: 0,
+        vipShareRate: 0,
+        liveShareAmount: 0,
+        liveShareRate: 0,
+        videoShareAmount: 0,
+        videoShareRate: 0,
+        mallShareAmount: 0,
+        mallShareRate: 0,
+        musicShareAmount: 0,
+        musicShareRate: 0
       },
       params: {
         timeType: 'YEAR' as 'YEAR' | 'MONTH',
@@ -137,6 +149,17 @@ export default defineComponent({
         const result = res.data || {}
 
         this.moneyInfo = {
+          totalSingleRate:
+            result.practiceRate +
+            result.liveRate +
+            result.videoRate +
+            result.musicRate,
+          totalShareRate:
+            result.vipShareRate +
+            result.liveShareRate +
+            result.videoShareRate +
+            result.musicShareRate +
+            result.mallShareRate,
           totalInAmount: result.totalInAmount || 0,
           practiceAmount: result.practiceAmount || 0,
           practiceRate: result.practiceRate || 0,
@@ -145,7 +168,17 @@ export default defineComponent({
           videoAmount: result.videoAmount || 0,
           videoRate: result.videoRate || 0,
           musicAmount: result.musicAmount || 0,
-          musicRate: result.musicRate || 0
+          musicRate: result.musicRate || 0,
+          vipShareAmount: result.vipShareAmount || 0,
+          vipShareRate: result.vipShareRate || 0,
+          liveShareAmount: result.liveShareAmount || 0,
+          liveShareRate: result.liveShareRate || 0,
+          videoShareAmount: result.videoShareAmount || 0,
+          videoShareRate: result.videoShareRate || 0,
+          mallShareAmount: result.mallShareAmount || 0,
+          mallShareRate: result.mallShareRate || 0,
+          musicShareAmount: result.musicShareAmount || 0,
+          musicShareRate: result.musicShareRate || 0
         }
         // 处理折线图数据
         const lineData = {
@@ -153,7 +186,12 @@ export default defineComponent({
           practiceAmount: [] as any,
           liveAmount: [] as any,
           videoAmount: [] as any,
-          musicAmount: [] as any
+          musicAmount: [] as any,
+          vipShareAmount: [] as any,
+          liveShareAmount: [] as any,
+          videoShareAmount: [] as any,
+          mallShareAmount: [] as any,
+          musicShareAmount: [] as any
         }
         ;(result.infoList || []).forEach((item: any) => {
           if (params.timeType === 'YEAR') {
@@ -165,6 +203,11 @@ export default defineComponent({
           lineData.liveAmount.push(item.liveAmount)
           lineData.videoAmount.push(item.videoAmount)
           lineData.musicAmount.push(item.musicAmount)
+          lineData.vipShareAmount.push(item.vipShareAmount) // 小酷Ai
+          lineData.liveShareAmount.push(item.liveShareAmount)
+          lineData.videoShareAmount.push(item.videoShareAmount)
+          lineData.mallShareAmount.push(item.mallShareAmount)
+          lineData.musicShareAmount.push(item.musicShareAmount)
         })
         // 初始化折线图
         lineChartOption.xAxis.data = lineData.xAxis
@@ -172,6 +215,11 @@ export default defineComponent({
         lineChartOption.series[1].data = lineData.liveAmount
         lineChartOption.series[2].data = lineData.videoAmount
         lineChartOption.series[3].data = lineData.musicAmount
+        lineChartOption.series[4].data = lineData.vipShareAmount
+        lineChartOption.series[5].data = lineData.liveShareAmount
+        lineChartOption.series[6].data = lineData.videoShareAmount
+        lineChartOption.series[7].data = lineData.mallShareAmount
+        lineChartOption.series[8].data = lineData.musicShareAmount
         // console.log(lineChartOption)
         this.myChart.clear()
         this.myChart.setOption(lineChartOption)
@@ -214,7 +262,7 @@ export default defineComponent({
 
           <div class={styles.section}>
             <Row class={styles.numberCount}>
-              <Col span={6}>
+              <Col span={7}>
                 <i></i>
                 <div class={styles.type}>
                   <span>陪练课</span>
@@ -223,7 +271,7 @@ export default defineComponent({
                   </span>
                 </div>
               </Col>
-              <Col span={6}>
+              <Col span={7}>
                 <i class={styles.color1}></i>
                 <div class={styles.type}>
                   <span>直播课</span>
@@ -232,7 +280,7 @@ export default defineComponent({
                   </span>
                 </div>
               </Col>
-              <Col span={6}>
+              <Col span={7}>
                 <i class={styles.color2}></i>
                 <div class={styles.type}>
                   <span>视频课</span>
@@ -241,7 +289,7 @@ export default defineComponent({
                   </span>
                 </div>
               </Col>
-              <Col span={6}>
+              <Col span={7}>
                 <i class={styles.color3}></i>
                 <div class={styles.type}>
                   <span>乐谱</span>
@@ -250,42 +298,48 @@ export default defineComponent({
                   </span>
                 </div>
               </Col>
-            </Row>
-
-            <Row class={styles.numberCount} style={{ paddingTop: '0' }}>
-              <Col span={6}>
+              <Col span={7}>
                 <i class={styles.color4}></i>
                 <div class={styles.type}>
                   <span>小酷Ai推广</span>
                   <span class={styles.price}>
-                    {moneyFormat(this.moneyInfo.practiceAmount)}
+                    {moneyFormat(this.moneyInfo.vipShareAmount)}
                   </span>
                 </div>
               </Col>
-              <Col span={6}>
+              <Col span={7}>
                 <i class={styles.color5}></i>
                 <div class={styles.type}>
                   <span>直播课推荐</span>
                   <span class={styles.price}>
-                    {moneyFormat(this.moneyInfo.liveAmount)}
+                    {moneyFormat(this.moneyInfo.liveShareAmount)}
                   </span>
                 </div>
               </Col>
-              <Col span={6}>
+              <Col span={7}>
                 <i class={styles.color6}></i>
                 <div class={styles.type}>
                   <span>视频课推荐</span>
                   <span class={styles.price}>
-                    {moneyFormat(this.moneyInfo.videoAmount)}
+                    {moneyFormat(this.moneyInfo.videoShareAmount)}
                   </span>
                 </div>
               </Col>
-              <Col span={6}>
+              <Col span={7}>
                 <i class={styles.color7}></i>
                 <div class={styles.type}>
                   <span>商品推荐</span>
                   <span class={styles.price}>
-                    {moneyFormat(this.moneyInfo.musicAmount)}
+                    {moneyFormat(this.moneyInfo.mallShareAmount)}
+                  </span>
+                </div>
+              </Col>
+              <Col span={7}>
+                <i class={styles.color8}></i>
+                <div class={styles.type}>
+                  <span>乐谱推荐</span>
+                  <span class={styles.price}>
+                    {moneyFormat(this.moneyInfo.musicShareAmount)}
                   </span>
                 </div>
               </Col>
@@ -305,12 +359,16 @@ export default defineComponent({
               <div>
                 <img src={getAssetsHomeFile('icon_user.png')} />
                 <span>个人收入总占比</span>
-                <span class={styles.rate}>80%</span>
+                <span class={styles.rate}>
+                  {this.moneyInfo.totalSingleRate}%
+                </span>
               </div>
               <div>
                 <img src={getAssetsHomeFile('icon_fly.png')} />
                 <span>推广收益总占比</span>
-                <span class={styles.rate}>80%</span>
+                <span class={styles.rate}>
+                  {this.moneyInfo.totalShareRate}%
+                </span>
               </div>
             </div>
           </div>
@@ -324,7 +382,7 @@ export default defineComponent({
             <div>
               <i class={styles.pie1}></i>
               <span class={styles.pieTitle}>小酷Ai推广</span>
-              <span>{this.moneyInfo.practiceRate}%</span>
+              <span>{this.moneyInfo.vipShareRate}%</span>
             </div>
 
             <div>
@@ -335,7 +393,7 @@ export default defineComponent({
             <div>
               <i class={styles.pie2}></i>
               <span class={styles.pieTitle}>直播课推荐</span>
-              <span>{this.moneyInfo.practiceRate}%</span>
+              <span>{this.moneyInfo.liveShareRate}%</span>
             </div>
 
             <div>
@@ -346,7 +404,7 @@ export default defineComponent({
             <div>
               <i class={styles.pie3}></i>
               <span class={styles.pieTitle}>视频课推荐</span>
-              <span>{this.moneyInfo.practiceRate}%</span>
+              <span>{this.moneyInfo.videoShareRate}%</span>
             </div>
 
             <div>
@@ -355,9 +413,15 @@ export default defineComponent({
               <span>{this.moneyInfo.musicRate}%</span>
             </div>
             <div>
+              <i class={styles.pie5}></i>
+              <span class={styles.pieTitle}>乐谱推荐</span>
+              <span>{this.moneyInfo.musicShareRate}%</span>
+            </div>
+            <div></div>
+            <div>
               <i class={styles.pie4}></i>
               <span class={styles.pieTitle}>商品推荐</span>
-              <span>{this.moneyInfo.practiceRate}%</span>
+              <span>{this.moneyInfo.mallShareRate}%</span>
             </div>
           </div>
         </div>

src/teacher/video-class/video-detail.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
       this.detailList = result.detailList || []
 
       // shareVideo?recomUserId=56&groupId=124
-      this.shareUrl = `${location.origin}/teacher.html#/shareVideo?recomUserId=${state.user.data?.userId}&groupId=${this.params.videoLessonGroupId}`
+      this.shareUrl = `${location.origin}/teacher#/shareVideo?recomUserId=${state.user.data?.userId}&groupId=${this.params.videoLessonGroupId}`
 
       this.getList()
     } catch (e) {