Merge branch 'release/6.5.1' into 'master'

commit



See merge request !74

@@ -32,7 +32,7 @@ export default {
             let {product_skn} = product;
             let {product_skn} = product;
             let href = `/product/pro_${product_skn}.html`;
             let href = `/product/pro_${product_skn}.html`;
 
 
-            if (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: {

@@ -27,7 +27,7 @@ export default {
             }
             }
         },
         },
         ['yoho.visible'](visible) {
         ['yoho.visible'](visible) {
-            if (visible && this.yoho.env.isiOS) {
+            if (visible && this.$yoho && this.$yoho.isiOS) {
                 this.checkReport(void 0, true);
                 this.checkReport(void 0, true);
             }
             }
         }
         }

@@ -122,7 +122,7 @@ export default {
         ResourceBox
         ResourceBox
     },
     },
     mounted() {
     mounted() {
-        if (this.yoho.env.isAndroid) {
+        if (this.$yoho.isAndroid) {
             let appVersion = this.$cookie.get('app_version');
             let appVersion = this.$cookie.get('app_version');
 
 
             if (appVersion && typeof appVersion === 'string') {
             if (appVersion && typeof appVersion === 'string') {

@@ -36,7 +36,7 @@ export default {
 
 
                 $appLink.href = url;
                 $appLink.href = url;
                 $appLink.click();
                 $appLink.click();
-                if (this.yoho.env.isiOS) {
+                if (this.$yoho.isiOS) {
                     $appLink.click();
                     $appLink.click();
                 }
                 }
             }
             }