Merge branch 'develop/3.2.2' into develop/3.2.2_tencent

src/pages/share/channels.vue

@@ -44,7 +44,7 @@ export default {
   methods: {
     getDetail(item) {
       uni.navigateTo({
-        url: `?page=/pages/share/list&channelId=${item.id}&userId=${this.userId}`,
+        url: `?page=/pages/share/list&channelId=${item.id}&userId=${this.userId}&categoryId=${this.categoryId}`,
       })
     },
   }

src/pages/share/list.vue

@@ -56,13 +56,17 @@ export default {
     if (e.userId) {
       this.form.userId = e.userId
       this.form.channelId = e.channelId
+      this.form.categoryId = e.categoryId
       // 频道详情
       channelDetail({
         channelId: e.channelId,
+        categoryId: e.categoryId,
         userId: e.userId
       }).then(res => {
         if (res.code === 0) {
           this.data = res.data
+          // 返回给APP的
+          this.data.categoryId = this.data.categoryId ?? e.categoryId
         }
       })
       this.getList()
@@ -93,7 +97,7 @@ export default {
     // },
     // 打开app
     open() {
-      this.openApp(`?page=/mobile/channelSinglePage&channel=${this.data.channelId}&channelId=${this.data.id}`)
+      this.openApp(`?page=/mobile/channelSinglePage&channel=${this.data.channelId}&channelId=${this.data.id}&categoryId=${this.data.categoryId}`)
     }
   }
 }

src/pages/ximalaya/index.vue

@@ -24,6 +24,11 @@ export default {
         this.type = 'clear'
         this.title = '授权失败！'
       }
+
+      const name = 'authXmlyWeb'
+      const code = res.code === 0 ? "1" : "0"
+      webChannel.postMessage(`?name=${name}&code=${code}`)
+
     })
   }
 }
@@ -47,6 +52,7 @@ export default {
   0% {
     transform: rotate(0deg)
   }
+
   100% {
     transform: rotate(360deg);
   }