Authored by 郝肖肖

'decodeURIComponent-try'

... ... @@ -6,9 +6,11 @@
*/
'use strict';
const utils = '../../../utils';
const api = global.yoho.API;
const _ = require('lodash');
const camelCase = global.yoho.camelCase;
const decodeURIComponentExt = require(`${utils}/string-code`).decodeURIComponentExt;
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
... ... @@ -54,7 +56,7 @@ module.exports = class extends global.yoho.BaseModel {
return this.get({
data: {
method: params.id ? 'app.address.update' : 'app.address.add',
id: decodeURIComponent(params.id),
id: decodeURIComponentExt(params.id),
address: params.address,
area_code: params.area_code,
consignee: params.consignee,
... ... @@ -76,7 +78,7 @@ module.exports = class extends global.yoho.BaseModel {
data: {
method: 'app.address.setdefault',
uid: params.uid,
id: decodeURIComponent(params.id)
id: decodeURIComponentExt(params.id)
}
});
}
... ... @@ -90,7 +92,7 @@ module.exports = class extends global.yoho.BaseModel {
return this.get({
data: {
method: 'app.address.del',
id: decodeURIComponent(params.id),
id: decodeURIComponentExt(params.id),
uid: params.uid
}
});
... ... @@ -106,7 +108,7 @@ module.exports = class extends global.yoho.BaseModel {
];
if (params.id) { // 如果有 ID 是编辑地址页面
params.id = decodeURIComponent(params.id);
params.id = decodeURIComponentExt(params.id);
apiList.push(this._getThrAddressData(params));
}
... ... @@ -205,7 +207,7 @@ module.exports = class extends global.yoho.BaseModel {
method: 'app.SpaceOrders.updateDeliveryAddress',
uid: uid,
order_code: orderCode,
address_id: decodeURIComponent(addressId)
address_id: decodeURIComponentExt(addressId)
}
}).then((result) => {
return result;
... ...
... ... @@ -2,8 +2,10 @@
* 换货 Model
* DOC: http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/订单/exchange.md
*/
const utils = '../../../utils';
const api = global.yoho.API;
const _ = require('lodash');
const decodeURIComponentExt = require(`${utils}/string-code`).decodeURIComponentExt;
const exchange = {
// 获取 换货列表
... ... @@ -32,7 +34,7 @@ const exchange = {
submitExchange(uid, params) {
if (params.address_id) {
params.address_id = decodeURIComponent(params.address_id);
params.address_id = decodeURIComponentExt(params.address_id);
}
let data = Object.assign(params, {
... ...
... ... @@ -14,7 +14,20 @@ const hexToUtf8 = (string) => {
return buf.toString('utf8');
};
const decodeURIComponentExt = (string) => {
try {
string = decodeURIComponent(string);
} catch (e) {
string = '';
console.error(`${string}, err: ${e.message}`);
}
return string;
};
module.exports = {
utf8ToHex,
hexToUtf8
hexToUtf8,
decodeURIComponentExt
};
... ...