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

@@ -85,12 +85,13 @@ function GoodHrefBinding(el, binding) {
     }
     }
     let href = `/product/pro_${product_id}_${goods_id}/${cn_alphabet || 'item'}.html`;
     let href = `/product/pro_${product_id}_${goods_id}/${cn_alphabet || 'item'}.html`;
 
 
+    const prefix = yoho.isiOS ? 'i' : (yoho.isAndroid ? 'a' : '');
     if (yoho.isYohoBuy) {
     if (yoho.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: `${prefix}${from_page_name}`,
                 from_page_param
                 from_page_param
             }
             }
         };
         };

@@ -32,12 +32,26 @@ export default {
             let {product_skn} = product;
             let {product_skn} = product;
             let href = `/product/pro_${product_skn}.html`;
             let href = `/product/pro_${product_skn}.html`;
 
 
+            const pageNameMap = {
+                'channel.home': 'FP_BLK_Home_h5',
+                'channel.channelHome.channelMen': 'FP_BLK_MenHome_h5',
+                'channel.channelHome.channelWomen': 'FP_BLK_WomenHome_h5'
+            };
+
+            let from_page_name = this.$route.name;
+
+            if (this.yoho) {
+                const prefix = this.yoho.env.isiOS ? 'i' : (this.yoho.env.isAndroid ? 'a' : '');
+                from_page_name = pageNameMap[this.$route.name] ? `${prefix}${pageNameMap[this.$route.name]}` :
+                    this.$route.name;
+            }
+
             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: this.$route.name,
+                        from_page_name: from_page_name,
                         from_page_param: this.$route.query
                         from_page_param: this.$route.query
                     }
                     }
                 };
                 };

@@ -66,7 +66,7 @@ export default {
     methods: {
     methods: {
         report(param) {
         report(param) {
 
 
-            const prefix = this.yoho.isiOS ? 'i' : (this.yoho.isAndroid ? 'a' : '');
+            const prefix = this.yoho.env.isiOS ? 'i' : (this.yoho.env.isAndroid ? 'a' : '');
             _.each(param, item => {
             _.each(param, item => {
                 if (this.pageNameMap[item.P_NAME]) {
                 if (this.pageNameMap[item.P_NAME]) {
                     item.P_NAME = this.pageNameMap[item.P_NAME];
                     item.P_NAME = this.pageNameMap[item.P_NAME];