fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit 7d2f7b8e7f0b1e6332e40b2bab5ef234c2f75ac4 2 parents 8e943a26 0ccb70bc

Merge branch 'hotfix_0419product' into gray 

# Conflicts:
#	server/controllers/goods.basegoods.js
#	server/interfaces/goods.basegoods.js
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -86,7 +86,7 @@ var basicInfohtml = '', @@ -86,7 +86,7 @@ var basicInfohtml = '',
86 //alert('basic:' + JSON.stringify(basicInfo)); 86 //alert('basic:' + JSON.stringify(basicInfo));
87 var basicInfoTmp = JSON.stringify(basicInfo); 87 var basicInfoTmp = JSON.stringify(basicInfo);
88 basicInfoTmp = JSON.parse(basicInfoTmp); 88 basicInfoTmp = JSON.parse(basicInfoTmp);
89 -var oldphrase = productExtBo.phrase + ''; 89 +var oldphrase = productExtBo.phrase ? productExtBo.phrase + '' :'';
90 /* 90 /*
91 * 基本信息value值转换 91 * 基本信息value值转换
92 * @param: basicInfo(请求的要渲染的数据), obj(转换的对象) 92 * @param: basicInfo(请求的要渲染的数据), obj(转换的对象)