Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

 <template>
-    <div class="header {{class}}">
+    <div class="header" :class="class">
         <div class="header-left">
             <slot name="left">
                 <i class="icon icon-left" @click="goBack"></i>

@@ -120,10 +120,21 @@
         },
         methods: {
             changeAddress() {
+                const self = this;
+
                 yoho.goAddress({
                     type: '1'
                 }, (address) => {
-                    // Todo
+                    if(address) {
+                        self.$set('address', {
+                            addressId: address.address_id,
+                            area: address.area,
+                            zipCode: address.zip_code,
+                            mobile: address.mobile,
+                            address: address.address,
+                            consigneeName: address.consignee_name
+                        });
+                    }
                 }, () => {
                     tip('更换地址失败~');
                 });
@@ -160,7 +171,7 @@
             submitData() {
                 const data = {
                     order_code: this.orderCode,
-                    address_id: this.address.address_id,
+                    address_id: this.address.addressId,
                     address: this.address.address,
                     consigee_name: this.address.consignee,
                     area_code: this.address.areaCode,

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