搜索相关js，css 检验

王水玲
Commit 9e78f19658aee6120457258f26c23e10be875f18 1 parent 07cef69d
Showing 15 changed files with 145 additions and 132 deletions
apps/product/controllers/list.js
apps/product/models/list.js
apps/product/models/new.js
apps/product/views/action/shop/index.hbs
config/common.js
public/js/activity/coupon.page.js
public/js/common/footer.js
public/js/product/new/newarrival.js
public/js/product/search/list.js
public/js/product/shop/shop.js
public/scss/layout/_footer.css
public/scss/product/new/_new-arrival.css
public/scss/product/shop/_shop-index.css
public/scss/product/shop/_shop-prodfile.css
utils/search-process.js
--- a/apps/product/controllers/list.js
View file @9e78f19
+++ b/apps/product/controllers/list.js
View file @9e78f19
@@ -31,6 +31,7 @@ const _formShopData = (data, shopId, isApp) => {
     if (data.decorator) {
         _.forEach(data.decorator.list, (floor) => {
             let resData = JSON.parse(floor.resourceData);
+
             floor[_.camelCase(floor.resourceName)] = true;
             // 店铺banner
@@ -61,6 +62,7 @@ const _formShopData = (data, shopId, isApp) => {
                 let brand = {
                     list: []
                 };
+
                 brandId = '';
                 // 少于2个不展示 单品店:单品店根据品牌id查询
@@ -71,7 +73,7 @@ const _formShopData = (data, shopId, isApp) => {
                     _.forEach(resData, (item) => {
                         if (item.brandDomain) {
                             brand.list.push({
-                                url: helpers.urlFormat('', '', item.brandDomain) + (isApp ? `?openby:yohobuy={"action":"go.brand","params":{"shop_id":${shopId},"brand_id":${item.id}}}` : ''),
+                                url: helpers.urlFormat('', '', item.brandDomain) + (isApp ? `?openby:yohobuy={"action":"go.brand","params":{"shop_id":${shopId},"brand_id":${item.id}}}` : ''), //eslint-disable-line
                                 img: helpers.image(item.brandIco, 640, 400),
                                 brandName: item.brandName
                             });
@@ -95,6 +97,7 @@ const _formShopData = (data, shopId, isApp) => {
                 let bannerTop = {
                     data: []
                 };
+
                 _.forEach(resData, (item) => {
                     if (item.data[0]) {
                         bannerTop.data.push({
@@ -134,7 +137,7 @@ const _formShopData = (data, shopId, isApp) => {
                 _.forEach(resData, (item) => {
                     goods.push({
-                        url: helpers.urlFormat(item.productId, item.goodsId, item.cnAlphabet) + (isApp ? `?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":${item.productSkn}}` : ''),
+                        url: helpers.urlFormat(item.productId, item.goodsId, item.cnAlphabet) + (isApp ? `?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":${item.productSkn}}` : ''),//eslint-disable-line
                         img: helpers.image(item.src, 235, 314),
                         productName: item.productName,
                         salesPrice: item.salesPrice,
@@ -155,7 +158,7 @@ const _formShopData = (data, shopId, isApp) => {
         formatData = _.assign({
             logoImg: data.shopInfo.shopLogo,
-            storeName: (data.shopInfo.isShowShopName === 'Y') ? list.shopName : '',
+            storeName: (data.shopInfo.isShowShopName === 'Y') ? data.shopInfo.shopName : '',
             collect: data.shopInfo.isFavorite === 'Y',
             url: helpers.urlFormat('', {
                 shop_id: shopId
@@ -183,12 +186,12 @@ const _formShopData = (data, shopId, isApp) => {
             }, formatData);
         } else {
             formatData = _.assign({
-                allGoods: `${helpers.urlFormat('', allGoodsParam, 'search')}&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":"' . self::$shopId . '","page":"1"}}`,
+                allGoods: `${helpers.urlFormat('', allGoodsParam, 'search')}&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":"' . self::$shopId . '","page":"1"}}`,//eslint-disable-line
                 shopIntroHref: helpers.urlFormat('/product/index/intro', {
                     shop_id: shopId,
                     app_version: isApp
                 }),
-                more_url: formatData.more_url + `?openby:yohobuy＝{"action":"go.list","params":{"shop_id":${shopId},"title":"人气单品"}}`
+                more_url: formatData.more_url + `?openby:yohobuy＝{"action":"go.list","params":{"shop_id":${shopId},"title":"人气单品"}}`//eslint-disable-line
             }, formatData);
         }
     }
@@ -240,7 +243,7 @@ const _getShopData = (req, shopId, uid, isApp) => {
     let data = {};
     let channel = req.yoho.channel;
-    return Promise.all([searchModel.getShopDecorator(shopId), searchModel.getShopInfo(shopId, uid)]).then((result) => {
+    return Promise.all([listModel.getShopDecorator(shopId), listModel.getShopInfo(shopId, uid)]).then((result) => {
         data = {
             decorator: result[0], // 店铺装修资源数据
             shopInfo: result[1] // 店铺信息
@@ -254,7 +257,7 @@ const _getShopData = (req, shopId, uid, isApp) => {
         }
         // 店铺分类
-        return searchModel.getShopCategory(shopId, channel).then((shopCategory) => {
+        return listModel.getShopCategory(shopId, channel).then((shopCategory) => {
             data = _.assign({
                 shopCategory: shopCategory
             }, data);
@@ -272,7 +275,7 @@ const _baseShop = (req, res, data) => {
         cartUrl: helpers.urlFormat('/cart/index/index')
     }, req.query);
-    Promise.all([searchModel.getShopDecorator(data.shopsId), searchModel.getShopBrands(data.shopsId)]).then((result) => {
+    Promise.all([listModel.getShopDecorator(data.shopsId), listModel.getShopBrands(data.shopsId)]).then((result) => {
         result[0] = result[0] || {};
         console.log(result[0], result[1]);
@@ -345,7 +348,7 @@ const _shop = (req, res, shopId) => {
     _getShopData(req, shopId, uid, isApp).then((result) => {
         if (result.goBrand) {
             // 跳转基础模板
-             _baseShop(req, res, result.goBrand);
+            _baseShop(req, res, result.goBrand);
         } else {
             result = _.assign(result, pageHeader);
@@ -390,7 +393,7 @@ const brand = (req, res, next) => {
         res.redirect('/?go=1');
     }
-    searchModel.getBrandLogoByDomain(domain).then((result) => {
+    listModel.getBrandLogoByDomain(domain).then((result) => {
         brandLogo = result;
         title = brandLogo.name;
@@ -407,7 +410,7 @@ const brand = (req, res, next) => {
         if (brandLogo.type === '2' && brandLogo.shopId) {
             _shop(req, res, brandLogo.shopId);
         } else { // 获取品牌店铺信息
-            searchModel.getBrandShops(brandId).then((brandShop) => {
+            listModel.getBrandShops(brandId).then((brandShop) => {
                 if (brandId === 0) {
                     params.query = domain;
                 }
@@ -415,20 +418,20 @@ const brand = (req, res, next) => {
                 // 从搜索页过来的，显示搜索框, 和进入品牌引导信息 或者品牌关联多店铺
                 if (req.query.from === 'search' || brandShop.length > 0) {
                     params = {
-                        brandWay: brandShop ?　brandShop : brandLogo,
+                        brandWay: brandShop ? brandShop : brandLogo,
                         search: {
                             default: req.query.query,
                             url: helpers.urlFormat('', null, 'search')
                         }
                     };
                 } else if (brandId !== 0) { // 品牌一览过来的展示品牌介绍和LOGO
-                    return Promise.all([searchModel.getBrandIntro(brandId, uid), searchModel.getBrandBanner(brandId)]).then((result) => {
-                        title = result[0].title;
-                        delete result[0].title;
+                    return Promise.all([listModel.getBrandIntro(brandId, uid), listModel.getBrandBanner(brandId)]).then((resData) => { //eslint-disable-line
+                        title = resData[0].title;
+                        delete resData[0].title;
                         return _.assign({
-                            banner: result[1]
-                        }, result[0]);
+                            banner: resData[1]
+                        }, resData[0]);
                     });
                 }
             }).then((brandHome) => {
@@ -455,8 +458,8 @@ const shopIntro = (req, res, next) => {
     let appVersion = req.body.appVersion || false;
     let params = {};
-    if (shopId){
-        searchModel.getShopIntro(shopId).then((result) => {
+    if (shopId) {
+        listModel.getShopIntro(shopId).then((result) => {
             if (appVersion) {
                 params = {
                     title: '店铺简介'
@@ -509,13 +512,13 @@ const favoriteBrand = (req, res, next) => {
         });
         return false;
     } else if (opt !== 'ok') { // 取消收藏
-        searchModel.setFavoriteCancel(id, uid, type).then((data) => {
+        listModel.setFavoriteCancel(id, uid, type).then((data) => {
             res.json(data);
             return false;
         }).catch(next);
     }
-    searchModel.setFavorite(id, uid, type).then((result) => {
+    listModel.setFavorite(id, uid, type).then((result) => {
         if (!result.code) { // 收藏
             result = {
                 code: 401,
--- a/apps/product/models/list.js
View file @9e78f19
+++ b/apps/product/models/list.js
View file @9e78f19
@@ -4,7 +4,6 @@
  * @date: 2016/07/21
  */
 'use strict';
-const utils = '../../../utils';
 const logger = global.yoho.logger;
 const camelCase = global.yoho.camelCase;
 const _ = require('lodash');
--- a/apps/product/models/new.js
View file @9e78f19
+++ b/apps/product/models/new.js
View file @9e78f19
@@ -38,7 +38,7 @@ const _searchGoods = (params) => {
         limit: '60'
     }, params);
-    params.order = params.order === '0' ? 's_t_desc' :'s_t_asc';
+    params.order = params.order === '0' ? 's_t_desc' : 's_t_asc';
     return api.get('', _.assign({
         method: method
@@ -52,7 +52,7 @@ const _searchGoods = (params) => {
  */
 const getNewFocus = (channel) => {
     return serviceAPI.get('operations/api/v5/resource/get', {
-        content_code: contentCode['new'][channel]
+        content_code: contentCode.new[channel]
     }, {
         cache: true
     }).then((result) => {
--- a/apps/product/views/action/shop/index.hbs
View file @9e78f19
+++ b/apps/product/views/action/shop/index.hbs
View file @9e78f19
@@ -30,9 +30,9 @@
                     <p class="store-name">{{storeName}}</p>
                     <div class="collect">
                         {{#if collect}}
-                            <div class="alreadyCollect" id="collect"></div>
+                            <div class="already-collect" id="collect"></div>
                         {{else}}
-                            <div class="notCollect buriedpoint" id="collect" data-bp-id="shop_branner_collect_1"></div>
+                            <div class="not-collect buriedpoint" id="collect" data-bp-id="shop_branner_collect_1"></div>
                         {{/if}}
                     </div>
                 </div>
--- a/config/common.js
View file @9e78f19
+++ b/config/common.js
View file @9e78f19
@@ -15,11 +15,11 @@ module.exports = {
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     domains: {
-         //api: 'http://devapi.yoho.cn:58078/',
-         //service: 'http://devservice.yoho.cn:58077/'
+         // api: 'http://devapi.yoho.cn:58078/',
+         // service: 'http://devservice.yoho.cn:58077/'
         //
-        //api: 'http://testapi.yoho.cn:28078/',
-        //service: 'http://testservice.yoho.cn:28077/'
+        // api: 'http://testapi.yoho.cn:28078/',
+        // service: 'http://testservice.yoho.cn:28077/'
         api: 'http://api.yoho.cn/',
         service: 'http://service.yoho.cn/'
--- a/public/js/activity/coupon.page.js
View file @9e78f19
+++ b/public/js/activity/coupon.page.js
View file @9e78f19
-var $ = require('yoho-jquery'),
-    phone,
+var $ = require('yoho-jquery');
+var phone,
     reg,
     orderCode = $('#orderCode').html(),
     oldUserCouponPic = $('#oldUserCouponPic').html(),
--- a/public/js/common/footer.js
View file @9e78f19
+++ b/public/js/common/footer.js
View file @9e78f19
@@ -18,7 +18,7 @@ function getQueryString(name) {
     var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
     var r = window.location.search.substr(1).match(reg);
-    if (r != null) {
+    if (r !== null) {
         return window.unescape(r[2]);
     }
     return null;
@@ -40,7 +40,7 @@ function downLoadApp() {
     }, 500);
 }
-$('#float-layer-close').on('touchend', function(e) {
+$('#float-layer-close').on('touchend', function() {
     $('#float-layer-app').hide();
     window.setCookie('_float-layer-app', 'id490655927',
         {
--- a/public/js/product/new/newarrival.js
View file @9e78f19
+++ b/public/js/product/new/newarrival.js
View file @9e78f19
@@ -24,10 +24,10 @@ var $goodsContainer = $('#goods-container'),
 var winH = $(window).height(),
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
-//默认筛选条件
+// 默认筛选条件
 var defaultOpt = require('../../common/query-param');
-var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置
+var storeOpt = $.extend({}, defaultOpt); // 存储默认筛选条件以便重置
 var now = new Date(),
     month = now.getMonth() + 1,
@@ -35,7 +35,7 @@ var now = new Date(),
 var $listNav = $('#list-nav'),
-    //导航数据信息
+    // 导航数据信息
     navInfo = {
         today: {
             reload: true,
@@ -53,10 +53,10 @@ var $listNav = $('#list-nav'),
             end: false
         }
     },
-    $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
+    $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
     searching;
-require('../../common/suspend-cart'); //悬浮购物车
+require('../../common/suspend-cart'); // 悬浮购物车
 require('../../common');
 ellipsis.init();
@@ -94,14 +94,14 @@ function search(opt) {
     if (opt) {
-        //筛选项变更则重置reload为true
+        // 筛选项变更则重置reload为true
         for (att in navInfo) {
             if (navInfo.hasOwnProperty(att)) {
                 navInfo[att].reload = true;
             }
         }
-        //处理active状态
+        // 处理active状态
         $listNav.children('.active').removeClass('active');
         $pre.addClass('active');
@@ -161,12 +161,14 @@ function search(opt) {
                     p_d: opt.id
                 };
                 break;
+            default:
+                break;
         }
-        $.extend(defaultOpt, ext); //扩展筛选项
+        $.extend(defaultOpt, ext); // 扩展筛选项
     }
-    //导航类别
+    // 导航类别
     if ($pre.hasClass('today')) {
         navType = 'today';
         dayLimit = 1;
@@ -185,7 +187,7 @@ function search(opt) {
         page = 1;
     } else if (nav.end) {
-        //不需要重新加载并且数据请求结束
+        // 不需要重新加载并且数据请求结束
         return;
     }
@@ -215,6 +217,8 @@ function search(opt) {
                 case 'sale':
                     $container = $dgc;
                     break;
+                default:
+                    break;
             }
             if (data === ' ') {
@@ -230,7 +234,7 @@ function search(opt) {
                     num = $container.find('.good-info').length;
                     $container.append(data);
-                    //lazy good-infos who append in
+                    // lazy good-infos who append in
                     lazyLoad($container.find('.good-info:gt(' + (num - 1) + ') .lazy'));
                 }
@@ -267,12 +271,12 @@ $.ajax({
     success: function(data) {
         $goodsContainer.append(data);
-        //初始化filter&注册filter回调
+        // 初始化filter&注册filter回调
         filter.initFilter({
             fCbFn: search,
             hCbFn: function() {
-                //切换active状态到$pre上
+                // 切换active状态到$pre上
                 $pre.addClass('active');
                 $pre.siblings('.filter').removeClass('active');
             }
@@ -281,16 +285,16 @@ $.ajax({
 });
 lazyLoad($('.lazy'));
-$listNav.bind('contextmenu', function(e) {
+$listNav.bind('contextmenu', function() {
     return false;
 });
-//导航栏点击逻辑说明：
-//1.点击非active项时切换active状态
-//2.价格和折扣active状态时继续点击切换排序
-//3.筛选无active时点击展开筛选面板
-//4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
-//5.当前active为筛选并且点击其他项时，隐藏筛选面板
+// 导航栏点击逻辑说明：
+// 1.点击非active项时切换active状态
+// 2.价格和折扣active状态时继续点击切换排序
+// 3.筛选无active时点击展开筛选面板
+// 4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
+// 5.当前active为筛选并且点击其他项时，隐藏筛选面板
 // navHammer = new Hammer($listNav[0]);
 $listNav.on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li'),
@@ -301,11 +305,11 @@ $listNav.on('touchend touchcancel', function(e) {
     e.preventDefault();
     if ($this.hasClass('filter')) {
-        //筛选面板切换状态
+        // 筛选面板切换状态
         if ($this.hasClass('active')) {
             filter.hideFilter();
-            //点击筛选钱的active项回复active
+            // 点击筛选钱的active项回复active
             $pre.addClass('active');
             $this.removeClass('active');
         } else {
@@ -331,15 +335,15 @@ $listNav.on('touchend touchcancel', function(e) {
             $active = $this.siblings('.active');
-            $pre = $this; //$pre为除筛选导航的其他导航项，若当前active的为筛选，则把$pre置为当前点击项
+            $pre = $this; // $pre为除筛选导航的其他导航项，若当前active的为筛选，则把$pre置为当前点击项
             if ($active.hasClass('filter')) {
-                //若之前active项为筛选，则隐藏筛选面板
+                // 若之前active项为筛选，则隐藏筛选面板
                 filter.hideFilter();
             } else {
-                //切换container显示
+                // 切换container显示
                 $goodsContainer.children('.container:not(.hide)').addClass('hide');
                 switch (navType) {
@@ -354,9 +358,11 @@ $listNav.on('touchend touchcancel', function(e) {
                     case 'sale':
                         $dgc.removeClass('hide');
                         break;
+                    default:
+                        break;
                 }
-                //重置筛选项
+                // 重置筛选项
                 filter.resetFilter();
                 defaultOpt = $.extend({}, storeOpt);
             }
@@ -374,7 +380,7 @@ $listNav.on('touchend touchcancel', function(e) {
 function scrollHandler() {
-    //当scroll到1/4$goodsContainer高度后继续请求下一页数据
+    // 当scroll到1/4$goodsContainer高度后继续请求下一页数据
     if ($(window).scrollTop() + winH >
         $(document).height() - 0.25 * $goodsContainer.height() - 50) {
         if ($pre !== undefined) {
@@ -383,15 +389,15 @@ function scrollHandler() {
     }
 }
-//srcoll to load more
+// srcoll to load more
 $(window).scroll(function() {
     window.requestAnimationFrame(scrollHandler);
 });
-//初始请求最新第一页数据
+// 初始请求最新第一页数据
 search();
-$listNav.on('touchstart', 'li', function(e) {
+$listNav.on('touchstart', 'li', function() {
     $(this).addClass('bytouch');
 }).on('touchend touchcancel', function() {
     $listNav.find('li').removeClass('bytouch');
--- a/public/js/product/search/list.js
View file @9e78f19
+++ b/public/js/product/search/list.js
View file @9e78f19
@@ -33,7 +33,7 @@ var $input = $('#search-input input'),
     $buriedpoint = $('.buriedpoint'),
     $search = $('#search');
-var shopId, sort, brand, outlets;
+var shopId, sort, brand, outlets, ageLevel;
 // 默认筛选条件
 var defaultOpt = require('../../common/query-param');
@@ -155,7 +155,7 @@ function getQueryString(name) {
 shopId = getQueryString('shop_id');
 sort = getQueryString('sort');
 outlets = getQueryString('outlets');
-age_level = outlets = getQueryString('ageLevel');
+ageLevel = outlets = getQueryString('ageLevel');
 /**
  * 筛选注册的回调，筛选子项点击后逻辑
@@ -277,8 +277,8 @@ function search(opt) {
         params.shop_id = shopId;
     }
-    if (age_level) {
-        params.age_level = age_level;
+    if (ageLevel) {
+        params.age_level = ageLevel;
     }
     if (sort) {
@@ -494,6 +494,8 @@ $listNav.on('touchend touchcancel', function(e) {
                     case 'discount':
                         $dgc.removeClass('hide');
                         break;
+                    default:
+                        break;
                 }
             }
--- a/public/js/product/shop/shop.js
View file @9e78f19
+++ b/public/js/product/shop/shop.js
View file @9e78f19
@@ -5,16 +5,14 @@
 var $ = require('yoho-jquery'),
     IScroll = require('yoho-iscroll/build/iscroll-probe'),
     lazyLoad = require('yoho-jquery-lazyload'),
-    Swiper = require('yoho-swiper'),
-    bannerSwiper,
+    Swiper = require('yoho-swiper');
+var bannerSwiper,
     multiSwiper,
     myScroll,
     imgH,
     nav1H,
     main1H,
     main1oH,
-    nav2H,
-    main2oH,
     scH,
     $nav1 = $('#pos-nav'),
     $nav2 = $('#pos-list'),
@@ -304,6 +302,8 @@ myScroll.on('scroll', function() {
                 };
                 hotData(scrollCall);
                 break;
+            default:
+                break;
         }
     }
@@ -380,8 +380,6 @@ $(window).load(function() {
     nav1H = $('#nav').outerHeight();
     main1H = $('#nav-main').height();
     main1oH = $('#nav-main').outerHeight();
-    nav2H = $('#list-nav').outerHeight();
-    main2oH = $('#goods-container').outerHeight();
     setTimeout(function() {
         scH = $('#scroller').outerHeight();
     }, 1000);
@@ -460,6 +458,8 @@ function search(opt) {
                         age_level: opt.id
                     };
                     break;
+                default:
+                    break;
             }
             $.extend(defaultOpt, ext); // 扩展筛选项
         }
@@ -517,6 +517,8 @@ function search(opt) {
                 case 'discount':
                     $container = $dgc;
                     break;
+                default:
+                    break;
             }
             if (data === '') {
@@ -565,7 +567,7 @@ function getQueryString(name) {
     var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
     var r = window.location.search.substr(1).match(reg);
-    if (r != null) {
+    if (r !== null) {
         return window.unescape(r[2]);
     }
     return null;
@@ -602,7 +604,7 @@ $.ajax({
     }
 });
-$listNav.bind('contextmenu', function(e) {
+$listNav.bind('contextmenu', function() {
     return false;
 });
@@ -682,6 +684,8 @@ $subNav.on('touchend touchcancel', function(e) {
                     case 'discount':
                         $dgc.removeClass('hide');
                         break;
+                    default:
+                        break;
                 }
             }
@@ -711,6 +715,8 @@ $subNav.on('touchend touchcancel', function(e) {
                     case 'discount':
                         $dgc.removeClass('hide');
                         break;
+                    default:
+                        break;
                 }
             }
@@ -763,14 +769,14 @@ search({
     nextPage: false
 });
-$listNav.on('touchstart', 'li', function(e) {
+$listNav.on('touchstart', 'li', function() {
     $(this).addClass('bytouch');
 }).on('touchend touchcancel', function() {
     $listNav.find('li').removeClass('bytouch');
     myScroll.refresh();
 });
-$nav2.on('touchstart', 'li', function(e) {
+$nav2.on('touchstart', 'li', function() {
     $(this).addClass('bytouch');
 }).on('touchend touchcancel', function() {
     $nav2.find('li').removeClass('bytouch');
@@ -806,7 +812,7 @@ $collect.on('touchstart', function() {
     searching = true;
-    if ($collect.hasClass('alreadyCollect')) {
+    if ($collect.hasClass('already-collect')) {
         opt = 'cancel';
     } else {
         opt = 'ok';
@@ -822,11 +828,13 @@ $collect.on('touchstart', function() {
             type: 'shop'
         },
         success: function(data) {
+            var url = '';
+
             if (data.code === 200) {
-                if ($collect.hasClass('alreadyCollect')) {
-                    $collect.attr('class', 'notCollect');
+                if ($collect.hasClass('already-collect')) {
+                    $collect.attr('class', 'not-collect');
                 } else {
-                    $collect.attr('class', 'alreadyCollect');
+                    $collect.attr('class', 'already-collect');
                 }
             }
--- a/public/scss/layout/_footer.css
View file @9e78f19
+++ b/public/scss/layout/_footer.css
View file @9e78f19
@@ -110,7 +110,7 @@
         position: absolute;
         left: 0;
         top: 0;
-        color: #C0C0C0;
+        color: #c0c0c0;
         z-index: 2;
     }
 }
@@ -131,15 +131,15 @@
     &:visited,
     &:hover,
     &:active {
-         color: #000;
-     }
+        color: #000;
+    }
 }
 .circle-rightbottom {
     position: absolute;
     width: 25PX;
-    height: 0PX;
+    height: 0;
     border: 0 solid #323232;
     border-bottom: 25PX solid #323232;
-    border-radius: 0 0 25PX 0;
+    border-radius: 0 0 25PX;
 }
--- a/public/scss/product/new/_new-arrival.css
View file @9e78f19
+++ b/public/scss/product/new/_new-arrival.css
View file @9e78f19
 .newarrival-page {
     background-color: #fff;
-     .swiper-container {
+    .swiper-container {
         width: 100%;
         height: 310px;
@@ -25,19 +25,19 @@
         height: 200px;
     }
-    .swiper-slide{
+    .swiper-slide {
         width: 100%;
         height: 200px;
         img {
-           display: block;
-           height: 100%;
-           width: 100%;
+            display: block;
+            height: 100%;
+            width: 100%;
         }
     }
     .list-nav {
-        border-top:2px solid #fff;
-        border-bottom:1px solid #e6e6e6;
+        border-top: 2px solid #fff;
+        border-bottom: 1px solid #e6e6e6;
         > li {
             float: left;
@@ -48,8 +48,8 @@
             font-size: 28px;
             color: #999;
         }
-        .bytouch{
-            background:#eee;
+        .bytouch {
+            background: #eee;
         }
         a {
             display: inline-block;
@@ -61,14 +61,14 @@
         .active > a {
             color: #000;
-            box-sizing:border-box;
+            box-sizing: border-box;
         }
         .active > .iconfont {
+            color: #000;
+            &.cur {
                 color: #000;
-                &.cur {
-                    color: #000;
-                }
             }
+        }
         .filter .iconfont {
             font-size: 24px;
--- a/public/scss/product/shop/_shop-index.css
View file @9e78f19
+++ b/public/scss/product/shop/_shop-index.css
View file @9e78f19
@@ -47,19 +47,19 @@
         background-size: contain;
     }
-    .alreadyCollect{
+    .already-collect {
         width: 128px;
         height: 50px;
         border-radius: 10px;
-        background-image: url('/product/already-collect.png') no-repeat;
+        background-image: url("/product/already-collect.png") no-repeat;
         background-size: contain;
     }
-    .notCollect{
+    .not-collect {
         width: 128px;
         height: 50px;
         border-radius: 10px;
-        background-image: url('/product/not-collect.png') no-repeat;
+        background-image: url("/product/not-collect.png") no-repeat;
         background-size: contain;
     }
@@ -78,7 +78,7 @@
         border-sizing: border-box;
         border-bottom: 1px solid #e1e1e1;
-        li{
+        li {
             color: #b1b1b1;
             display: block;
             height: 28px;
@@ -128,7 +128,6 @@
         img {
             width: 245px;
             height: 120px;
-            vertical-align: top;
             margin-left: 30px;
             float: left;
         }
@@ -246,11 +245,11 @@
     .list-price {
         height: 60px;
         background: #aaaeac;
-        color: #FFFFFF;
+        color: #fff;
         font-size: 22px;
         margin-top: -60px;
         position: relative;
-        opacity: 0.90;
+        opacity: 0.9;
         padding-left: 15px;
         p {
@@ -315,16 +314,16 @@
         .new:after {
             height: 28px;
-            content: '';
+            content: "";
             border-left: 1px solid #e1e1e1;
             position: absolute;
             top: 25px;
             left: 163px;
-            }
+        }
         .price:after {
-                height: 28px;
-            content: '';
+            height: 28px;
+            content: "";
             border-left: 1px solid #e1e1e1;
             position: absolute;
             top: 25px;
@@ -333,7 +332,7 @@
         .discount:after {
             height: 28px;
-            content: '';
+            content: "";
             border-left: 1px solid #e1e1e1;
             position: absolute;
             top: 25px;
@@ -346,8 +345,8 @@
             }
         }
-       .list-nav .icon .up {
-                top: -28px;
+        .list-nav .icon .up {
+            top: -28px;
         }
         .list-nav .icon .down {
@@ -379,7 +378,6 @@
         background: #fff;
         border-top: 1px solid #eaeaea;
-
         ul {
             display: table-row;
         }
@@ -394,7 +392,6 @@
                 margin-top: 30px;
                 float: right;
                 border-right: 1px solid #eaeaea;
-                display: inline-block;
             }
         }
@@ -430,7 +427,7 @@
             position: absolute;
             width: 100%;
             height: 14px;
-            background: resolve('product/sharp.png') no-repeat center center;
+            background: resolve("product/sharp.png") no-repeat center center;
         }
         .foot-list-3 .sub-group {
@@ -439,8 +436,8 @@
         }
     }
-    .bytouch{
-        background:#eee;
+    .bytouch {
+        background: #eee;
     }
     .new-arrival {
@@ -486,14 +483,14 @@
                 height: 100%;
                 color: #999;
-            b {
-                height: 28px;
+                b {
+                    height: 28px;
                     border-left: 1px solid #e1e1e1;
-                float: right;
-                margin-top: 25px;
+                    float: right;
+                    margin-top: 25px;
+                }
             }
         }
-        }
         .active .cur {
             color: #000;
@@ -503,7 +500,6 @@
             color: #000;
         }
-
         .new .iconfont {
             transform: scale(0.8);
             font-weight: bold;
@@ -541,7 +537,7 @@
     }
     .category-list-only-one-row {
-        border-top: none!important;
+        border-top: none !important;
     }
     .category-list-last-full-row {
--- a/public/scss/product/shop/_shop-prodfile.css
View file @9e78f19
+++ b/public/scss/product/shop/_shop-prodfile.css
View file @9e78f19
@@ -8,10 +8,10 @@
     }
     .descripition {
-        margin: 40px 20px 0px 20px;
+        margin: 40px 20px 0;
         font-size: 22px;
         line-height: 36px;
-        padding: 40px 20px 40px 20px;
+        padding: 40px 20px;
         border-top: 1px solid #e6e6e6;
         border-bottom: 1px solid #e6e6e6;
         text-indent: 2em;
@@ -26,7 +26,7 @@
     }
     .sign-icon > span {
-        width:auto;
+        width: auto;
     }
 }
@@ -38,7 +38,6 @@
         text-align: left;
         height: 90px;
         line-height: 90px;
-        vertical-align:middle;
         display: block;
         width: 100%;
     }
--- a/utils/search-process.js
View file @9e78f19
+++ b/utils/search-process.js
View file @9e78f19
@@ -7,7 +7,7 @@
 /**
  * 根据频道判断出性别
  */
-const getGenderByChannel =(channel) => {
+const getGenderByChannel = (channel) => {
     channel = channel ? channel : 'boys';
     switch (channel) {