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

@@ -42,12 +42,12 @@ const titleMap = {
             action: ''
             action: ''
         },
         },
         title: {
         title: {
-            des: '标题3',
+            des: 'BLK',
             action: ''
             action: ''
         },
         },
         right: {
         right: {
             des: '提交',
             des: '提交',
-            action: ''
+            action: 'submitForm'
         }
         }
     },
     },
     4: {
     4: {
@@ -67,16 +67,16 @@ const titleMap = {
             action: ''
             action: ''
         },
         },
         ltitle: {
         ltitle: {
-            des: '商品5',
-            action: ''
+            des: '商品',
+            action: origin + '/favorite'
         },
         },
         rtitle: {
         rtitle: {
-            des: '品牌5',
-            action: ''
+            des: '品牌',
+            action: origin + '/favorite?tab=brand'
         },
         },
         right: {
         right: {
-            des: '编辑5',
-            action: ''
+            des: '编辑',
+            action: 'editModel'
         }
         }
     },
     },
     6: {
     6: {
@@ -92,20 +92,15 @@ const matchHeader = (url) => {
     let header = {
     let header = {
         headerid: '-1' // 默认不显示头部
         headerid: '-1' // 默认不显示头部
     };
     };
+    let path = url.split('?')[0];
 
 
-    if (/\/brands/.test(url) || /\/cate/.test(url)) {
-        header = titleMap[2];
-        alert(JSON.stringify(header));
-        return header;
-    }
-
-    if (/\/home\/mydetails/.test(url)) {
+    if (/\/home\/mydetails$/.test(path)) {
         header = titleMap[1];
         header = titleMap[1];
         header.title.des = '个人信息';
         header.title.des = '个人信息';
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/orders/.test(url)) {
+    if (/\/home\/orders$/.test(path)) {
         let des = '';
         let des = '';
         let u = url.split('?')[1];
         let u = url.split('?')[1];
 
 
@@ -124,55 +119,38 @@ const matchHeader = (url) => {
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/order-detail/.test(url)) {
+    if (/\/home\/order-detail$/.test(path)) {
         header = titleMap[2];
         header = titleMap[2];
         header.title.des = '订单详情';
         header.title.des = '订单详情';
         header.title.right.action = origin + '/home/service';
         header.title.right.action = origin + '/home/service';
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/refund\/orders/.test(url)) {
+    if (/\/home\/refund\/orders$/.test(path)) {
         header = titleMap[1];
         header = titleMap[1];
         header.title.des = '退/换货';
         header.title.des = '退/换货';
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/favorite/.test(url)) {
-        header = titleMap[5];
-        header.ltitle = {
-            des: '商品',
-            action: origin + '/home/favorite'
-        };
-        header.rtitle = {
-            des: '品牌',
-            action: origin + '/home/favorite?tab=brand'
-        };
-        header.right = {
-            des: '编辑',
-            action: 'editModel'
-        };
-        return header;
-    }
-
-    if (/\/home\/mycurrency/.test(url)) {
+    if (/\/home\/mycurrency$/.test(path)) {
         header = titleMap[1];
         header = titleMap[1];
         header.title.des = '有货币';
         header.title.des = '有货币';
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/help$/.test(url)) {
+    if (/\/home\/help$/.test(path)) {
         header = titleMap[1];
         header = titleMap[1];
         header.title.des = '帮助中心';
         header.title.des = '帮助中心';
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/service$/.test(url)) {
+    if (/\/home\/service$/.test(path)) {
         header = titleMap[1];
         header = titleMap[1];
         header.title.des = 'Yoho!Blk在线客服';
         header.title.des = 'Yoho!Blk在线客服';
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/feedback/.test(url)) {
+    if (/\/home\/feedback$/.test(path)) {
         header = titleMap[3];
         header = titleMap[3];
         header.title.des = '意见反馈';
         header.title.des = '意见反馈';
         header.right = {
         header.right = {
@@ -182,7 +160,7 @@ const matchHeader = (url) => {
         return header;
         return header;
     }
     }
 
 
-    if (/\/home\/about/.test(url)) {
+    if (/\/home\/about$/.test(path)) {
         header = titleMap[1];
         header = titleMap[1];
         header.title.des = '关于';
         header.title.des = '关于';
         return header;
         return header;
@@ -194,16 +172,30 @@ const matchHeader = (url) => {
 
 
 module.exports = (url) => {
 module.exports = (url) => {
     if (yoho.isApp) {
     if (yoho.isApp) {
-        // 品牌 品类
-        // if (/\/brands/.test(url) || /\/cate/.test(url)) {
-        //     return yoho.goTab({index: 1});
-        // }
+        let path = url.split('?')[0];
+
+        // 个人中心收藏
+        if (/\/home\/favorite$/.test(path)) {
+            return yoho.goPageView({
+                header: titleMap[5]
+            });
+        }
 
 
         // 个人中心首页
         // 个人中心首页
-        if (/\/home$/.test(url)) {
+        if (/\/home$/.test(path)) {
             return yoho.goTab({index: 4});
             return yoho.goTab({index: 4});
         }
         }
 
 
+        // 资讯
+        if (/\/news$/.test(path)) {
+            return yoho.goTab({index: 3});
+        }
+
+        // 品牌 品类
+        if (/\/brands$/.test(path) || /\/cate$/.test(path)) {
+            return yoho.goTab({index: 1});
+        }
+
         yoho.goNewPage({
         yoho.goNewPage({
             header: matchHeader(url),
             header: matchHeader(url),
             url: /^(https?:)?\/\//i.test(url) ? url : origin + url
             url: /^(https?:)?\/\//i.test(url) ? url : origin + url

@@ -277,9 +277,12 @@ const yoho = {
      * @param callback 回调
      * @param callback 回调
      */
      */
     addNativeMethod(name, callback) {
     addNativeMethod(name, callback) {
-        if (window.yohoInterface) {
-            window.yohoInterface[name] = callback;
-        }
+        // 延迟 500ms 注入
+        setTimeout(function() {
+            if (window.yohoInterface) {
+                window.yohoInterface[name] = callback;
+            }
+        }, 500);
     }
     }
 };
 };