Merge branch 'main' into feature/v1.0.37

apps/bigmember_pc/src/views/article-content/components/ContentRightTimeLine.vue

@@ -26,11 +26,14 @@ function doOpen(item) {
     const newRoute = {
       name: currentRoute.name,
       params: {
-        content: currentRoute.params.content,
+        content: 'content',
         id: item.id + '.html'
-      }
+      },
+      query: currentRoute.query
     }
-    router.push(newRoute)
+    const link = router.resolve(newRoute)
+
+    location.href = link.href.replace('/swordfish/page_big_pc', '')
   }
 }
 </script>

apps/bigmember_pc/src/views/article-content/components/Reward.vue

@@ -32,7 +32,7 @@
 import { getRewardText } from '@/api/modules/detail'
 export default {
   name: 'Reward',
-  prop: {
+  props: {
     id: {
       type: String,
       default: ''

apps/bigmember_pc/src/views/article-content/pages/Article.vue

@@ -502,7 +502,7 @@ function doClickFreeView() {
                     ></attachment-download>
                   </div>
 
-                  <Reward />
+                  <Reward :id="ContentId" />
                 </div>
               </div>
             </div>