Authored by 毕凯

Merge branch 'feature/wxPublic' into 'release/5.6'

imgSrc不可用



See merge request !455
... ... @@ -5,6 +5,7 @@
* @date 2016/05/06
*/
const pkg = require('../package.json');
const isProduction = process.env.NODE_ENV === 'production';
const isTest = process.env.NODE_ENV === 'test';
... ... @@ -111,7 +112,7 @@ module.exports = {
if (isProduction) {
Object.assign(module.exports, {
appName: 'm.yohobuy.com',
assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets/',
assetUrl: `//cdn.yoho.cn/m-yohobuy-node/${pkg.version}/assets/`,
domains: {
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
... ... @@ -159,7 +160,7 @@ if (isProduction) {
} else if (isTest) {
Object.assign(module.exports, {
appName: 'm.yohobuy.com for test',
assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets/',
assetUrl: `//cdn.yoho.cn/m-yohobuy-node/${pkg.version}/assets/`,
domains: {
api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
... ...
... ... @@ -39,7 +39,7 @@ module.exports = {
if (type !== 'fix' && index > 8) { // 活动页中 不是浮动层及8张图后面的采用懒加载
return opt.fn(this); // eslint-disable-line
} else {
return opt.inverse(this); // eslint-disable-line
return opt.inverse(this); // eslint-disable-line
}
},
styleFormat: function(styleObj, opts) {
... ... @@ -159,7 +159,7 @@ module.exports = {
if (isTrue) {
return opt.fn(this); // eslint-disable-line
} else {
return opt.inverse(this); // eslint-disable-line
return opt.inverse(this); // eslint-disable-line
}
},
ifand: function() {
... ...