解决冲突

@@ -36,6 +36,7 @@ class SearchData
 //                return 'http://101.200.31.165/yohosearch/search.json';
                 return 'http://192.168.10.64:8080/yohosearch/search.json';
             case 'testing':
+                return 'http://testing.yohoops.org/yohosearch/search.json';
             case 'developer':
             default:
                 return 'http://searchyohoops.yohobuy.com/yohosearch/search.json';

@@ -354,8 +354,8 @@ class Helpers
         $result['showTags'] = $showTag;
         $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
         //逛详情页app跳转url处理 20160601
-        $result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":0,"url":"' .'https:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';
-        //$result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
+        $result['url'] = $isApp ? self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' .'http:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}' : $articleData['url'];
+        //$result['url'] = $articleData['url']; // ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
 
         if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) {
             $result['url'] = self::transHttpsUrl($result['url']);
@@ -389,7 +389,6 @@ class Helpers
             }
             //编辑人员 app跳转url处理 20160601
             $articleData['author']['url'] = self::getUrlSafe($articleData['author']['url']).'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['author']['author_id'] . '"},"share":"","id":' . $articleData['author']['author_id'] . ',"type":0,"islogin":"N","url":"' .'https:'.self::url('/author/index', array(), 'guang') . '"}}';
-            $articleData['author']['url'] = self::getUrlSafe($articleData['author']['url']);
             $result['author'] = $articleData['author'];
             if (isset($result['author']['avatar'])) {
                 $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));

+server
+{
+     listen       80;
+     server_name  huodong.m.yohobuy.com;
+     root  /Data/code/git/yohobuy/yohobuy/huodong.m.yohobuy.com/public;
+     access_log /Data/logs/access.huodong.m.yohobuy.com.log  combined;
+     error_log  /Data/logs/nginx/error.huodong.m.yohobuy.com.log warn;
+     location / {
+        root  /Data/code/git/yohobuy/yohobuy/huodong.m.yohobuy.com/public;
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+        expires    30d;
+    }
+    location =/crossdomain.xml {
+        expires    30d;
+    }
+    location =/sitemap.xml {
+        expires    1d;
+    }
+    location =/robots.txt {
+        expires    1d;
+    }
+}
+
+server
+{
+     listen       80;
+     server_name  static.buy.test.yoho.cn;
+     root  /Data/code/git/yohobuy/static;
+
+    location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+        expires    30d;
+    }
+    location =/crossdomain.xml {
+        expires    30d;
+    }
+    location =/sitemap.xml {
+        expires    1d;
+    }
+    location =/robots.txt {
+        expires    1d;
+    }
+}
+
+server
+{
+    listen       80;
+    server_name  m.yohobuy.com;
+
+    #access_log /Data/logs/access.buy.test.yoho.cn.log  combined;
+    error_log  /Data/logs/nginx/error.m.yohobuy.com.log warn;
+
+    root  /Data/code/git/yohobuy/yohobuy/m.yohobuy.com/public;
+
+    location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+        expires    30d;
+    }
+    location =/crossdomain.xml {
+        expires    7d;
+    }
+    location =/sitemap.xml {
+        expires    1d;
+    }
+    location =/robots.txt {
+        expires    1d;
+    }
+
+    # login and register 301 redirect to https
+    location = /reg.html {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /signin.html {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /login.html {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location = /coupon/index {
+        proxy_redirect off;
+        proxy_pass http://yohobuywap-node;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";  
+    }
+
+
+    location =/appembed {
+        default_type application/json;
+        return 200 '{"code":200,"message":"app embed","data":{"open":"N","url":"http://m.yohobuy.com"}}';
+    }
+    location =/lb/v1 {
+        #cc: e0323a9039add2978bf5b49550572c7c oo:e47ca7a09cf6781e29634502345930a7
+        #acecl:7ea6bdf07376a928c5d4677789c45463 opqcl:kai: 352f028bd6ecf28de1c285c573642659 guang:7ea6bdf07376a928c5d4677789c45463
+        #srp 62a165d59f8daf42e2df5f3c5aed8a2f krp:17d7a40f313560d4d9a1189a91e45ab9
+        #boc 94931e4a3036baeecdacb975e10a8ec6 bcc:dc9262a469f6f315f74c087a7b3a7f35
+        default_type application/json;
+        return 200 '{"code":200,"message":"Config Success","md5":"1231231231231","data":{"ae":"e0323a9039add2978bf5b49550572c7c","url":"http://m.yohobuy.com","tl":"7ea6bdf07376a928c5d4677789c45463","rp":"62a165d59f8daf42e2df5f3c5aed8a2f","bv":"94931e4a3036baeecdacb975e10a8ec6","dl":"5b2d8b4b242e067616c6cd98851b2306"}}';
+    }
+
+    # 一些静态页面有关
+    location = /help/shareorder.html {
+        root  /Data/code/git/yohobuy/assets;
+        expires 7d;
+    }
+    location = /emailback.html {
+        root  /Data/code/git/yohobuy/assets;
+        expires 7d;
+    }
+    location = /phoneback.html {
+        root  /Data/code/git/yohobuy/assets;
+        expires 7d;
+    }
+    location = /error.html {
+        root  /Data/code/git/yohobuy/assets;
+        expires 7d;
+    }
+
+    location ^~ /dist/ {
+        proxy_redirect off;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_pass http://cdn.yoho.cn/;
+    }
+
+    # location / {
+    #     return 301 https://m.yohobuy.com$request_uri;
+    # }
+    
+    location / {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    # 老页面
+    location =/invite.html {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location =/app.html {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location =/yohood.html {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /home/lottery {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /home/redenvelopes {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /home/orders/tickets {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /home/currency/ {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /home/orders/cancel {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /wechat {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /huodong {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /download {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /events {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /appactive {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /cart/success {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /shopping/success {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /shopping/pay/aliwap {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /shopping/pay/wechatwap {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /passport/syncsignin {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location =/product/index/search {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+  location ^~ /share_ {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+}
+
+server
+{
+	listen 80;
+	server_name  search.yohoops.org testing.yohoops.org searchyohoops.yohobuy.com;
+	location / {
+		proxy_pass   http://192.168.102.216:8080/;
+		proxy_redirect off;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+	}
+}
+server
+{
+    listen       80;
+    server_name  *.m.yohobuy.com;
+
+    #access_log /Data/logs/access.buy.test.yoho.cn.log  combined;
+    error_log  /Data/logs/nginx/error.m.yohobuy.com.log warn;
+
+    root  /Data/code/git/yohobuy/yohobuy/m.yohobuy.com/public;
+
+    location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+        expires    30d;
+    }
+    location =/crossdomain.xml {
+        expires    7d;
+    }
+    location =/sitemap.xml {
+        expires    1d;
+    }
+    location =/robots.txt {
+        expires    1d;
+    }
+
+    location = /error.html {
+        root  /Data/code/git/yohobuy/assets;
+        expires 7d;
+    }
+
+    location ^~ /Passport/session {
+        proxy_redirect off;
+        proxy_pass http://192.168.50.69;
+        proxy_set_header   Host   m1.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    # location / {
+    #     return 301 https://$host$request_uri;
+    # }
+    # 
+    
+    location / {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+}
+
+
+# server
+# {
+#     listen       443;
+#     server_name  m.yohobuy.com;
+#     ssl on;
+#     ssl_certificate     /Data/local/nginx-1.8.0/ssl/server.crt;
+#     ssl_certificate_key  /Data/local/nginx-1.8.0/ssl/server.key;
+#     root  /Data/code/git/yohobuy/yohobuy/m.yohobuy.com/public;
+
+#     location = /appembed {
+#         default_type application/json;
+#         return 200 '{"code":200,"message":"app embed","data":{"open":"N","url":"http://m.yohobuy.com"}}';
+#     }
+#     location = /lb/v1 {
+#         #cc: e0323a9039add2978bf5b49550572c7c oo:e47ca7a09cf6781e29634502345930a7
+#         #acecl:7ea6bdf07376a928c5d4677789c45463 opqcl:kai: 352f028bd6ecf28de1c285c573642659 guang:7ea6bdf07376a928c5d4677789c45463
+#         #srp 62a165d59f8daf42e2df5f3c5aed8a2f krp:17d7a40f313560d4d9a1189a91e45ab9
+#         #boc 94931e4a3036baeecdacb975e10a8ec6 bcc:dc9262a469f6f315f74c087a7b3a7f35
+#         default_type application/json;
+#         return 200 '{"code":200,"message":"Config Success","md5":"1231231231231","data":{"ae":"e0323a9039add2978bf5b49550572c7c","url":"http://m.yohobuy.com","tl":"7ea6bdf07376a928c5d4677789c45463","rp":"62a165d59f8daf42e2df5f3c5aed8a2f","bv":"94931e4a3036baeecdacb975e10a8ec6"}}';
+#     }
+
+#     location = /help/shareorder.html {
+#         root  /Data/code/git/yohobuy/assets;
+#         expires 7d;
+#     }
+#     location = /emailback.html {
+#         root  /Data/code/git/yohobuy/assets;
+#         expires 7d;
+#     }
+#     location = /phoneback.html {
+#         root  /Data/code/git/yohobuy/assets;
+#         expires 7d;
+#     }
+#     location = /error.html {
+#         root  /Data/code/git/yohobuy/assets;
+#         expires 7d;
+#     }
+
+#     # login and register 301 redirect to https
+#     location = /reg.html {
+#         return 301 https://login.m.yohobuy.com$request_uri;
+#     }
+#     location = /signin.html {
+#         return 301 https://login.m.yohobuy.com$request_uri;
+#     }
+#     location = /login.html {
+#         return 301 https://login.m.yohobuy.com$request_uri;
+#     }
+
+#     location ^~ /Passport/session {
+#         proxy_redirect off;
+#         proxy_pass http://192.168.50.69;
+#         proxy_set_header   Host   m1.yohobuy.com;
+#         proxy_set_header   X-Real-IP  $remote_addr;
+#         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header   Accept-Encoding "gzip";
+#     }
+
+#     location / {
+#         proxy_redirect off;
+#         proxy_pass http://yohobuy;
+#         proxy_set_header   Host   $host;
+#         proxy_set_header   X-Real-IP  $remote_addr;
+#         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header   Accept-Encoding "gzip";
+#     }
+
+#     location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+#         expires    30d;
+#     }
+#     location =/crossdomain.xml {
+#         expires    30d;
+#     }
+#     location =/sitemap.xml {
+#         expires    1d;
+#     }
+#     location =/robots.txt {
+#         expires    1d;
+#     }
+# }
+
+
+# server
+# {
+#     listen       443;
+#     server_name  *.m.yohobuy.com;
+#     ssl on;
+#     ssl_certificate     /Data/local/nginx-1.8.0/ssl/server.crt;
+#     ssl_certificate_key  /Data/local/nginx-1.8.0/ssl/server.key;
+#     root  /Data/code/git/yohobuy/yohobuy/m.yohobuy.com/public;
+
+#     location = /error.html {
+#         root  /Data/code/git/yohobuy/assets;
+#         expires 7d;
+#     }
+
+#     location ^~ /Passport/session {
+#         proxy_redirect off;
+#         proxy_pass http://192.168.50.69;
+#         proxy_set_header   Host   m1.yohobuy.com;
+#         proxy_set_header   X-Real-IP  $remote_addr;
+#         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header   Accept-Encoding "gzip";
+#     }
+
+#     location / {
+#         proxy_redirect off;
+#         proxy_pass http://yohobuy;
+#         proxy_set_header   Host   $host;
+#         proxy_set_header   X-Real-IP  $remote_addr;
+#         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header   Accept-Encoding "gzip";
+#     }
+
+#     location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+#         expires    30d;
+#     }
+#     location =/crossdomain.xml {
+#         expires    30d;
+#     }
+#     location =/sitemap.xml {
+#         expires    1d;
+#     }
+#     location =/robots.txt {
+#         expires    1d;
+#     }
+# }
+
+
+
+
+server
+{
+         listen       80;
+              server_name  analytics.m.yohobuy.com;
+            
+                        location / {
+                                    proxy_redirect off;
+                                            proxy_pass http://analytics.yhurl.com;
+                                                    proxy_set_header   Host   $host;
+                                                            proxy_set_header   X-Real-IP  $remote_addr;
+                                                                    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+                                                                            proxy_set_header   Accept-Encoding "gzip";
+                                                                                }
+
+                            location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+                                        expires    30d;
+                                            }
+                                location =/crossdomain.xml {
+                                            expires    30d;
+                                                }
+                                    location =/sitemap.xml {
+                                                expires    1d;
+                                                    }
+                                        location =/robots.txt {
+                                                    expires    1d;
+                                                        }
+}
+

@@ -234,10 +234,11 @@ function reMarginFooter(fixedElement) {
                 jsonData = {
                     page: bpIdArr[0],
                     floor: bpIdArr[1],
-                    data: bpIdArr[2]
+                    data: bpIdArr.slice(2).join('_') //防止值字符串中有_导致的问题
                 };
-
-                window._yas.sendCustomInfo(jsonData, Boolean(parseInt(bpIdArr[3]) || 1));
+                if (window._yas.sendCustomInfo) {
+                    window._yas.sendCustomInfo(jsonData, Boolean(parseInt(bpIdArr[3]) || 1));
+                }
             }
         };
 
@@ -7602,6 +7603,7 @@ $('#likeBtn').on('touchstart', function() {
 
 $('#addtoCart').on('touchstart', function() {
     $('.cart-bar').hide();
+
     productCode && chosePanel.setLimitGoodModeWithSknId(productCode, skn);
     chosePanel.show();
 
@@ -7615,6 +7617,11 @@ $('#addtoCart').on('touchstart', function() {
 
     return false;
 });
+
+$('#buyLimit').on('touchstart', function() {
+    tip.show('打开APP可抢购该商品哦~');
+    return false;
+});
 
 });
 define("js/cart/chose-panel", ["jquery"], function(require, exports, module){
@@ -9542,7 +9549,7 @@ $subNav.on('touchend touchcancel', function(e) {
         nav,
         navType,
         $active;
-    var bpIdData = $(this).find('.buriedpoint').attr('data-bp-id') || '';
+    var bpIdData = $this.attr('data-bp-id') || '';
 
     e.preventDefault();
     $(document).trigger('shouldSendBpData', [bpIdData]);

@@ -216,10 +216,11 @@ function reMarginFooter(fixedElement) {
                 jsonData = {
                     page: bpIdArr[0],
                     floor: bpIdArr[1],
-                    data: bpIdArr[2]
+                    data: bpIdArr.slice(2).join('_') //防止值字符串中有_导致的问题
                 };
-
-                window._yas.sendCustomInfo(jsonData, Boolean(parseInt(bpIdArr[3]) || 1));
+                if (window._yas.sendCustomInfo) {
+                    window._yas.sendCustomInfo(jsonData, Boolean(parseInt(bpIdArr[3]) || 1));
+                }
             }
         };
 

@@ -68,6 +68,7 @@ $('#likeBtn').on('touchstart', function() {
 
 $('#addtoCart').on('touchstart', function() {
     $('.cart-bar').hide();
+
     productCode && chosePanel.setLimitGoodModeWithSknId(productCode, skn);
     chosePanel.show();
 
@@ -81,3 +82,8 @@ $('#addtoCart').on('touchstart', function() {
 
     return false;
 });
+
+$('#buyLimit').on('touchstart', function() {
+    tip.show('打开APP可抢购该商品哦~');
+    return false;
+});

@@ -600,7 +600,7 @@ $subNav.on('touchend touchcancel', function(e) {
         nav,
         navType,
         $active;
-    var bpIdData = $(this).find('.buriedpoint').attr('data-bp-id') || '';
+    var bpIdData = $this.attr('data-bp-id') || '';
 
     e.preventDefault();
     $(document).trigger('shouldSendBpData', [bpIdData]);

@@ -14,6 +14,7 @@
 
         .shop-back-img {
             height: 100%;
+            width: 100%;
         }
     }
 

@@ -152,7 +152,7 @@
         {{/if}}
 
         {{#if canBuyLimit}}
-            <a href="javascript:;" id="addtoCart" class="addto-cart">立即购买</a>
+            <a href="javascript:;" id="buyLimit" class="addto-cart">立即购买</a>
         {{/if}}
 
         {{#if noLimitCode}}

@@ -91,7 +91,7 @@
 
                     <div class="popularity-title">
                         人气单品
-                        <a class="more" href="{{more_url}}">&#xe618;</a>
+                        <a class="more buriedpoint" href="{{more_url}}" data-bp-id="shop_popularity_{{more_url}}">&#xe618;</a>
                     </div>
                     
                     <ul class="product-list">

@@ -295,8 +295,11 @@ class UserModel
                     $brand['brandName'] = $val['brand_name'];
                     $brand['update'] = $val['new_product_num'];
                     $brand['discount'] = $val['product_discount_num'];
-                    $brand['link'] = Helpers::url('', array(), $val['brand_domain']);
-
+                    if ($val['brandOrShopType'] == 'brandOrShopType') {
+                        $brand['link'] = Helpers::url('/product/index/brand', array('shop_id' => $val['shop_id']));
+                    } else {
+                        $brand['link'] = Helpers::url('', array(), $val['brand_domain']);
+                    }
                     // 处理品牌产品
                     $product = array();
                     foreach ($val['new_product'] as $one) {

@@ -189,14 +189,8 @@ class IndexController extends AbstractAction
         // 构建资讯文章内容
         if (!empty($article['data']['list']['artList'])) {
             $build = array();
-//            foreach ($article['data']['list']['artList'] as $article) {
-//                $build[] = Helpers::formatArticle($article, true, $isApp, false, $uid);
-//            }
-            foreach ($article['data']['list']['artList'] as $articlekey =>$article) {
-                $build[$articlekey] = Helpers::formatArticle($article, true, $isApp, false, $uid);
-                if($this->isApp()){
-                $build[$articlekey]['collect']['url'] = Helpers::url('/author/index', array('id' => $id), 'guang');
-                }
+            foreach ($article['data']['list']['artList'] as $article) {
+                $build[] = Helpers::formatArticle($article, true, $isApp, false, $uid);
             }
             $data['guang']['infos'] = $build;
         }