Merge branch 'feature/tracking' into feature/context-and-tracking

@@ -34,6 +34,7 @@
 </style>
 </style>
 <script>
 <script>
     import $ from 'jquery';
     import $ from 'jquery';
+    import _ from 'lodash';
     import yoho from 'yoho';
     import yoho from 'yoho';
     import qs from 'yoho-qs/parse';
     import qs from 'yoho-qs/parse';
     import bus from 'common/vue-bus';
     import bus from 'common/vue-bus';
@@ -198,6 +199,13 @@
                     if (result.code === 200) {
                     if (result.code === 200) {
                         this.page = result.data.page;
                         this.page = result.data.page;
                         this.totalPage = result.data.pageTotal;
                         this.totalPage = result.data.pageTotal;
+
+                        // yas report param injection
+                        _.each(result.data.productList, item => {
+                            item.from_page_name = this.pageName;
+                            item.from_page_param = this.pageParam;
+                        });
+
                         this.productList = this.productList.concat(result.data.productList);
                         this.productList = this.productList.concat(result.data.productList);
                         if (!this.filterConfig) {
                         if (!this.filterConfig) {
                             this.filterConfig = result.data.filter;
                             this.filterConfig = result.data.filter;

@@ -46,13 +46,14 @@ export default {
                     this.$route.name;
                     this.$route.name;
             }
             }
 
 
+            let from_page_param = Object.keys(this.$route.query).length ? this.$route.query : void 0;
             if ((this.$yoho && this.$yoho.isYohoBuy) || this.yoho.env.isYohoBuy) {
             if ((this.$yoho && this.$yoho.isYohoBuy) || this.yoho.env.isYohoBuy) {
                 let goParams = {
                 let goParams = {
                     action: 'go.productDetail',
                     action: 'go.productDetail',
                     params: {
                     params: {
                         product_skn: product_skn,
                         product_skn: product_skn,
                         from_page_name: from_page_name,
                         from_page_name: from_page_name,
-                        from_page_param: this.$route.query
+                        from_page_param
                     }
                     }
                 };
                 };
 
 

@@ -33,7 +33,7 @@ export default {
             }
             }
         },
         },
         ['yoho.visible'](visible) {
         ['yoho.visible'](visible) {
-            if (visible && this.$yoho && this.$yoho.isiOS) {
+            if (visible && this.$yoho) {
                 this.checkReport(void 0, true);
                 this.checkReport(void 0, true);
             }
             }
         }
         }
@@ -93,6 +93,10 @@ export default {
             });
             });
         },
         },
         record(component, index, isInit) {
         record(component, index, isInit) {
+            if (isInit) {
+                this.componentStatus = {};
+            }
+
             const reportData = _.get(component, '$options.propsData.value');
             const reportData = _.get(component, '$options.propsData.value');
 
 
             // 区分不通组件记录以楼层内item为单位、而不是以整个楼层为单位组织数据上报
             // 区分不通组件记录以楼层内item为单位、而不是以整个楼层为单位组织数据上报