Merge branch 'liu-EventTracking' into dev

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

@@ -82,10 +82,12 @@ export default defineComponent({
     if (browser().isApp) {
       if (state.platformType === 'STUDENT') {
         // 自动跳转到学生端视频课详情购买页
+        const query = this.$route.query
+        query.recomUserId = query.userType && query.userType == 'STUDENT' ? '' : query.recomUserId
         if (browser().ios) {
           window.location.replace(
             `${location.origin}/student/#/liveDetail??${qs.stringify(
-              this.$route.query
+              query
             )}`
           )
         } else {
@@ -93,7 +95,7 @@ export default defineComponent({
             api: 'openWebView',
             content: {
               url: `${location.origin}/student/#/liveDetail??${qs.stringify(
-                this.$route.query
+                query
               )}`,
               orientation: 1,
               isHideTitle: false

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

@@ -61,11 +61,8 @@ export default defineComponent({
           },
           query
         )
+        params.promoterId = query.userType && query.userType == 'STUDENT' ? '' : params.promoterId
         // 自动跳转到学生端商品详情
-
-        // this.locationReplace(
-        //   `${location.origin}/student/#/goodsDetail?${qs.stringify(params)}`
-        // )
         if (browser().ios) {
           window.location.replace(
             `${location.origin}/student/#/goodsDetail?${qs.stringify(params)}`

src/teacher/share-page/share-music-sheet/index.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
         url: location.origin + '/accompany',
         query: {
           id: this.id,
-          recomUserId: this.recomUserId,
+          recomUserId: this.$route.query.userType && this.$route.query.userType == 'STUDENT' ? '' : this.recomUserId,
           activityId: this.activityId,
           discounts: this.discounts,
           client: browserInfo.isTeacher ? 'teacher' : 'student',

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

@@ -41,17 +41,14 @@ export default defineComponent({
   created() {
     if (browser().isApp) {
       if (state.platformType === 'STUDENT') {
+        const query = this.$route.query
+        query.recomUserId = query.userType && query.userType == 'STUDENT' ? '' : query.recomUserId
         // 自动跳转到学生端视频课详情购买页
-        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
+              query
             )}`
           )
         } else {
@@ -59,7 +56,7 @@ export default defineComponent({
             api: 'openWebView',
             content: {
               url: `${location.origin}/student/#/videoDetail?${qs.stringify(
-                this.$route.query
+                query
               )}`,
               orientation: 1,
               isHideTitle: false
@@ -68,11 +65,6 @@ export default defineComponent({
 
           postMessage({ api: 'back' })
         }
-        // this.locationReplace(
-        //   `${location.origin}/student/#/videoDetail?${qs.stringify(
-        //     this.$route.query
-        //   )}`
-        // )
         return
       } else if (state.platformType === 'TEACHER') {
         Dialog.alert({