fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit e2e24ed0b9bf127f8ceb2962e1651f70467ae062 2 parents aff5fc2a daeb9e9f

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

Inline Side-by-side
Showing 3 changed files with 9 additions and 5 deletions
1 'use strict'; 1 'use strict';
2 const api = global.yoho.API; 2 const api = global.yoho.API;
3 const serviceAPI = global.yoho.ServiceAPI; 3 const serviceAPI = global.yoho.ServiceAPI;
4 -const favApi = global.yoho.FavAPI; 4 +const singleAPI = global.yoho.SingleAPI;
5 const Promise = require('bluebird'); 5 const Promise = require('bluebird');
6 const helpers = global.yoho.helpers; 6 const helpers = global.yoho.helpers;
7 7
@@ -47,7 +47,7 @@ const _getInfoNumData = (uid) => { @@ -47,7 +47,7 @@ const _getInfoNumData = (uid) => {
47 method: 'app.address.gethidden' // 用户地址的数据 47 method: 'app.address.gethidden' // 用户地址的数据
48 }, { 48 }, {
49 code: 200 49 code: 200
50 - }), favApi.get('brower', { 50 + }), singleAPI.get('brower', {
51 method: 'app.favorite.getFavoriteCount', // 获取用户收藏商品总数 51 method: 'app.favorite.getFavoriteCount', // 获取用户收藏商品总数
52 uid: uid 52 uid: uid
53 }, { 53 }, {
@@ -23,7 +23,7 @@ module.exports = { @@ -23,7 +23,7 @@ module.exports = {
23 23
24 api: 'http://dev-api.yohops.com:9999/', 24 api: 'http://dev-api.yohops.com:9999/',
25 service: 'http://dev-service.yohops.com:9999/', 25 service: 'http://dev-service.yohops.com:9999/',
26 - favApi: 'http://192.168.102.31:8092/' 26 + singleApi: 'http://192.168.102.31:8092/'
27 }, 27 },
28 subDomains: { 28 subDomains: {
29 host: '.m.yohoblk.com', 29 host: '.m.yohoblk.com',
@@ -76,7 +76,7 @@ if (isProduction) { @@ -76,7 +76,7 @@ if (isProduction) {
76 domains: { 76 domains: {
77 api: 'http://api.yoho.yohoops.org/', 77 api: 'http://api.yoho.yohoops.org/',
78 service: 'http://service.yoho.yohoops.org/', 78 service: 'http://service.yoho.yohoops.org/',
79 - favApi: 'http://192.168.102.31:8092/' 79 + singleApi: 'http://192.168.102.31:8092/'
80 }, 80 },
81 memcache: { 81 memcache: {
82 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 82 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
@@ -97,7 +97,7 @@ if (isProduction) { @@ -97,7 +97,7 @@ if (isProduction) {
97 97
98 api: 'http://api-test1.yohops.com:9999/', 98 api: 'http://api-test1.yohops.com:9999/',
99 service: 'http://service-test1.yohops.com:9999/', 99 service: 'http://service-test1.yohops.com:9999/',
100 - favApi: 'http://192.168.102.31:8092/' 100 + singleApi: 'http://192.168.102.31:8092/'
101 }, 101 },
102 memcache: { 102 memcache: {
103 master: ['127.0.0.1:12111'], 103 master: ['127.0.0.1:12111'],
@@ -14,6 +14,10 @@ @@ -14,6 +14,10 @@
14 display: none; 14 display: none;
15 } 15 }
16 16
  17 + .blk-header {
  18 + transition: 0.3s all;
  19 + }
  20 +
17 .top-box { 21 .top-box {
18 .blk-header { 22 .blk-header {
19 background-color: transparent; 23 background-color: transparent;