Merge branch 'refs/heads/develop'

@@ -266,7 +266,7 @@ class Reg {
                 BaiduSDK.reportOcpcApi({
                 BaiduSDK.reportOcpcApi({
                     conversionTypes: {
                     conversionTypes: {
                         logidUrl,
                         logidUrl,
-                        newType: 25
+                        newType: 3
                     }
                     }
                 });
                 });
             }
             }

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.12.0",
+  "version": "6.12.1",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -295,7 +295,7 @@ $.extend({
      * @ version: v1.0.0
      * @ version: v1.0.0
      * 详情见文档：[http://ocpc.baidu.com/developer/d/guide/?iurl=api%2Fapi-doc%2Fapi-interface%2F]
      * 详情见文档：[http://ocpc.baidu.com/developer/d/guide/?iurl=api%2Fapi-doc%2Fapi-interface%2F]
     */
     */
-    if (location.href.includes('bd_vid=')) {
+    if (location.href.includes('bd_vid')) {
         setCookie('bd_vid_path', location.href, { path: '/', domain: '.yohobuy.com', expires: 90 });
         setCookie('bd_vid_path', location.href, { path: '/', domain: '.yohobuy.com', expires: 90 });
     }
     }