Merge branch 'feature/group-buy' of git.yoho.cn:fe/yohobuywap-node into feature/group-buy

@@ -16,7 +16,7 @@ const contentCodes = {
         result: 'cea0efae77f4e04c935beb1e87181247',
         result: 'cea0efae77f4e04c935beb1e87181247',
         detail: '3c3a94fd6c6e19508b6921acd7f6cbad'
         detail: '3c3a94fd6c6e19508b6921acd7f6cbad'
     }
     }
-}[isProd ? 'prod' : 'test'];
+} [isProd ? 'production' : 'test'];
 
 
 class GroupService extends global.yoho.BaseModel {
 class GroupService extends global.yoho.BaseModel {
     constructor(ctx) {
     constructor(ctx) {

@@ -103,7 +103,6 @@ class ProductListLoader {
         }
         }
         let catchKey = this.url + '?' + $.param(this.defaultOpt);
         let catchKey = this.url + '?' + $.param(this.defaultOpt);
 
 
-        console.log(this.defaultOpt);
         if (!this.isLoadMore) {
         if (!this.isLoadMore) {
             return false;
             return false;
         }
         }

@@ -38,7 +38,6 @@ body {
     display: block;
     display: block;
     width: 100%;
     width: 100%;
     height: 246px;
     height: 246px;
-    border: 1px solid yellowgreen;
     overflow: hidden;
     overflow: hidden;
 
 
     .img {
     .img {
@@ -136,7 +135,7 @@ body {
 
 
 .price-view {
 .price-view {
     position: absolute;
     position: absolute;
-    bottom: 44%;
+    bottom: 32%;
     width: 470px;
     width: 470px;
     height: 40px;
     height: 40px;
     margin-left: 20px;
     margin-left: 20px;

@@ -111,16 +111,6 @@ exports.processFilter = (list, options) => {
             name: filtersType[key].name
             name: filtersType[key].name
         });
         });
 
 
-        // 测试数据
-        // let itemList = [];
-
-        // for (let i = 0; i < 12; i++) {
-        //     itemList.push({
-        //         itemId: '1,3',
-        //         itemName: 'MEN'
-        //     });
-        // }
-
         let itemList = item.allItemList || item.itemList;
         let itemList = item.allItemList || item.itemList;
 
 
         _.forEach(itemList, (sub) => {
         _.forEach(itemList, (sub) => {