Merge branch 'xqy_topic' into dev

pages4/courseTopic/goodsTopic.vue

@@ -141,7 +141,13 @@ export default {
         }
     },
     onLoad(option) {
-        this.topicId = option.topicId
+        if (option.scene) {
+            let tid = decodeURIComponent(option.scene)
+            this.topicId = tid.split('=')[1]
+            console.log('topicId: ', this.topicId)
+        } else {
+            this.topicId = option.topicId
+        }
         this.getgoodsInfo()
     },
     methods: {