Merge branch 'release/1.0'

xuqi
Commit 5e9fa599f73eac5641251802bb4527534b6a80a9 2 parents bbcf1176 0548c2fa
Showing 39 changed files with 189 additions and 134 deletions
apps/brand/controllers/brand.js
apps/editorial/controllers/editorial.js
apps/editorial/models/editorial.js
apps/editorial/views/action/detail.hbs
apps/editorial/views/partial/comment.hbs
apps/editorial/views/partial/msg.hbs
apps/me/controllers/favorite.js
apps/me/router.js
apps/me/views/partial/collection/brand.hbs
apps/me/views/partial/collection/editorial.hbs
apps/me/views/partial/order/detail/info-box.hbs
apps/product/models/shop-service.js
apps/product/views/action/item.hbs
apps/product/views/partial/item/size-table.hbs
apps/product/views/partial/list/goods-box.hbs
apps/product/views/partial/list/order-area.hbs
config/common.js
doraemon/middleware/auth.js
doraemon/views/partial/header.hbs
doraemon/views/partial/nav-menu.hbs
--- a/apps/brand/controllers/brand.js
View file @5e9fa59
+++ b/apps/brand/controllers/brand.js
View file @5e9fa59
@@ -13,16 +13,16 @@ const brand = require('../models/brand');
  * @param res
  */
 const index = (req, res, next) => {
-    let channel = req.cookies._Channel || '301';
+    let channel = req.cookies._Channel || 'men';
     let contentCode = '';
     let name = '';
     let link = '';
-    if (channel === '302') {
+    if (channel === 'women') {
         contentCode = '527079e6c46d0f125eb46b835968971b';
         name = 'WOMEN首页';
         link = 'http://www.yohoblk.com/women';
-    } else if (channel === '303') {
+    } else if (channel === 'lifestyle') {
         contentCode = '94b5ed607b6d565ffc29c2c04be121dc';
         name = 'LIFT STYLE首页';
         link = 'http://www.yohoblk.com/lifestyle';
--- a/apps/editorial/controllers/editorial.js
View file @5e9fa59
+++ b/apps/editorial/controllers/editorial.js
View file @5e9fa59
@@ -20,16 +20,16 @@ const index = (req, res, next) => {
     let limit = req.query.limit || 20;
     let appType = 1;
     let udid = md5(req.ip);
-    let channel = req.cookies._Channel || '301';
+    let channel = req.cookies._Channel || 'men';
     let gender = '';
     let name = '';
     let link = '';
-    if (channel === '301') {
+    if (channel === 'men') {
         gender = '1,3';
         name = 'MEN首页';
         link = 'http://www.yohoblk.com';
-    } else if (channel === '302') {
+    } else if (channel === 'women') {
         gender = '2,3';
         name = 'WOMEN首页';
         link = 'http://www.yohoblk.com/women';
@@ -85,17 +85,17 @@ const list = (req, res) => {
     let tag = req.query.query;
     let authorId = req.query.authorId;
     let udid = md5(req.ip);
-    let channel = req.cookies._Channel || '301';
+    let channel = req.cookies._Channel || 'men';
     let gender = '';
     let name = '';
     let link = '';
     let appType = 1;
-    if (channel === '301') {
+    if (channel === 'men') {
         gender = '1,3';
         name = 'MEN首页';
         link = 'http://www.yohoblk.com';
-    } else if (channel === '302') {
+    } else if (channel === 'women') {
         gender = '2,3';
         name = 'WOMEN首页';
         link = 'http://www.yohoblk.com/women';
@@ -156,14 +156,14 @@ const detail = (req, res, next) => {
     let appType = 1;
     let uid = req.user.uid;
     let udid = md5(req.ip);
-    let channel = req.cookies._Channel || '301';
+    let channel = req.cookies._Channel || 'men';
     let name = '';
     let link = '';
-    if (channel === '301') {
+    if (channel === 'men') {
         name = 'MEN首页';
         link = 'http://www.yohoblk.com';
-    } else if (channel === '302') {
+    } else if (channel === 'women') {
         name = 'WOMEN首页';
         link = 'http://www.yohoblk.com/women';
     } else {
--- a/apps/editorial/models/editorial.js
View file @5e9fa59
+++ b/apps/editorial/models/editorial.js
View file @5e9fa59
@@ -53,8 +53,6 @@ const _processListData = (list) => {
     return listData;
 };
-
-
 /**
  * 首页、列表页列表相关
  * @param  type
@@ -121,7 +119,7 @@ const getListData = (appType, pageNum, limit, udid, gender, tag, authorId) => {
  */
 const _getAuthorData = (id) => {
-    return serviceAPI.get('/guang/service/*/author/getAuthor', {
+    return serviceAPI.get('guang/service/*/author/getAuthor', {
         author_id: id
     }).then((result) => {
         if (result && result.code === 200) {
@@ -182,7 +180,6 @@ const _processHeadData = (list) => {
             }
-
             if (index === 2) {
                 newData.headData = _.assign(newData.headData, {
                     commentNum: data.total
@@ -358,7 +355,7 @@ const _getHeadData = (id, appType, uid, udid) => {
         par.udid = udid;
     }
-    return serviceAPI.get('/guang/api/*/article/getArticleBaseInfo', par).then((result) => {
+    return serviceAPI.get('guang/api/*/article/getArticleBaseInfo', par).then((result) => {
         if (result && result.code === 200) {
             return result.data;
         } else {
@@ -374,7 +371,7 @@ const _getHeadData = (id, appType, uid, udid) => {
  * @returns {*}
  */
 const _getContentData = (id) => {
-    return serviceAPI.get('/guang/service/*/article/getArticleContent', {
+    return serviceAPI.get('guang/service/*/article/getArticleContent', {
         article_id: id
     }).then((result) => {
         if (result && result.code === 200) {
@@ -392,7 +389,7 @@ const _getContentData = (id) => {
  * @returns {*}
  */
 const _getArticleData = (id) => {
-    return serviceAPI.get('/guang/service/v2/article/getArticle', {
+    return serviceAPI.get('guang/service/v2/article/getArticle', {
         article_id: id
     }).then((result) => {
         if (result && result.code === 200) {
@@ -410,7 +407,7 @@ const _getArticleData = (id) => {
  * @returns {*}
  */
 const _getCommentsData = (id) => {
-    return serviceAPI.get('/guang/api/*/comments/getList', {
+    return serviceAPI.get('guang/api/*/comments/getList', {
         article_id: id
     }).then((result) => {
         if (result && result.code === 200) {
@@ -457,7 +454,7 @@ const _getRelateBrand = (id) => {
  * @returns {*}
  */
 const _getArticlePre = (id, appType) => {
-    return serviceAPI.get('/guang/api/*/article/getArticlePre', {
+    return serviceAPI.get('guang/api/*/article/getArticlePre', {
         id: id,
         app_type: appType
     }).then((result) => {
@@ -491,7 +488,7 @@ const _getArticlePre = (id, appType) => {
  * @returns {*}
  */
 const _getArticleNext = (id, appType) => {
-    return serviceAPI.get('/guang/api/*/article/getArticleNext', {
+    return serviceAPI.get('guang/api/*/article/getArticleNext', {
         id: id,
         app_type: appType
     }).then((result) => {
@@ -534,7 +531,7 @@ const setCollect = (id, uid, appType) => {
             message: '未登录'
         });
     }
-    return serviceAPI.get('/guang/api/*/favorite/setFavorite', {
+    return serviceAPI.get('guang/api/*/favorite/setFavorite', {
         article_id: id,
         uid: uid,
         app_type: appType
@@ -554,7 +551,7 @@ const cancelCollect = (id, uid, appType) => {
             message: '未登录'
         });
     }
-    return serviceAPI.get('/guang/api/*/favorite/cancelFavorite', {
+    return serviceAPI.get('guang/api/*/favorite/cancelFavorite', {
         article_id: id,
         uid: uid,
         app_type: appType
@@ -569,7 +566,7 @@ const cancelCollect = (id, uid, appType) => {
  */
 const setPraise = (id, udid, appType) => {
-    return serviceAPI.get('/guang/api/v2/praise/setPraise', {
+    return serviceAPI.get('guang/api/v2/praise/setPraise', {
         article_id: id,
         udid: udid,
         app_type: appType
@@ -584,7 +581,7 @@ const setPraise = (id, udid, appType) => {
  */
 const cancelPraise = (id, udid, appType) => {
-    return serviceAPI.get('/guang/api/v2/praise/cancel', {
+    return serviceAPI.get('guang/api/v2/praise/cancel', {
         article_id: id,
         udid: udid,
         app_type: appType
@@ -605,7 +602,7 @@ const addComment = (id, uid, comment) => {
             message: '未登录'
         });
     }
-    return serviceAPI.get('/guang/api/*/comments/add', {
+    return serviceAPI.get('guang/api/*/comments/add', {
         article_id: id,
         uid: uid,
         content: comment
@@ -613,7 +610,7 @@ const addComment = (id, uid, comment) => {
 };
 const shareData = () => {
-    return serviceAPI.get('/guang/api/*/share/guang', {}).then((result) => {
+    return serviceAPI.get('guang/api/*/share/guang', {}).then((result) => {
         if (result && result.code === 200) {
             return camelCase(result.data);
         } else {
--- a/apps/editorial/views/action/detail.hbs
View file @5e9fa59
+++ b/apps/editorial/views/action/detail.hbs
View file @5e9fa59
@@ -18,9 +18,9 @@
                 <a class="author-name" href="{{authorUrl}}">{{name}}</a>
             </div>
             <div class="article-status">
-                <span class="article-time font">{{time}}</span>
-                <span class="article-browse font">浏览：{{click}}</span>
-                <span class="article-comments font">评论：{{commentNum}}</span>
+                <span class="article-time brown-light">{{time}}</span>
+                <span class="article-browse">浏览：<b class=" brown-light">{{click}}</b></span>
+                <span class="article-comments">评论：<b class="brown-light">{{commentNum}}</b></span>
             </div>
         </div>
         {{/ header}}
--- a/apps/editorial/views/partial/comment.hbs
View file @5e9fa59
+++ b/apps/editorial/views/partial/comment.hbs
View file @5e9fa59
@@ -15,7 +15,7 @@
                 </div>
                 <div class="comment-info">
                     <p class="comment-content">{{content}}</p>
-                    <p class="comment-time font">{{createTime}}</p>
+                    <p class="comment-time brown-light">{{createTime}}</p>
                 </div>
             </li>
             {{/ list}}
--- a/apps/editorial/views/partial/msg.hbs
View file @5e9fa59
+++ b/apps/editorial/views/partial/msg.hbs
View file @5e9fa59
 <div class="content-msg clearfix" data-id="{{id}}">
-    <div class="msg-left"><i class="iconfont">&#xe606;</i> <span class="time-word font">{{publishTime}}</span></div>
+    <div class="msg-left"><i class="iconfont">&#xe606;</i> <span class="time-word font brown-light">{{publishTime}}</span></div>
     <div class="msg-right">
         <a class="msg-title" href="/editorial/{{id}}.html" target="_blank">{{title}}</a>
         <a href="/editorial/{{id}}.html" target="_blank">
@@ -9,7 +9,7 @@
         <div class="msg-app">
             <span class="like-comment">
                 <i class="iconfont like-icon {{#if isPraise}}liked{{/if}}">&#xe60e;</i>
-                <b class="like-num font">{{praiseNum}}</b>
+                <b class="like-num brown-light font">{{praiseNum}}</b>
             </span>
         </div>
     </div>
--- a/apps/me/controllers/favorite.js
View file @5e9fa59
+++ b/apps/me/controllers/favorite.js
View file @5e9fa59
@@ -196,6 +196,12 @@ const favorite = {
                     editorialList: data.data
                 };
+                _.forEach(retData.editorialList, function(val) {
+                    val.publishTime = val.publishTime.replace(/年|月/g, '/');
+                    val.publishTime = val.publishTime.replace(/日/g, '');
+                });
+
+
                 retData.total = data.total;
                 retData.paginationData = {
                     page: page,
@@ -227,6 +233,27 @@ const favorite = {
         }).catch(next);
     },
+    // 取消商品、店铺收藏
+    cancelMulti(req, res, next) {
+        let shops = req.body.shops;
+        let brands = req.body.brands;
+        let uid = req.user.uid;
+
+        let promises = [];
+
+        if (shops) {
+            promises.push(FavoriteData.cancelFavorite(uid, shops, 'shop'));
+        }
+
+        if (brands) {
+            promises.push(FavoriteData.cancelFavorite(uid, brands, 'brand'));
+        }
+
+        Promise.all(promises).then(() => {
+            res.json({code: 200});
+        }).catch(next);
+    },
+
     // 取消资讯收藏
     editorialCancel(req, res, next) {
         let ids = req.body.ids;
--- a/apps/me/router.js
View file @5e9fa59
+++ b/apps/me/router.js
View file @5e9fa59
@@ -92,6 +92,7 @@ router.get('/collection', auth, favorite.goods);
 router.get('/collection/brand', auth, favorite.brand);
 router.get('/collection/editorial', auth, favorite.editorial);
 router.post('/collection/cancel', auth, favorite.cancel);
+router.post('/collection/cancel/multi', auth, favorite.cancelMulti);
 router.post('/collection/editorial/cancel', auth, favorite.editorialCancel);
 module.exports = router;
--- a/apps/me/views/partial/collection/brand.hbs
View file @5e9fa59
+++ b/apps/me/views/partial/collection/brand.hbs
View file @5e9fa59
@@ -9,7 +9,7 @@
                         <div class="check">
                             {{> icon/checkbox}}
                         </div>
-                        <div class="brand-info" data-id="{{brandId}}">
+                        <div class="brand-info" data-id="{{brandId}}" data-type="{{brandOrShopType}}">
                             <div class="brand-icon">
                                 <img src="{{image brandIco 145 126}}" alt="" width="145" height="126">
                             </div>
--- a/apps/me/views/partial/collection/editorial.hbs
View file @5e9fa59
+++ b/apps/me/views/partial/collection/editorial.hbs
View file @5e9fa59
@@ -23,9 +23,9 @@
                             </div>
                             <div class="editorial-some">
                                 <span class="author">{{author.name}}</span>
-                                <span class="time">{{publishTime}}</span>
-                                <span>浏览: {{viewsNum}}</span>
-                                <span>评论: {{praiseNum}}</span>
+                                <span class="time brown-light">{{publishTime}}</span>
+                                <span>浏览: <b class="brown-light">{{viewsNum}}</b></span>
+                                <span>评论: <b class="brown-light">{{praiseNum}}</b></span>
                             </div>
                             <p class="summer">
                                 {{intro}}
--- a/apps/me/views/partial/order/detail/info-box.hbs
View file @5e9fa59
+++ b/apps/me/views/partial/order/detail/info-box.hbs
View file @5e9fa59
@@ -17,19 +17,13 @@
 <div class="info-box">
     <h4 class="status-title">发票信息</h4>
-    {{#if invoice}}
     {{# invoice}}
-    {{#if showInvoice}}
-    <p class="text">发票类型：{{typeText}}</p>
-    <p class="text">发票抬头：{{title}}</p>
-    <p class="text">发票内容：{{contentValue}}</p>
+        <p class="text">发票类型：{{typeText}}</p>
+        <p class="text">发票抬头：{{title}}</p>
+        <p class="text">发票内容：{{contentValue}}</p>
     {{^}}
-    <p class="text">暂不需要发票</p>
-    {{/if}}
+        <p class="text">暂不需要发票</p>
     {{/ invoice}}
-    {{^}}
-    <p class="text">暂不需要发票</p>
-    {{/if}}
 </div>
 {{#if remark}}
--- a/apps/product/models/shop-service.js
View file @5e9fa59
+++ b/apps/product/models/shop-service.js
View file @5e9fa59
@@ -136,12 +136,11 @@ const ShopService = {
             if (info.shopId) {
                 let shopIntro = yield ShopService.getShopIntro(info.shopId, uid);
-                let brandInfo = yield BrandService.getBrandInfo(info.brandId, uid);
                 info.name = shopIntro.shopName;
                 info.info = shopIntro.shopIntro;
                 info.btnName = '品牌介绍';
-                info.isFavorite = brandInfo.isFavorite === 'Y';
+                info.isFavorite = shopIntro.isFavorite === 'Y';
                 info.showShopName = shopIntro.isShowShopName === 'Y';
                 let shopData = yield Promise.all([ShopService.getShopDecorator(info.shopId),
--- a/apps/product/views/action/item.hbs
View file @5e9fa59
+++ b/apps/product/views/action/item.hbs
View file @5e9fa59
@@ -133,7 +133,7 @@
                                 {{/if}}
                                 {{#if addToBag}}
                                     <span id="add-to-bag" class="btn">
-                                        <i class="iconfont">&#xe632;</i>
+                                        <i class="iconfont">&#xe64b;</i>
                                         加入购物袋
                                     </span>
                                 {{/if}}
--- a/apps/product/views/partial/item/size-table.hbs
View file @5e9fa59
+++ b/apps/product/views/partial/item/size-table.hbs
View file @5e9fa59
@@ -5,7 +5,7 @@
                 <th width="{{width}}">
                     {{name}}
                     {{#if doubt}}
-                        <span class="show-img"></span>
+                        <span class="iconfont show-img">&#xe64d;</span>
                     {{/if}}
                 </th>
             {{/ thead}}
--- a/apps/product/views/partial/list/goods-box.hbs
View file @5e9fa59
+++ b/apps/product/views/partial/list/goods-box.hbs
View file @5e9fa59
@@ -3,7 +3,7 @@
         <div class="goods" data-id="{{productId}}" data-url="{{url}}">
             <div class="goods-img">
                 <a href="{{url}}" target="_blank">
-                    <img class="lazy" data-original="{{image defaultImages 267 354}}" width="267" height="354" alt="">
+                    <img class="lazy" data-original="{{image defaultImages 263 351}}" width="263" height="351" alt="">
                 </a>
             </div>
             {{#if showBrand}}
@@ -22,7 +22,7 @@
             </div>
             <div class="goods-list hide">
                 {{#each goodsList}}
-                    <i data-url="{{url}}">{{image imagesUrl 267 354}}</i>
+                    <i data-url="{{url}}">{{image imagesUrl 263 351}}</i>
                 {{/each}}
             </div>
         </div>
--- a/apps/product/views/partial/list/order-area.hbs
View file @5e9fa59
+++ b/apps/product/views/partial/list/order-area.hbs
View file @5e9fa59
@@ -14,14 +14,22 @@
         </label>
         <label class="page-info"><span class="cur-page">{{page}}</span>/<span class="total-page">{{pageTotal}}</span></label>
         {{#isEqual page 1}}
-        <span class="iconfont page disable page-pre">&#xe607;</span>
+        <div class="page disable page-pre">
+            <span class="iconfont">&#xe607;</span>
+        </div>
         {{^}}
-        <span class="iconfont page page-pre">&#xe607;</span>
+        <div class="page page-pre">
+            <span class="iconfont ">&#xe607;</span>
+        </div>
         {{/isEqual}}
         {{#isEqual page pageTotal}}
-        <span class="iconfont page disable page-next">&#xe61e;</span>
+        <div class="page disable page-next">
+            <span class="iconfont">&#xe61e;</span>
+        </div>
         {{^}}
-        <span class="iconfont page page-next">&#xe61e;</span>
+        <div class="page page-next">
+            <span class="iconfont">&#xe61e;</span>
+        </div>
         {{/isEqual}}
     </div>
     {{/paginationData}}
--- a/config/common.js
View file @5e9fa59
+++ b/config/common.js
View file @5e9fa59
@@ -63,7 +63,7 @@ module.exports = {
         udp: { // send by udp
             measurement: 'yohoblk_pc_log',
             level: 'debug', // logger level
-            host: '54.222.219.223', // influxdb host
+            host: 'influxdblog.yohoops.org', // influxdb host
             port: '4444' // influxdb port
         },
         console: {
@@ -99,7 +99,7 @@ if (isProduction) {
     Object.assign(module.exports, {
         appName: 'www.yohoblk.com',
         domains: {
-            singleApi: 'http://api_single.yoho.cn/',
+            singleApi: 'http://single.yoho.cn/',
             api: 'http://api.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
             search: 'http://search.yohoops.org/yohosearch/'
--- a/doraemon/middleware/auth.js
View file @5e9fa59
+++ b/doraemon/middleware/auth.js
View file @5e9fa59
@@ -13,7 +13,7 @@ module.exports = (req, res, next) => {
     let refer = '';
     if (req.method === 'GET') {
-        refer = req.getUrl();
+        refer = `${req.protocol}://${req.hostname}${req.originalUrl}`;
     } else {
         refer = req.get('Referer');
     }
--- a/doraemon/views/partial/header.hbs
View file @5e9fa59
+++ b/doraemon/views/partial/header.hbs
View file @5e9fa59
@@ -31,7 +31,7 @@
                     <a href="{{../siteUrl}}/help">帮助中心</a>
                 </li>
                 <li class="tag-phone">
-                    <span class="tools-icon icon-phone"></span>
+                    <span class="iconfont tools-icon icon-phone">&#xe649;</span>
                     手机版
                     <div class="down-app-box sub-wrapper">
                         <div class="down-qr"></div>
@@ -41,9 +41,7 @@
                 </li>
                 <li class="tag-bag">
                     <a href="{{../siteUrl}}/shopping/cart">
-                        <span class="tools-icon icon-bag">
-                            <b class="bag-num"></b>
-                        </span>
+                    <span class="iconfont tools-icon icon-bag">&#xe64b;</span>
                         购物袋
                     </a>
                     <div class="mini-bag-box sub-wrapper bag-empty">
--- a/doraemon/views/partial/nav-menu.hbs
View file @5e9fa59
+++ b/doraemon/views/partial/nav-menu.hbs
View file @5e9fa59
@@ -57,11 +57,11 @@
                     {{/ subNav}}
                 </ul>
                 <div class="search-entry">
-                    <span class="iconfont">&#xe605;</span>
+                    <span class="iconfont">&#xe64a;</span>
                     <div class="search-wrapper">
                         <div class="search-input">
                             <form id="search-form" action="{{../siteUrl}}/product/query">
-                                <span class="iconfont left">&#xe605;</span>
+                                <span class="iconfont left">&#xe64a;</span>
                                 <input type="text" name="query" id="search-key" class="search-key" autocomplete="off">
                                 <span class="iconfont right clear-input">&#xe608;</span>
                             </form>
--- a/doraemon/views/partial/settle-header.hbs
View file @5e9fa59
+++ b/doraemon/views/partial/settle-header.hbs
View file @5e9fa59
@@ -15,7 +15,6 @@
                 {{/if}}
             </li>
             <li><a href="{{siteUrl}}/me">个人中心</a></li>
-            <li><a href="{{siteUrl}}/me/order">订单中心</a></li>
             <li><a href="{{siteUrl}}/help">帮助中心</a></li>
         </ul>
     </div>
--- a/public/font/iconfont.eot
View file @5e9fa59
+++ b/public/font/iconfont.eot
View file @5e9fa59
--- a/public/font/iconfont.svg
View file @5e9fa59
+++ b/public/font/iconfont.svg
View file @5e9fa59
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Thu Jul 21 15:35:40 2016
+Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016
  By admin
 </metadata>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Thu Jul 21 15:35:40 2016
     bbox="0 -224 1303 896.303"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E648"
+    unicode-range="U+0078-E64D"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -41,8 +41,8 @@ d="M0 896h1024v-1024h-1024v1024zM85 -43h854v854h-854v-854z" />
     <glyph glyph-name="uniE602" unicode="&#xe602;" 
 d="M1024 896h-1024v-1024h1024v1024zM448 101l-237 238l90 90l147 -146l307 306l90 -90l-397 -397v-1z" />
     <glyph glyph-name="uniE603" unicode="&#xe603;" 
-d="M512 -128q-139 0 -257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257t-68.5 -257t-186.5 -186.5t-257 -68.5zM512 -14q108 0 200 53t145 145t53 200t-53 200t-145 145t-200 53t-200 -53t-145 -145t-53 -200t53 -200
-t145 -145t200 -53zM512 100q118 0 201 83t83 201t-83 201t-201 83t-201 -83t-83 -201t83 -201t201 -83z" />
+d="M512 -212q-139 0 -257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257t-68.5 -257t-186.5 -186.5t-257 -68.5zM512 -98q108 0 200 53t145 145t53 200t-53 200t-145 145t-200 53t-200 -53t-145 -145t-53 -200t53 -200
+t145 -145t200 -53zM512 16q118 0 201 83t83 201t-83 201t-201 83t-201 -83t-83 -201t83 -201t201 -83z" />
     <glyph glyph-name="uniE604" unicode="&#xe604;" 
 d="M512 684q159 0 271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5zM512 812q-139 0 -257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5t257 68.5t186.5 186.5t68.5 257t-68.5 257
 t-186.5 186.5t-257 68.5z" />
@@ -89,6 +89,9 @@ d="M795 342q0 -109 -78 -185.5t-188.5 -76.5t-189 76.5t-78.5 185t78.5 185.5t188.5 
 d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h293h243h293q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14
 t-13.5 -34v-560h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5
 t13.5 34.5zM645 67v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />
+    <glyph glyph-name="uniE615" unicode="&#xe615;" 
+d="M512 300zM219 300q0 121 86 207t207 86t207 -86t86 -207t-86 -207t-207 -86t-207 86t-86 207zM512 -212q-140 0 -258 68t-186 186t-68 258t68 258t186 186t258 68t258 -68t186 -186t68 -258t-68 -258t-186 -186t-258 -68zM512 739q-89 0 -170 -35t-140 -94t-94 -140
+t-35 -170t35 -170t94 -140t140 -94t170 -35t170 35t140 94t94 140t35 170t-35 170t-94 140t-140 94t-170 35z" />
     <glyph glyph-name="uniE616" unicode="&#xe616;" 
 d="M894 554l-43 43l-339 -339l-339 339l-43 -43l382 -383z" />
     <glyph glyph-name="uniE617" unicode="&#xe617;" 
@@ -244,5 +247,16 @@ d="M1024 -106l-230 231q83 88 111.5 203.5t-3 231t-118.5 202.5q-66 65 -150.5 99.5t
 q0 174 125 304q60 60 138.5 92.5t165.5 32.5q174 0 304 -125q61 -61 93 -141t32 -161t-32 -161t-93 -142q-60 -60 -139 -92t-165.5 -32t-165 32t-138.5 92z" />
     <glyph glyph-name="uniE648" unicode="&#xe648;" horiz-adv-x="1025" 
 d="M1024 480v338q0 32 -23 55t-55 23h-331h-14q-55 0 -76 -21l-506 -506q-19 -19 -19 -46t19 -45l387 -387q18 -19 45 -19t46 19l506 506q10 10 15 25.5t5.5 26.5t0.5 31zM764 549q-36 0 -61.5 25.5t-25.5 61.5t25.5 61t61.5 25t61 -25t25 -61t-25 -61.5t-61 -25.5z" />
+    <glyph glyph-name="uniE649" unicode="&#xe649;" 
+d="M129 896v-1024h766v1024h-766zM576 -60h-128v127h128v-127zM769 127h-514v641h514v-641z" />
+    <glyph glyph-name="uniE64A" unicode="&#xe64a;" horiz-adv-x="1028" 
+d="M1028 -36l-93 -92l-204 203q-123 -92 -273 -92q-93 0 -178 36.5t-146 97.5t-97.5 145.5t-36.5 177t36.5 177.5t97.5 146t146 97t178 36t178 -36t146.5 -97t97.5 -146t36 -177q0 -150 -92 -272l204 -204v0zM458 766q-89 0 -164 -44t-119 -119t-44 -163.5t44 -163.5
+t119 -118.5t164 -43.5t164.5 43.5t119 118.5t43.5 163.5t-43.5 163.5t-119 119t-164.5 44v0z" />
+    <glyph glyph-name="uniE64B" unicode="&#xe64b;" 
+d="M812 568l-137 328h-326l-137 -328h-206l79 -696h854l79 696h-206zM418 786h189l91 -218h-371z" />
+    <glyph glyph-name="uniE64D" unicode="&#xe64d;" 
+d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
+q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
+l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56q66 -59 66 -154q0 -43 -17 -79z" />
   </font>
 </defs></svg>
--- a/public/font/iconfont.ttf
View file @5e9fa59
+++ b/public/font/iconfont.ttf
View file @5e9fa59
--- a/public/font/iconfont.woff
View file @5e9fa59
+++ b/public/font/iconfont.woff
View file @5e9fa59
--- a/public/img/sprite.layout.png
View file @5e9fa59
+++ b/public/img/sprite.layout.png
View file @5e9fa59
--- a/public/img/sprite.product.png
View file @5e9fa59
+++ b/public/img/sprite.product.png
View file @5e9fa59
--- a/public/js/editorial/detail.page.js
View file @5e9fa59
+++ b/public/js/editorial/detail.page.js
View file @5e9fa59
@@ -121,7 +121,7 @@ function comment() {
     var commentInfo = $('#comment-info').val();
     if (commentInfo === '') {
-        new _alert('评论不能为空').show();
+        // new _alert('评论不能为空').show();
         return false;
     }
     commenting = true;
--- a/public/js/me/favorite.brand.page.js
View file @5e9fa59
+++ b/public/js/me/favorite.brand.page.js
View file @5e9fa59
@@ -46,18 +46,24 @@ var FavoriteBrand = {
         $('.btn.cancel', $root).click(function() {
             var id = $(this).parents('.brand-info').data('id');
+            var type = $(this).parents('.brand-info').data('type');
-            FavoriteBrand.doCancel(id);
+            FavoriteBrand.doCancel(id, type);
         });
         $('.favorite-cancel', $root).click(function() {
-            var ids = [];
+            var shopId = [];
+            var brandId = [];
             $('.brand-info.choose', $root).each(function() {
-                ids.push($(this).data('id'));
+                if ($(this).data('type') === 'shop') {
+                    shopId.push($(this).data('id'));
+                } else if ($(this).data('type') === 'brand') {
+                    brandId.push($(this).data('id'));
+                }
             });
-            FavoriteBrand.doCancel(ids.join(','));
+            FavoriteBrand.doCancelMulti(shopId.join(','), brandId.join(','));
         });
     },
     moveSlide: function(ele) {
@@ -72,15 +78,25 @@ var FavoriteBrand = {
             $(currLi).removeClass('show');
         }
     },
-    doCancel: function(ids) {
+    doCancel: function(ids, type) {
         $.post('/me/collection/cancel', {
-            type: 'brand',
+            type: type || 'brand',
             ids: ids
         }, function(data) {
             if (data.code === 200) {
                 location.href = '/me/collection/brand';
             }
         });
+    },
+    doCancelMulti: function(shops, brands) {
+        $.post('/me/collection/cancel/multi', {
+            shops: shops,
+            brands: brands
+        }, function(data) {
+            if (data.code === 200) {
+                location.href = '/me/collection/brand';
+            }
+        });
     }
 };
--- a/public/js/shopping/pay.page.js
View file @5e9fa59
+++ b/public/js/shopping/pay.page.js
View file @5e9fa59
@@ -87,5 +87,3 @@ $('#go-pay-btn').click(function() {
         }
     });
 });
-
-console.log(window.history);
--- a/public/scss/components/_header.css
View file @5e9fa59
+++ b/public/scss/components/_header.css
View file @5e9fa59
@@ -92,20 +92,12 @@
         .tools-icon {
             width: 20px;
             height: 20px;
+            line-height: 20px;
+            font-size: 16px;
+            color: #1b1b1b;
             display: inline-block;
-            vertical-align: middle;
             position: relative;
-            top: -1px;
-        }
-
-        .icon-phone {
-            background-image: url('/layout/phone.png');
-        }
-
-        .icon-bag {
-            background-image: url('/layout/bag.png');
-            line-height: 24px;
-            text-align: center;
+            top: 1px;
         }
         .bag-num {
--- a/public/scss/components/_pagination.css
View file @5e9fa59
+++ b/public/scss/components/_pagination.css
View file @5e9fa59
@@ -12,10 +12,10 @@
         &:first-child {
             margin-right: 10px;
-            border: 1px solid #333;
+            border: 2px solid #1b1b1b;
             &:hover {
-                background-color: #333;
+                background-color: #1b1b1b;
                 cursor: pointer;
                 color: #fff;
             }
@@ -23,10 +23,10 @@
         &:last-child {
             margin-left: 10px;
-            border: 1px solid #333;
+            border: 2px solid #1b1b1b;
             &:hover {
-                background-color: #333;
+                background-color: #1b1b1b;
                 cursor: pointer;
                 color: #fff;
             }
@@ -34,7 +34,7 @@
     }
     .active {
-        background-color: #333;
+        background-color: #1b1b1b;
         color: #fff;
     }
--- a/public/scss/editorial/_index.css
View file @5e9fa59
+++ b/public/scss/editorial/_index.css
View file @5e9fa59
@@ -20,10 +20,6 @@
         height: 40px;
     }
-    .font {
-        font-family: '黑体';
-    }
-
     .paging {
         margin-top: 40px;
         margin-bottom: 80px;
--- a/public/scss/editorial/_msg.css
View file @5e9fa59
+++ b/public/scss/editorial/_msg.css
View file @5e9fa59
@@ -11,7 +11,7 @@
         line-height: 30px;
         text-align: center;
         border-bottom: 1px solid #bbb;
-        color: #a0a0a0;
+        color: #999;
     }
     .msg-right {
@@ -30,7 +30,7 @@
     .msg-title {
         font-size: 20px;
-        color: #333;
+        color: #1b1b1b;
         line-height: 30px;
         max-height: 64px;
         overflow: hidden;
@@ -42,7 +42,7 @@
     }
     .msg-title:hover {
-        color: #ff1414;
+        color: #379ed6;
     }
     .lazy {
@@ -86,7 +86,7 @@
     }
     .like-comment {
-        color: #a6a6a6;
+        color: #999;
         cursor: pointer;
         font-size: 14px;
--- a/public/scss/product/_brand-banner.css
View file @5e9fa59
+++ b/public/scss/product/_brand-banner.css
View file @5e9fa59
@@ -36,7 +36,7 @@
         }
         .coll {
-            color: #1d1d1d;
+            color: #fc0d1b;
         }
         .iconfont {
--- a/public/scss/product/_item.css
View file @5e9fa59
+++ b/public/scss/product/_item.css
View file @5e9fa59
@@ -429,10 +429,8 @@
             .show-img {
                 width: 14px;
                 height: 14px;
+                font-size: 14px;
                 display: inline-block;
-                position: relative;
-                top: 2px;
-                background: url('/product/doubt.png') no-repeat;
                 cursor: pointer;
             }
--- a/public/scss/product/_list.css
View file @5e9fa59
+++ b/public/scss/product/_list.css
View file @5e9fa59
@@ -301,17 +301,16 @@
     }
     .goods-area {
-        margin: 0 -12px;
+        margin: 0 -15px;
         position: relative;
         .goods {
-            margin: 10px 0 26px;
-            padding: 10px;
+            margin: 10px 0 16px;
+            padding: 10px 13px;
             float: left;
             text-align: center;
             border: 2px solid #fff;
             cursor: pointer;
-            width: 287px;
             .goods-brand {
                 font-weight: 700;
@@ -324,8 +323,8 @@
             .goods-img {
                 position: relative;
                 overflow: hidden;
-                width: 267px;
-                height: 354px;
+                width: 263px;
+                height: 351px;
                 img {
                     margin: 0;
@@ -345,7 +344,7 @@
             .goods-name {
                 padding: 4px 10px 10px;
-                width: 265px;
+                width: 263px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
--- a/public/scss/product/_order-area.css
View file @5e9fa59
+++ b/public/scss/product/_order-area.css
View file @5e9fa59
@@ -67,29 +67,49 @@
         .page {
             color: #1b1b1b;
-            font-weight: 700;
             border: 2px solid #1b1b1b;
             width: 24px;
             height: 24px;
-            line-height: 24px;
             display: inline-block;
-            font-size: 14px;
-            text-align: center;
             margin-right: 8px;
             cursor: pointer;
+
+            span {
+                font-weight: 700;
+                font-size: 14px;
+                display: block;
+                position: relative;
+                line-height: 22px;
+                text-align: center;
+            }
+        }
+
+        .page:hover {
+            background-color: #1b1b1b;
+            color: #fff;
         }
         .page.disable {
-            color: #878787;
-            border: 2px solid #878787;
+            color: #eee;
+            border: 2px solid #eee;
+        }
+
+        .page.disable:hover {
+            color: #eee;
+            border: 2px solid #eee;
+            background-color: #fff;
         }
         .page.page-next {
-            line-height: 20px;
+            span {
+                top: -1px;
+            }
         }
         .page.page-pre {
-            line-height: 20px;
+            span {
+                left: -1px;
+            }
         }
     }
 }
--- a/public/scss/product/_shop.css
View file @5e9fa59
+++ b/public/scss/product/_shop.css
View file @5e9fa59
 .yoho-product-list,
 .yoho-shop-index {
-
     .yoho-product-list-content {
         margin-top: 30px;
     }
@@ -41,14 +40,12 @@
             }
             .brand-fav.coled .iconfont {
-                color: #000;
+                color: #fc0d1b;
             }
-
         }
     }
     .shop-menu {
-
         border-bottom: 1px solid #eee;
         li {
@@ -68,11 +65,9 @@
     .brand-info-wrapper {
         display: none;
     }
-
 }
 .yoho-shop-index {
-
     font-size: 14px;
     @import "order-area";
@@ -94,6 +89,7 @@
             a {
                 display: block;
+
                 img {
                     width: 100%;
                     height: 190px;
@@ -116,6 +112,7 @@
     .all-product-warp {
         .goods-wrap {
             margin: 0 -10px;
+
             .goods-info {
                 float: left;
                 width: 272px;
@@ -165,7 +162,6 @@
                     color: #fff;
                     z-index: 2;
                 }
-
             }
         }
@@ -180,7 +176,6 @@
     }
     .editorial-wrap {
-
         margin: 0 -10px;
         .editorial-info {
@@ -206,6 +201,7 @@
     .floor-header {
         position: relative;
+
         .floor-more {
             position: absolute;
             right: 0;
@@ -244,6 +240,7 @@
             line-height: 30px;
             width: 1000px;
             overflow: hidden;
+
             div {
                 float: left;
                 margin: 0 5px;
@@ -253,13 +250,13 @@
             div:hover {
                 background-color: #000;
+
                 a {
                     color: #fff !important;
                 }
             }
         }
     }
-
 }
 .yoho-dialog.brand-info-dialog {
@@ -278,6 +275,7 @@
         .brand-info-title {
             text-align: left;
             margin: 20px 0 50px;
+
             h2 {
                 font-size: 18px;
                 font-weight: 700;
@@ -289,6 +287,7 @@
             text-align: left;
             font-size: 12px;
             line-height: 20px;
+
             p {
                 font-size: 12px;
                 line-height: 20px;