Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -19,52 +19,25 @@ for (i = keyVal.length; i > 0; i--) {
     key = key[0];
     key = key[0];
 
 
     //初始化默认参数
     //初始化默认参数
-    switch (key) {
-        case 'gender':
-            opt.gender = val;
-            break;
-        case 'brand':
-            opt.brand = val;
-            break;
-        case 'sort':
-            opt.sort = val;
-            break;
-        case 'msort':
-            opt.msort = val;
-            break;
-        case 'misort':
-            opt.misort = val;
-            break;
-        case 'color':
-            opt.color = val;
-            break;
-        case 'size':
-            opt.size = val;
-            break;
-        case 'price':
-            opt.price = val;
-            break;
-        case 'discount':
-            opt.discount = val;
-            break;
-        case 'query':
-            opt.query = val;
-            break;
-        case 'style':
-            opt.style = val;
-            break;
-        case 'limit':
-            opt.limit = val;
-            break;
-        case 'channel':
-            opt.channel = val;
-            break;
-        case 'p_d':
-            opt.p_d = val;
+    opt[key] = val;
+
+    //discount = p_d，同时需要两个参数
+    if (key === 'discount' || key === 'p_d') {
+        opt.discount = val;
+        opt.p_d = val;
+    }
+}
+
+if (typeof opt.gender === 'undefined') {
+    switch (window.cookie('_Channel')) {
+        case 'boys':
+            opt.gender = '1,3';
             break;
             break;
-        case 'dayLimit':
-            opt.dayLimit = val;
+        case 'girls':
+            opt.gender = '2,3';
             break;
             break;
+        default:
+            opt.gender = '1,2,3';
     }
     }
 }
 }