Authored by 马力

Merge branch 'hotfix_0419product' into gray

# Conflicts:
#	server/controllers/goods.basegoods.js
#	server/interfaces/goods.basegoods.js
... ... @@ -86,7 +86,7 @@ var basicInfohtml = '',
//alert('basic:' + JSON.stringify(basicInfo));
var basicInfoTmp = JSON.stringify(basicInfo);
basicInfoTmp = JSON.parse(basicInfoTmp);
var oldphrase = productExtBo.phrase + '';
var oldphrase = productExtBo.phrase ? productExtBo.phrase + '' :'';
/*
* 基本信息value值转换
* @param: basicInfo(请求的要渲染的数据), obj(转换的对象)
... ...