Authored by 陈峰

Merge branch 'release/0529' into 'gray'

Release/0529



See merge request !294
{
"yoCdnAKey": "BwWhoJN536BnV3CzlE20AjNKC9O2bP0l5tFpKsDU",
"yoCdnSKey": "_x2VtO7fEmylgjojmLi7qwTBtRm30S8BrO0FxOPK",
"yoCdnBucket": "yohocdn",
"sourceMapPath": "/nfs-ops/Data/app/node-ci/data",
"buildDistPath": "./public/dist",
"targetKeyPrefix": ""
... ...
... ... @@ -85,7 +85,7 @@ function consultList(uid, page, limit) {
skns.push(consult.skn);
});
let goodInfos = yield getProductGoodsInfo(skns);
let goodInfos = yield this.getProductGoodsInfo(skns);
origin.consult_list.forEach(consult => {
let info = {
... ... @@ -129,6 +129,7 @@ module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
this.getProductGoodsInfo = getProductGoodsInfo.bind(this);
this.consultList = consultList.bind(this);
}
};
... ...
{
"name": "yohobuy-node",
"version": "6.6.1",
"version": "6.6.2",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -299,7 +299,7 @@ function goBind(area, mobile, smsCode) {
code: smsCode
}).then(function(result) {
if (result.code !== 200) {
new Alert(result.mesage).show();
new Alert(result.message).show();
return false;
}
... ...