Merge branch 'feature/brand' into develop

@@ -58,7 +58,6 @@
 <script>
 <script>
     const yoho = require('yoho');
     const yoho = require('yoho');
     const $ = require('yoho-jquery');
     const $ = require('yoho-jquery');
-    const tip = require('common/tip');
 
 
     module.exports = {
     module.exports = {
         data() {
         data() {
@@ -94,15 +93,12 @@
                     url: '/product/shop/collect.json',
                     url: '/product/shop/collect.json',
                     data: data
                     data: data
                 }).done(result => {
                 }).done(result => {
-                    tip(result.message);
                     if (result.code === 200) {
                     if (result.code === 200) {
                         this.shareData.isFav = !this.shareData.isFav;
                         this.shareData.isFav = !this.shareData.isFav;
                     } else if (result.code === 403) {
                     } else if (result.code === 403) {
-                        yoho.goLogin();
+                        yoho.goLogin('', this.collectShop);
                     }
                     }
-                }).fail(() => {
-                    tip('网络错误');
-                });
+                }).fail(() => {});
             },
             },
             showFilter() {
             showFilter() {
                 this.$parent.$refs.filter.isVisible = !this.$parent.$refs.filter.isVisible;
                 this.$parent.$refs.filter.isVisible = !this.$parent.$refs.filter.isVisible;