Merge branch 'develop' into release/1.0

@@ -197,12 +197,6 @@ const matchHeader = (path, qs, titleMap) => {
         return header;
     }
 
-    if (/\/me\/service$/.test(path)) {
-        header = titleMap[1];
-        header.title.des = 'Yoho!Blk在线客服';
-        return header;
-    }
-
     if (/\/me\/feedback$/.test(path)) {
         header = titleMap[3];
         header.title.des = '意见反馈';
@@ -219,13 +213,6 @@ const matchHeader = (path, qs, titleMap) => {
         return header;
     }
 
-    // 处理 feature.yoho.cn 等域名下的站外链接
-    if (/^(https?:)?\/\//i.test(path) && !/yohoblk\.com/.test(path)) {
-        header = titleMap[1];
-        header.title.des = qs.title || '';
-        return header;
-    }
-
     return header;
 };
 
@@ -280,10 +267,25 @@ const intercept = (url) => {
             });
         }
 
-        yoho.goNewPage({
+        const args = {
             header: matchHeader(path, qs, titleMap),
             url: /^(https?:)?\/\//i.test(url) ? url : origin + url
-        });
+        };
+
+        if (/\/me\/service$/.test(path)) {
+            args.header = titleMap[1];
+            args.header.title.des = 'Yoho!Blk在线客服';
+            args.showLoading = 'no';
+        }
+
+        // 处理 feature.yoho.cn 等域名下的站外链接
+        if (/^(https?:)?\/\//i.test(path) && !/m\.yohoblk\.com/.test(path)) {
+            args.header = titleMap[1];
+            args.header.title.des = qs.title || '';
+            args.showLoading = 'no';
+        }
+
+        yoho.goNewPage(args);
     } else {
         location.href = url;
     }

@@ -44,7 +44,7 @@ module.exports = (Vue) => {
         let url = `/product/shop/${value}`;
 
         if (kind === 'shop') {
-            url = `/product/shop/favorite?id=${value}`;
+            url = `/product/shop/favorite?id=${value || ''}`;
         }
         return url;
     });