Merge branch 'release/3.0' into 'gray'

yas



See merge request !32

+import yoho from 'yoho';
+
 export default () => {
 export default () => {
     return {
     return {
         REC_ID: '',
         REC_ID: '',
@@ -6,15 +8,13 @@ export default () => {
             '_' + Math.floor(Math.random() * 1000000 + 1000000));
             '_' + Math.floor(Math.random() * 1000000 + 1000000));
         },
         },
         event(op, param) {
         event(op, param) {
-            if (window._yas && window._yas.sendCustomInfo) {
-                setTimeout(() => {
-                    window._yas.sendCustomInfo({
-                        op: op,
+            if (window._yas && window._yas.sendAppLogs) {
+                window._yas.sendAppLogs({
+                    appop: op,
                     param: JSON.stringify(Object.assign(param, {
                     param: JSON.stringify(Object.assign(param, {
                         REC_ID: this.REC_ID
                         REC_ID: this.REC_ID
                     }))
                     }))
                 }, true);
                 }, true);
-                }, 0);
             }
             }
         },
         },
         eventData(op, param) {
         eventData(op, param) {

@@ -50,6 +50,11 @@ directive(Vue);
 filter(Vue);
 filter(Vue);
 Vue.use(VueTouch);
 Vue.use(VueTouch);
 
 
+Vue.prototype.$isApp = yoho.isApp;
+Vue.prototype.$isiOS = yoho.isiOS;
+Vue.prototype.$isAndroid = yoho.isAndroid;
+Vue.prototype.$isYohoBuy = yoho.isYohoBuy;
+
 $(() => {
 $(() => {
     const $body = $('body');
     const $body = $('body');
 
 

@@ -65,6 +65,7 @@
         },
         },
         methods: {
         methods: {
             clickProduct(item, index) {
             clickProduct(item, index) {
+                if (this.$isYohoBuy) {
                     this.$yas.event('YB_GOODS_LIST_DT', {
                     this.$yas.event('YB_GOODS_LIST_DT', {
                         TYPE_ID: 13,
                         TYPE_ID: 13,
                         ENT_ID: this.query,
                         ENT_ID: this.query,
@@ -72,6 +73,7 @@
                         PRD_ID: item.product_id,
                         PRD_ID: item.product_id,
                         SORT_TYPE: this.orderType
                         SORT_TYPE: this.orderType
                     });
                     });
+                }
             },
             },
             search: function() {
             search: function() {
                 const nextPage = this.page + 1;
                 const nextPage = this.page + 1;
@@ -102,6 +104,8 @@
                             if (!this.filterConfig) {
                             if (!this.filterConfig) {
                                 this.filterConfig = res.data.filter;
                                 this.filterConfig = res.data.filter;
                             }
                             }
+                            if (this.$isYohoBuy) {
+                                setTimeout(() => {
                                     this.$yas.eventData('YB_GOODS_LIST', {
                                     this.$yas.eventData('YB_GOODS_LIST', {
                                         TYPE_ID: 13,
                                         TYPE_ID: 13,
                                         ENT_ID: this.query,
                                         ENT_ID: this.query,
@@ -111,6 +115,8 @@
                                         }).join(','),
                                         }).join(','),
                                         SORT_TYPE: this.orderType,
                                         SORT_TYPE: this.orderType,
                                     });
                                     });
+                                }, 500);
+                            }
                         }
                         }
                     })
                     })
                     .fail(() => {
                     .fail(() => {
@@ -142,7 +148,6 @@
         created: function() {
         created: function() {
             const self = this;
             const self = this;
 
 
-
             bus.$on('list.paging', function() {
             bus.$on('list.paging', function() {
                 self.search();
                 self.search();
             });
             });