Merge branch 'master' into feature/yohoCoin

@@ -53,7 +53,7 @@ class JsApiPay
         //通过code获得openid
         if (!isset($_GET['code'])) {
             //触发微信返回code码
-            $baseUrl = urlencode('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+            $baseUrl = urlencode('http://m.yohobuy.com' . $_SERVER['REQUEST_URI']);
             $url = $this->__CreateOauthUrlForCode($baseUrl);
             Header("Location: $url");
             exit();
@@ -164,7 +164,7 @@ class JsApiPay
         $getData = $this->data;
         $data = array();
         $data["appid"] = WxPayConfig::APPID;
-        $data["url"] = "http://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+        $data["url"] = "http://m.yohobuy.com" . $_SERVER['REQUEST_URI'];
         $time = time();
         $data["timestamp"] = "$time";
         $data["noncestr"] = "1234568";

@@ -211,8 +211,8 @@ function reMarginFooter(fixedElement) {
     $footer.removeClass('hide');
 
     // 接受微信商城或者第三方来源的数据埋点信息
-    if ($.queryString().mkt_code) {
-        setCookie('mkt_code', $.queryString().mkt_code);
+    if ($.queryString().union_type) {
+        setCookie('unionTypeYas', $.queryString().union_type, {'path': '/'});
     }
 
 }());

@@ -19,7 +19,7 @@ function downLoadApp() {
     var clickedAt = new Date();
 
     setTimeout(function() {
-        var mkt = window.queryString.mkt_code || window.cookie('mkt_code') || false;
+        var mkt = window.queryString.union_type || window.cookie('unionTypeYas') || false;
 
         if ((new Date()) - clickedAt < 2000) {
             if (mkt) {

@@ -76,6 +76,7 @@ class Bootstrap extends Bootstrap_Abstract
             $subDomain = strval($hostParts[0]);
             switch (strtolower($subDomain)) {
                 case 'm':  // 老版(到频道选择)
+                case 'cdnsrcm': // 主站CDN回源 
                 case 'buy': // 测试环境的域名, 以后可去掉
                 case 'login': // 登录
                     break;