Merge branch 'fine-music-score' into dev

src/teacher/extend-plan/index.tsx

@@ -62,6 +62,7 @@ export default defineComponent({
         { name: '视频课', value: 'VIDEO_SHARE' },
         { name: '小酷Ai会员', value: 'VIP_SHARE' },
         { name: '曲谱', value: 'MUSIC_SHARE' },
+        { name: '专辑', value: 'ALBUM_SHARE' },
         { name: '商品', value: 'MALL_SHARE' },
         { name: '活动报名', value: 'ACTI_REGIST_SHARE' }
       ],
@@ -70,6 +71,7 @@ export default defineComponent({
         VIDEO_SHARE: '视频课',
         VIP_SHARE: '小酷Ai会员',
         MUSIC_SHARE: '曲谱',
+        ALBUM_SHARE: '专辑',
         MALL_SHARE: '商品',
         ACTI_REGIST_SHARE: '活动报名'
       },

src/teacher/income-consus/echarts.ts

@@ -32,6 +32,7 @@ export const lineChartOption = {
     '#D22CFF',
     '#FF3C3C',
     '#1AEE3E',
+    '#00c9ff',
     '#7c47ff'
   ],
   series: [
@@ -241,6 +242,27 @@ export const lineChartOption = {
         '0.00'
       ],
       symbol: 'circle',
+      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 } }
@@ -332,6 +354,7 @@ export const pieChartOption = {
         { name: '视频课推荐', value: '0.00' },
         { name: '商品推荐', value: '0.00' },
         { name: '乐谱推荐', value: '0.00' },
+        { name: '专辑推荐', value: '0.00' },
         { name: '活动报名', value: '0.00' }
       ],
       type: 'pie',
@@ -356,6 +379,7 @@ export const pieChartOption = {
     '#D22CFF',
     '#FF3C3C',
     '#1AEE3E',
+    '#00c9ff',
     '#7c47ff'
   ]
 }

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

@@ -89,6 +89,9 @@
   .color9 {
     background: linear-gradient(180deg, #c1a9ff 0%, #7c47ff 100%);
   }
+  .color10 {
+    background: #00c9ff;
+  }
 
   .type {
     span {
@@ -236,6 +239,9 @@
   .pie6 {
     background: #7c47ff !important;
   }
+  .pie7 {
+    background: #00c9ff !important;
+  }
   .pieTitle {
     display: inline-block;
     padding-left: 9px;

src/teacher/income-consus/index.tsx

@@ -115,6 +115,8 @@ export default defineComponent({
         mallShareRate: 0,
         musicShareAmount: 0,
         musicShareRate: 0,
+        albumShareAmount: 0,
+        albumShareRate: 0,
         actiRegistShareAmount: 0,
         actiRegistShareRate: 0
       },
@@ -158,11 +160,12 @@ export default defineComponent({
             result.musicRate,
           totalShareRate:
             result.vipShareRate +
-            result.liveShareRate +
-            result.videoShareRate +
-            result.musicShareRate +
-            result.mallShareRate +
-            result.actiRegistShareRate,
+              result.liveShareRate +
+              result.videoShareRate +
+              result.musicShareRate +
+              result.mallShareRate +
+              result.actiRegistShareRate +
+              result.albumShareRate || 0,
           totalInAmount: result.totalInAmount || 0,
           practiceAmount: result.practiceAmount || 0,
           practiceRate: result.practiceRate || 0,
@@ -182,6 +185,8 @@ export default defineComponent({
           mallShareRate: result.mallShareRate || 0,
           musicShareAmount: result.musicShareAmount || 0,
           musicShareRate: result.musicShareRate || 0,
+          albumShareAmount: result.albumShareAmount || 0,
+          albumShareRate: result.albumShareRate || 0,
           actiRegistShareAmount: result.actiRegistShareAmount || 0,
           actiRegistShareRate: result.actiRegistShareRate || 0
         }
@@ -197,6 +202,7 @@ export default defineComponent({
           videoShareAmount: [] as any,
           mallShareAmount: [] as any,
           musicShareAmount: [] as any,
+          albumShareAmount: [] as any,
           actiRegistShareAmount: [] as any
         }
         ;(result.infoList || []).forEach((item: any) => {
@@ -214,6 +220,7 @@ export default defineComponent({
           lineData.videoShareAmount.push(item.videoShareAmount)
           lineData.mallShareAmount.push(item.mallShareAmount)
           lineData.musicShareAmount.push(item.musicShareAmount)
+          lineData.albumShareAmount.push(item.albumShareAmount || 0)
           lineData.actiRegistShareAmount.push(item.actiRegistShareAmount)
         })
         // 初始化折线图
@@ -227,7 +234,8 @@ export default defineComponent({
         lineChartOption.series[6].data = lineData.videoShareAmount
         lineChartOption.series[7].data = lineData.mallShareAmount
         lineChartOption.series[8].data = lineData.musicShareAmount
-        lineChartOption.series[9].data = lineData.actiRegistShareAmount
+        lineChartOption.series[9].data = lineData.albumShareAmount
+        lineChartOption.series[10].data = lineData.actiRegistShareAmount
         // console.log(lineChartOption)
         this.myChart.clear()
         this.myChart.setOption(lineChartOption)
@@ -242,7 +250,8 @@ export default defineComponent({
         pieChartOption.series[0].data[6].value = result.videoShareAmount
         pieChartOption.series[0].data[7].value = result.mallShareAmount
         pieChartOption.series[0].data[8].value = result.musicShareAmount
-        pieChartOption.series[0].data[9].value = result.actiRegistShareAmount
+        pieChartOption.series[0].data[9].value = result.albumShareAmount
+        pieChartOption.series[0].data[10].value = result.actiRegistShareAmount
         this.myChart2.clear()
         this.myChart2.setOption(pieChartOption)
       } catch (e) {
@@ -358,6 +367,15 @@ export default defineComponent({
                 </div>
               </Col>
               <Col span={6}>
+                <i class={styles.color10}></i>
+                <div class={styles.type}>
+                  <span>专辑推荐</span>
+                  <span class={styles.price}>
+                    {moneyFormat(this.moneyInfo.musicShareAmount)}
+                  </span>
+                </div>
+              </Col>
+              <Col span={6}>
                 <i class={styles.color9}></i>
                 <div class={styles.type}>
                   <span>活动报名</span>
@@ -435,11 +453,7 @@ export default defineComponent({
               <span class={styles.pieTitle}>乐谱</span>
               <span>{this.moneyInfo.musicRate}%</span>
             </div>
-            <div>
-              <i class={styles.pie5}></i>
-              <span class={styles.pieTitle}>乐谱推荐</span>
-              <span>{this.moneyInfo.musicShareRate}%</span>
-            </div>
+
             <div>
               <i class={styles.pie6}></i>
               <span class={styles.pieTitle}>活动报名</span>
@@ -450,6 +464,16 @@ export default defineComponent({
               <span class={styles.pieTitle}>商品推荐</span>
               <span>{this.moneyInfo.mallShareRate}%</span>
             </div>
+            <div>
+              <i class={styles.pie5}></i>
+              <span class={styles.pieTitle}>乐谱推荐</span>
+              <span>{this.moneyInfo.musicShareRate}%</span>
+            </div>
+            <div>
+              <i class={styles.pie7}></i>
+              <span class={styles.pieTitle}>专辑推荐</span>
+              <span>{this.moneyInfo.mallShareRate}%</span>
+            </div>
           </div>
         </div>