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

@@ -136,7 +136,7 @@ function picCaptchaAjaxFn(page, callback) {
         type: 'POST',
         type: 'POST',
         url: url,
         url: url,
         data: {
         data: {
-            code: $ca.val()
+            verifyCode: $ca.val()
 
 
             //mobile: $pn.val(),
             //mobile: $pn.val(),
             //area: $region.text().split('+')[1]
             //area: $region.text().split('+')[1]
@@ -169,7 +169,7 @@ function msgCaptchaAjaxFn(page, callback) {
         type: 'POST',
         type: 'POST',
         url: url,
         url: url,
         data: {
         data: {
-            code: $ca.val(),
+            verifyCode: $ca.val(),
             mobile: $pn.val(),
             mobile: $pn.val(),
             area: $region.text().split('+')[1]
             area: $region.text().split('+')[1]
         }
         }
@@ -465,7 +465,7 @@ exports.init = function(page) {
 
 
     $regionSelect.change(function() {
     $regionSelect.change(function() {
 
 
-        $region.text('+' + $('#region').val());
+        $region.text($('#region').val());
 
 
         validateRule(page, $pn, showErrTip); //验证
         validateRule(page, $pn, showErrTip); //验证
     });
     });
@@ -493,7 +493,7 @@ exports.init = function(page) {
             data: {
             data: {
                 area: $region.text().split('+')[1],
                 area: $region.text().split('+')[1],
                 mobile: $pn.val(),
                 mobile: $pn.val(),
-                code: $ca.val()
+                verifyCode: $ca.val()
             }
             }
         }).then(function(data) {
         }).then(function(data) {
             if (data.code === 200) {
             if (data.code === 200) {

@@ -5,16 +5,17 @@
  */
  */
 
 
 .product-search-page {
 .product-search-page {
-
-
+    @import "shop-entry";
     .goods-container {
     .goods-container {
         height: auto;
         height: auto;
         padding: 25px 0 0 0;
         padding: 25px 0 0 0;
         position: relative;
         position: relative;
         width: 1150px + 10px;//每列增加右边距
         width: 1150px + 10px;//每列增加右边距
-    }
 
 
-    @import "shop-entry";
+        .good-info {
+            width: 222px;
+        }
+    }
 }
 }