|
@@ -6,10 +6,10 @@ |
|
@@ -6,10 +6,10 @@ |
|
6
|
'use strict';
|
6
|
'use strict';
|
|
7
|
|
7
|
|
|
8
|
const _ = require('lodash');
|
8
|
const _ = require('lodash');
|
|
9
|
-const pinyin = require('pinyin-converter');
|
|
|
|
10
|
|
9
|
|
|
11
|
const crypto = global.yoho.crypto;
|
10
|
const crypto = global.yoho.crypto;
|
|
12
|
|
11
|
|
|
|
|
12
|
+const pinyin = require('../models/province-pinyin');
|
|
13
|
const addressApi = require('../models/address-api');
|
13
|
const addressApi = require('../models/address-api');
|
|
14
|
|
14
|
|
|
15
|
const worldSort = 'abcdefghijklmnopqrstuvwxyz';
|
15
|
const worldSort = 'abcdefghijklmnopqrstuvwxyz';
|
|
@@ -20,14 +20,11 @@ const getAreaListData = (id) => { |
|
@@ -20,14 +20,11 @@ const getAreaListData = (id) => { |
|
20
|
|
20
|
|
|
21
|
if (id * 1 === 0 && list.length) {
|
21
|
if (id * 1 === 0 && list.length) {
|
|
22
|
_.forEach(list, value => {
|
22
|
_.forEach(list, value => {
|
|
23
|
- value.initial = _.get(pinyin(value.caption, {
|
|
|
|
24
|
- style: pinyin.STYLE_FIRST_LETTER
|
|
|
|
25
|
- }), '[0][0]', 'w');
|
23
|
+ value.initial = pinyin[value.caption] || 'z';
|
|
26
|
value.pySort = _.indexOf(worldSort, value.initial);
|
24
|
value.pySort = _.indexOf(worldSort, value.initial);
|
|
27
|
});
|
25
|
});
|
|
28
|
result.data = list;
|
26
|
result.data = list;
|
|
29
|
}
|
27
|
}
|
|
30
|
-
|
|
|
|
31
|
return result;
|
28
|
return result;
|
|
32
|
});
|
29
|
});
|
|
33
|
};
|
30
|
};
|
