Merge branch 'release/5.2' of git.yoho.cn:fe/yohobuywap-node into release/5.2

@@ -86,8 +86,8 @@ var brandCoupon = {
                     }, 1000);
                 }
             }
-        }).fail(function(res) {
-            tip.show(res.message);
+        }).fail(function() {
+            tip.show('网络异常,请稍后再试');
         });
     },
 

@@ -497,8 +497,6 @@ function search(opt) {
                     break;
             }
 
-            // console.log(data)
-
             if (data === '' || data.list) {
                 nav.end = true;
 
@@ -515,17 +513,17 @@ function search(opt) {
                 };
 
                 if (category) {
-                    optype = 'YB_CATEGORY_GOODS_LIST_L',
-                   yasparm = Object.assign(yasparm, {
-                       CATEGORY_ID: window.queryString.title || '',
-                   });
+                    optype = 'YB_CATEGORY_GOODS_LIST_L';
+                    yasparm = Object.assign(yasparm, {
+                        CATEGORY_ID: window.queryString.title || ''
+                    });
                 } else if ($brandHeader.length > 0) {
-                    optype = 'YB_BRAND_GOODS_LIST_L',
+                    optype = 'YB_BRAND_GOODS_LIST_L';
                     yasparm = Object.assign(yasparm, {
                         BRAND_ID: $brandHeader.data('id')
                     });
                 } else {
-                    optype = 'YB_KEYWORD_GOOS_LIST_L',
+                    optype = 'YB_KEYWORD_GOOS_LIST_L';
                     yasparm = Object.assign(yasparm, {
                         KEYWORD: setting.query || ''
                     });
@@ -1061,35 +1059,33 @@ $listNav.on('touchstart', 'li', function() {
     $listNav.find('li').removeClass('bytouch');
 });
 
-$('#goods-container').on('click', '.good-info', function(event) {
+$('#goods-container').on('click', '.good-info', function() {
     var PRD_ID = $(this).data('good-id'),
         PRD_NUM = $(this).index(),
         FILTER_VALUE = JSON.stringify(argument).replace(/\{|\}|\"/g, ''),
         yasparms;
 
-    // event.preventDefault();
-
     yasparms = {
         C_ID: C_ID,
         PRD_ID: PRD_ID,
         PRD_NUM: PRD_NUM,
-        PAGE_NUM: argument.page,
+        PAGE_NUM: Math.ceil(PRD_NUM / 60),
         FILTER_VALUE: FILTER_VALUE,
         SORT_TYPE: argument.type
     };
 
     if (category) {
-        optype = 'YB_CATEGORY_GOODS_LIST_C',
+        optype = 'YB_CATEGORY_GOODS_LIST_C';
         yasparms = Object.assign(yasparms, {
             CATEGORY_ID: window.queryString.title || '',
         });
     } else if ($brandHeader.length > 0) {
-        optype = 'YB_BRAND_GOODS_LIST_C',
+        optype = 'YB_BRAND_GOODS_LIST_C';
         yasparms = Object.assign(yasparms, {
             BRAND_ID: $brandHeader.data('id')
         });
     } else {
-        optype = 'YB_KEYWORD_GOOS_LIST_C',
+        optype = 'YB_KEYWORD_GOOS_LIST_C';
         yasparms = Object.assign(yasparms, {
             KEYWORD: argument.query || ''
         });

@@ -11,7 +11,7 @@ $basicBtnC: #eb0313;
     background-color: #f0f0f0;
 
     .yoho-tip {
-        z-index: 4;
+        z-index: 100;
     }
 
     .page-block {