diff --git a/const/city.js b/const/city.js index cb489b8..f681454 100644 --- a/const/city.js +++ b/const/city.js @@ -14,47 +14,72 @@ module.exports = { "keyword": "阿尔山AERSHAN" }, { - "cityName": "阿克苏", + "cityName": "阿克苏市", "code": 652900, "keyword": "阿克苏AKESU" }, { - "cityName": "阿拉善", + "cityName": "阿拉善市", "code": 152900, "keyword": "阿拉善ALASHAN" }, { - "cityName": "阿勒泰", + "cityName": "阿勒泰市", "code": 654300, "keyword": "阿勒泰ALETAI" }, { - "cityName": "阿里", - "code": 542500, - "keyword": "阿里ALI" + "cityName": "阿图什市", + "code": 653001, + "keyword": "阿图什ATUSHI" }, { - "cityName": "安康", + "cityName": "安达市", + "code": 231281, + "keyword": "安达ANDA" + }, + { + "cityName": "安国市", + "code": 130683, + "keyword": "安国ANGUO" + }, + { + "cityName": "安康市", "code": 610900, "keyword": "安康ANKANG" }, { - "cityName": "安庆", + "cityName": "安陆市", + "code": 420982, + "keyword": "安陆ANLU" + }, + { + "cityName": "安宁市", + "code": 530181, + "keyword": "安宁ANNIG" + }, + { + "cityName": "安庆市", "code": 340800, "keyword": "安庆ANQING" }, { - "cityName": "鞍山", + "cityName": "安丘市", + "code": 370784, + "keyword": "安丘ANQIU" + }, + { + "cityName": "鞍山市", "code": 210300, "keyword": "鞍山ANSHAN" }, { - "cityName": "安顺", + "cityName": "安顺市", "code": 520400, "keyword": "安顺ANSHUN" }, { - "cityName": "安阳", + "cityName": "安阳市", "code": 410500, "keyword": "安阳ANYANG" } @@ -64,37 +89,47 @@ module.exports = { "letter": "B", "data": [ { - "cityName": "白城", + "cityName": "霸州市", + "code": 131081, + "keyword": "霸州BAZHOU" + }, + { + "cityName": "白城市", "code": 220800, "keyword": "白城BAICHENG" }, { - "cityName": "白山", + "cityName": "白山市", "code": 220600, "keyword": "白山BAISHAN" }, { - "cityName": "白银", + "cityName": "白银市", "code": 620400, "keyword": "白银BAIYIN" }, { - "cityName": "保定", + "cityName": "百色市", + "code": 451000, + "keyword": "百色BAISE" + }, + { + "cityName": "保定市", "code": 130600, "keyword": "保定BAODING" }, { - "cityName": "宝鸡", + "cityName": "宝鸡市", "code": 610300, "keyword": "宝鸡BAOJI" }, { - "cityName": "保山", + "cityName": "保山市", "code": 530500, "keyword": "保山BAOSHAN" }, { - "cityName": "包头", + "cityName": "包头市", "code": 150200, "keyword": "包头BAOTOU" }, @@ -109,54 +144,69 @@ module.exports = { "keyword": "巴音郭楞BAYINGUOLENG" }, { - "cityName": "巴中", + "cityName": "巴中市", "code": 511900, "keyword": "巴中BAZHONG" }, { - "cityName": "北海", + "cityName": "北海市", "code": 450500, "keyword": "北海BEIHAI" }, { - "cityName": "北京", + "cityName": "北京市", "code": 110100, "keyword": "北京BEIJING" }, { - "cityName": "蚌埠", + "cityName": "北流市", + "code": 450981, + "keyword": "北流BEILIU" + }, + { + "cityName": "北票市", + "code": 211381, + "keyword": "北票BEIPIAO" + }, + { + "cityName": "蚌埠市", "code": 340300, "keyword": "蚌埠BENGBU" }, { - "cityName": "本溪", + "cityName": "本溪市", "code": 210500, "keyword": "本溪BENXI" }, { - "cityName": "毕节", + "cityName": "毕节市", "code": 522400, "keyword": "毕节BIJIE" }, { - "cityName": "滨州", + "cityName": "滨州市", "code": 371600, "keyword": "滨州BINZHOU" }, { - "cityName": "博尔塔拉", + "cityName": "博尔塔拉市", "code": 652700, "keyword": "博尔塔拉BOERTALA" }, { - "cityName": "百色", - "code": 451000, - "keyword": "百色BOSE" + "cityName": "泊头市", + "code": 130981, + "keyword": "泊头BOTOU" }, { - "cityName": "亳州", + "cityName": "亳州市", "code": 341600, "keyword": "亳州BOZHOU" + }, + { + "cityName": "博乐市", + "code": 652701, + "keyword": "博乐BOLE" } ] }, @@ -164,92 +214,142 @@ module.exports = { "letter": "C", "data": [ { - "cityName": "沧州", + "cityName": "沧州市", "code": 130900, "keyword": "沧州CANGZHOU" }, { - "cityName": "长春", - "code": 220100, - "keyword": "长春CHANGCHUN" + "cityName": "岑溪市", + "code": 450481, + "keyword": "岑溪CENXI" }, { - "cityName": "常德", - "code": 430700, - "keyword": "常德CHANGDE" + "cityName": "昌吉市", + "code": 652301, + "keyword": "昌吉CHANGJI" + }, + { + "cityName": "昌邑市", + "code": 370786, + "keyword": "昌邑CHANGYI" }, { - "cityName": "昌都", + "cityName": "昌都市", "code": 542100, "keyword": "昌都CHANGDU" }, { - "cityName": "昌吉", - "code": 652300, - "keyword": "昌吉CHANGJI" + "cityName": "长春市", + "code": 220100, + "keyword": "长春CHANGCHUN" + }, + { + "cityName": "长葛市", + "code": 411082, + "keyword": "长葛CHANGGE" + }, + { + "cityName": "长乐市", + "code": 350182, + "keyword": "长乐CHANGLE" }, { - "cityName": "长沙", + "cityName": "长沙市", "code": 430100, "keyword": "长沙CHANGSHA" }, { - "cityName": "长治", + "cityName": "长治市", "code": 140400, "keyword": "长治CHANGZHI" }, { - "cityName": "常州", + "cityName": "常德市", + "code": 430700, + "keyword": "常德CHANGDE" + }, + { + "cityName": "常宁市", + "code": 430482, + "keyword": "常宁CHANGNING" + }, + { + "cityName": "常熟市", + "code": 320581, + "keyword": "常熟CHANGSHU" + }, + { + "cityName": "常州市", "code": 320400, "keyword": "常州CHANGZHOU" }, { - "cityName": "潮州", + "cityName": "巢湖市", + "code": 341400, + "keyword": "巢湖CHAOHU" + }, + { + "cityName": "朝阳市", + "code": 211300, + "keyword": "朝阳CHAOYANG" + }, + { + "cityName": "潮州市", "code": 445100, "keyword": "潮州CHAOZHOU" }, { - "cityName": "承德", + "cityName": "承德市", "code": 130800, "keyword": "承德CHENGDE" }, { - "cityName": "成都", + "cityName": "成都市", "code": 510100, "keyword": "成都CHENGDU" }, { - "cityName": "郴州", + "cityName": "郴州市", "code": 431000, "keyword": "郴州CHENZHOU" }, { - "cityName": "赤峰", + "cityName": "赤壁市", + "code": 421281, + "keyword": "赤壁CHIBI" + }, + { + "cityName": "赤峰市", "code": 150400, "keyword": "赤峰CHIFENG" }, { - "cityName": "池州", + "cityName": "赤水市", + "code": 520381, + "keyword": "赤水CHISHUI" + }, + { + "cityName": "池州市", "code": 341700, "keyword": "池州CHIZHOU" }, { - "cityName": "重庆", + "cityName": "重庆市", "code": 500100, "keyword": "重庆CHONGQING" }, { - "cityName": "崇左", + "cityName": "崇左市", "code": 451400, "keyword": "崇左CHONGZUO" }, { - "cityName": "楚雄", + "cityName": "楚雄市", "code": 532300, "keyword": "楚雄CHUXIONG" }, { - "cityName": "滁州", + "cityName": "滁州市", "code": 341100, "keyword": "滁州CHUZHOU" } @@ -1738,11 +1838,6 @@ module.exports = { "code": 530600, "keyword": "昭通ZHAOTONG" }, - { - "cityName": "朝阳", - "code": 211300, - "keyword": "朝阳ZHAOYANG" - }, { "cityName": "郑州", "code": 410100, diff --git a/pages/article/index.wxs b/pages/article/index.wxs index 770d92f..08d3bd7 100644 --- a/pages/article/index.wxs +++ b/pages/article/index.wxs @@ -18,7 +18,7 @@ function formatMTime(time) { if (gap > threeday) { return '3天前' } else if (gap > oneday) { - return '1-3天内' + return '3天内' } else if (gap > onehour) { return parseInt(gap / onehour) + '小时前' } else if (gap > just) {