更新优化

dist/index.html

@@ -38,9 +38,9 @@
     <script type="module" crossorigin src="./assets/index.2d9a1717.js"></script>
     <link rel="modulepreload" href="./assets/vendor.7fdfd452.js">
     <link rel="modulepreload" href="./assets/index.5a60ef99.js">
-    <link rel="stylesheet" href="./assets/index.cb2212cc.css">
     <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
-    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
+    <link rel="stylesheet" href="./assets/index.cb2212cc.css">
+    <link rel="stylesheet" href="./assets/index.5062a520.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.11b78793.js"></script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.5924a30f.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.57d96220.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.941a38e6.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.c1b1db4b.js"></script>
     <link rel="modulepreload" href="./assets/vendor.7fdfd452.js">
     <link rel="modulepreload" href="./assets/index.5a60ef99.js">
-    <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
     <link rel="stylesheet" href="./assets/index.cb2212cc.css">
-    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
+    <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
+    <link rel="stylesheet" href="./assets/index.5062a520.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.11b78793.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.744462fe.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.5924a30f.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.7c853b04.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/teacher/income-consus/index.tsx

@@ -229,6 +229,11 @@ export default defineComponent({
         pieChartOption.series[0].data[1].value = result.liveAmount
         pieChartOption.series[0].data[2].value = result.videoAmount
         pieChartOption.series[0].data[3].value = result.musicAmount
+        pieChartOption.series[0].data[4].value = result.vipShareAmount
+        pieChartOption.series[0].data[5].value = result.liveShareAmount
+        pieChartOption.series[0].data[6].value = result.videoShareAmount
+        pieChartOption.series[0].data[7].value = result.mallShareAmount
+        pieChartOption.series[0].data[7].value = result.musicShareAmount
         this.myChart2.clear()
         this.myChart2.setOption(pieChartOption)
       } catch (e) {

src/teacher/share-page/share-live/index.tsx

@@ -2,7 +2,7 @@ import CoursePlanStep from '@/business-components/course-plan-step'
 import SectionDetail from '@/business-components/section-detail'
 import UserDetail from '@/business-components/user-detail'
 import ColSticky from '@/components/col-sticky'
-import { postMessage } from '@/helpers/native-message'
+import { postMessage, promisefiyPostMessage } from '@/helpers/native-message'
 import request from '@/helpers/request'
 import { browser } from '@/helpers/utils'
 import { state } from '@/state'
@@ -77,36 +77,46 @@ export default defineComponent({
       return tempArr || []
     }
   },
-  async mounted() {
-    try {
-      if (browser().isApp) {
-        if (state.platformType === 'STUDENT') {
-          // 自动跳转到学生端视频课详情购买页
-          // window.location.replace(
-          // `${location.origin}/student/#/liveDetail??${qs.stringify(
-          //   this.$route.query
-          // )}`
-          // )
-
-          this.locationReplace(
+  created() {
+    if (browser().isApp) {
+      if (state.platformType === 'STUDENT') {
+        // 自动跳转到学生端视频课详情购买页
+        if (browser().ios) {
+          window.location.replace(
             `${location.origin}/student/#/liveDetail??${qs.stringify(
               this.$route.query
             )}`
           )
-        } else if (state.platformType === 'TEACHER') {
-          Dialog.alert({
-            title: '提示',
-            message: '请使用酷乐秀学生端扫码打开',
-            confirmButtonColor: '#2dc7aa'
-          }).then(() => {
-            postMessage({ api: 'back' })
+        } else {
+          postMessage({
+            api: 'openWebView',
+            content: {
+              url: `${location.origin}/student/#/liveDetail??${qs.stringify(
+                this.$route.query
+              )}`,
+              orientation: 1,
+              isHideTitle: false
+            }
           })
+
+          postMessage({ api: 'back' })
         }
-      } else {
-        // 如果不在app里面则不需要唤起操作
-        this.reCall()
+      } else if (state.platformType === 'TEACHER') {
+        Dialog.alert({
+          title: '提示',
+          message: '请使用酷乐秀学生端扫码打开',
+          confirmButtonColor: '#2dc7aa'
+        }).then(() => {
+          postMessage({ api: 'back' })
+        })
       }
-
+    } else {
+      // 如果不在app里面则不需要唤起操作
+      this.reCall()
+    }
+  },
+  async mounted() {
+    try {
       const res = await request.post('/api-teacher/open/liveShareProfit', {
         data: {
           bizId: this.groupId,
@@ -120,7 +130,6 @@ export default defineComponent({
   },
   methods: {
     locationReplace(url: string) {
-      // alert(url)
       if (history.replaceState) {
         history.replaceState(null, document.title, url)
         window.location.reload()

src/teacher/share-page/share-mall/index.tsx

@@ -47,8 +47,7 @@ export default defineComponent({
       return price
     }
   },
-  mounted() {
-    this.getProduct()
+  created() {
     if (browser().isApp) {
       if (state.platformType === 'STUDENT') {
         const { query } = this.$route as any
@@ -60,12 +59,28 @@ export default defineComponent({
           query
         )
         // 自动跳转到学生端商品详情
-        // window.location.replace(
+
+        // this.locationReplace(
         //   `${location.origin}/student/#/goodsDetail?${qs.stringify(params)}`
         // )
-        this.locationReplace(
-          `${location.origin}/student/#/goodsDetail?${qs.stringify(params)}`
-        )
+        if (browser().ios) {
+          window.location.replace(
+            `${location.origin}/student/#/goodsDetail?${qs.stringify(params)}`
+          )
+        } else {
+          postMessage({
+            api: 'openWebView',
+            content: {
+              url: `${location.origin}/student/#/goodsDetail?${qs.stringify(
+                params
+              )}`,
+              orientation: 1,
+              isHideTitle: false
+            }
+          })
+
+          postMessage({ api: 'back' })
+        }
       } else if (state.platformType === 'TEACHER') {
         Dialog.alert({
           title: '提示',
@@ -77,12 +92,15 @@ export default defineComponent({
     } else {
       const { origin } = location
       const query = this.$route.query
-      let str =
+      const str =
         origin +
         `/student/#/goodsDetail?id=${query.bizId}&promoterId=${query.userId}`
       shareCall(str, {})
     }
   },
+  mounted() {
+    this.getProduct()
+  },
   methods: {
     locationReplace(url: string) {
       // alert(url)

src/teacher/share-page/share-video/index.tsx

@@ -38,37 +38,58 @@ export default defineComponent({
       wxStatus: false
     }
   },
-  async mounted() {
-    try {
-      if (browser().isApp) {
-        if (state.platformType === 'STUDENT') {
-          // 自动跳转到学生端视频课详情购买页
-          // window.location.replace(
-          //   `${location.origin}/student/#/videoDetail?${qs.stringify(
-          //     this.$route.query
-          //   )}`
-          // )
-          // 为了处理andoird webview的跳转问题
-          this.locationReplace(
+  created() {
+    if (browser().isApp) {
+      if (state.platformType === 'STUDENT') {
+        // 自动跳转到学生端视频课详情购买页
+        window.location.replace(
+          `${location.origin}/student/#/videoDetail?${qs.stringify(
+            this.$route.query
+          )}`
+        )
+        // 为了处理andoird webview的跳转问题
+        if (browser().ios) {
+          window.location.replace(
             `${location.origin}/student/#/videoDetail?${qs.stringify(
               this.$route.query
             )}`
           )
-          return
-        } else if (state.platformType === 'TEACHER') {
-          Dialog.alert({
-            title: '提示',
-            message: '请使用酷乐秀学生端扫码打开',
-            confirmButtonColor: '#2dc7aa'
-          }).then(() => {
-            postMessage({ api: 'back' })
+        } else {
+          postMessage({
+            api: 'openWebView',
+            content: {
+              url: `${location.origin}/student/#/videoDetail?${qs.stringify(
+                this.$route.query
+              )}`,
+              orientation: 1,
+              isHideTitle: false
+            }
           })
+
+          postMessage({ api: 'back' })
         }
-      } else {
-        // 如果不在app里面则不需要唤起操作
-        this.reCall()
+        // this.locationReplace(
+        //   `${location.origin}/student/#/videoDetail?${qs.stringify(
+        //     this.$route.query
+        //   )}`
+        // )
+        return
+      } else if (state.platformType === 'TEACHER') {
+        Dialog.alert({
+          title: '提示',
+          message: '请使用酷乐秀学生端扫码打开',
+          confirmButtonColor: '#2dc7aa'
+        }).then(() => {
+          postMessage({ api: 'back' })
+        })
       }
-
+    } else {
+      // 如果不在app里面则不需要唤起操作
+      this.reCall()
+    }
+  },
+  async mounted() {
+    try {
       const res = await request.post(`/api-teacher/open/videoShareProfit`, {
         data: {
           bizId: this.params.videoLessonGroupId,