|
@@ -11,20 +11,24 @@
|
11
|
11
|
</div>
|
12
|
12
|
<div class="weatherDetail flex-h">
|
13
|
13
|
<div class="imgData" v-if="pageDetail.detail.weatherShow">
|
14
|
|
- <img :src="weatherIcon(weatherDetail.weather)" width="100%" alt>
|
|
14
|
+ <img :src="weatherIcon(weatherDetail.day_weather_code)" width="100%" alt>
|
15
|
15
|
<span>{{tempRange}}</span>
|
16
|
16
|
</div>
|
17
|
17
|
<div class="flex-item">
|
18
|
18
|
<div v-if="weatherDetail">
|
19
|
|
- <span>今日 {{ weatherDetail.dayweather }}</span>
|
|
19
|
+ <span>今日 {{ weatherDetail.day_weather }} {{weatherDetail.index.gj.title}}外出</span>
|
20
|
20
|
<ul>
|
21
|
21
|
<li>
|
22
|
|
- <span>白天</span>
|
23
|
|
- <span>{{weatherDetail.daywind}} 风 {{weatherDetail.daypower.indexOf('级') > 0 ? weatherDetail.daypower : `${weatherDetail.daypower} 级`}}</span>
|
|
22
|
+ <span>{{weatherDetail.wind_direction}}{{weatherDetail.wind_power}}</span>
|
|
23
|
+ <span>空气湿度: {{weatherDetail.sd}}</span>
|
24
|
24
|
</li>
|
25
|
25
|
<li>
|
26
|
|
- <span>晚上</span>
|
27
|
|
- <span>{{weatherDetail.nightwind}} 风 {{weatherDetail.nightpower.indexOf('级') > 0 ? weatherDetail.nightpower : `${weatherDetail.nightpower} 级`}}</span>
|
|
26
|
+ <span>体感温度: {{weatherDetail.temperature}}</span>
|
|
27
|
+ <span>空气指数: {{weatherDetail.aqi}}</span>
|
|
28
|
+ </li>
|
|
29
|
+ <li>
|
|
30
|
+ <span>PM2.5: {{weatherDetail.aqiDetail.pm2_5}}</span>
|
|
31
|
+ <span>穿衣指数: {{weatherDetail.index.clothes.title}}</span>
|
28
|
32
|
</li>
|
29
|
33
|
</ul>
|
30
|
34
|
</div>
|
|
@@ -118,14 +122,18 @@ export default {
|
118
|
122
|
},
|
119
|
123
|
weatherDetail () {
|
120
|
124
|
let target = this.pageDetail.weather ? JSON.parse(this.pageDetail.weather) : undefined
|
121
|
|
- return !target ? undefined : target.forecasts[0].casts[0]
|
|
125
|
+
|
|
126
|
+ if (!target) return undefined
|
|
127
|
+
|
|
128
|
+ const { f1, now } = target.showapi_res_body
|
|
129
|
+ return { ...f1, ...now }
|
122
|
130
|
},
|
123
|
131
|
tempRange () {
|
124
|
132
|
if (!this.weatherDetail) return ''
|
125
|
133
|
let min, max
|
126
|
|
- const f = () => (this.weatherDetail.daytemp) - 0 > (this.weatherDetail.nighttemp - 0)
|
127
|
|
- ? ((min = this.weatherDetail.nighttemp) | (max = this.weatherDetail.daytemp))
|
128
|
|
- : ((max = this.weatherDetail.nighttemp) | (min = this.weatherDetail.daytemp))
|
|
134
|
+ const f = () => (this.weatherDetail.day_air_temperature) - 0 > (this.weatherDetail.night_air_temperature - 0)
|
|
135
|
+ ? ((min = this.weatherDetail.night_air_temperature) | (max = this.weatherDetail.day_air_temperature))
|
|
136
|
+ : ((max = this.weatherDetail.night_air_temperature) | (min = this.weatherDetail.day_air_temperature))
|
129
|
137
|
f()
|
130
|
138
|
return `${min}℃ ~ ${max}℃`
|
131
|
139
|
}
|
|
@@ -256,13 +264,16 @@ export default {
|
256
|
264
|
weatherIcon (target) { // 返回天气图标
|
257
|
265
|
switch (target) {
|
258
|
266
|
case '晴':
|
|
267
|
+ case '00':
|
259
|
268
|
return require('../assets/images/icon-6.png')
|
260
|
269
|
case '少云':
|
261
|
270
|
case '晴间多云':
|
262
|
271
|
case '多云':
|
|
272
|
+ case '01':
|
263
|
273
|
return require('../assets/images/icon-4.png')
|
264
|
274
|
case '阴':
|
265
|
275
|
case '平静':
|
|
276
|
+ case '02':
|
266
|
277
|
return require('../assets/images/icon-9.png')
|
267
|
278
|
case '有风':
|
268
|
279
|
case '微风':
|
|
@@ -278,6 +289,8 @@ export default {
|
278
|
289
|
case '热带风暴':
|
279
|
290
|
case '浮尘':
|
280
|
291
|
case '扬沙':
|
|
292
|
+ case '29':
|
|
293
|
+ case '30':
|
281
|
294
|
return require('../assets/images/icon-1.png')
|
282
|
295
|
case '阵雨':
|
283
|
296
|
case '大雨':
|
|
@@ -292,17 +305,34 @@ export default {
|
292
|
305
|
case '极端降雨':
|
293
|
306
|
case '雷阵雨':
|
294
|
307
|
case '雷阵雨并伴有冰雹':
|
|
308
|
+ case '03':
|
|
309
|
+ case '04':
|
|
310
|
+ case '05':
|
|
311
|
+ case '06':
|
|
312
|
+ case '09':
|
|
313
|
+ case '10':
|
|
314
|
+ case '11':
|
|
315
|
+ case '12':
|
|
316
|
+ case '22':
|
|
317
|
+ case '23':
|
|
318
|
+ case '24':
|
|
319
|
+ case '25':
|
295
|
320
|
return require('../assets/images/icon-5.png')
|
296
|
321
|
case '毛毛雨/细雨':
|
297
|
322
|
case '小雨':
|
298
|
323
|
case '雨':
|
299
|
324
|
case '中雨':
|
300
|
325
|
case '小雨-中雨':
|
|
326
|
+ case '07':
|
|
327
|
+ case '08':
|
|
328
|
+ case '21':
|
|
329
|
+ case '301':
|
301
|
330
|
return require('../assets/images/icon-3.png')
|
302
|
331
|
case '雨夹雪':
|
303
|
332
|
case '阵雨夹雪':
|
304
|
333
|
case '雨雪天气':
|
305
|
334
|
case '冻雨':
|
|
335
|
+ case '19':
|
306
|
336
|
return require('../assets/images/icon-10.png')
|
307
|
337
|
case '阵雪':
|
308
|
338
|
case '小雪':
|
|
@@ -313,6 +343,15 @@ export default {
|
313
|
343
|
case '中雪-大雪':
|
314
|
344
|
case '大雪-暴雪':
|
315
|
345
|
case '雪':
|
|
346
|
+ case '13':
|
|
347
|
+ case '14':
|
|
348
|
+ case '15':
|
|
349
|
+ case '16':
|
|
350
|
+ case '17':
|
|
351
|
+ case '26':
|
|
352
|
+ case '27':
|
|
353
|
+ case '28':
|
|
354
|
+ case '302':
|
316
|
355
|
return require('../assets/images/icon-2.png')
|
317
|
356
|
case '沙尘暴':
|
318
|
357
|
case '强沙尘暴':
|
|
@@ -327,6 +366,10 @@ export default {
|
327
|
366
|
case '中度霾':
|
328
|
367
|
case '重度霾':
|
329
|
368
|
case '严重霾':
|
|
369
|
+ case '18':
|
|
370
|
+ case '20':
|
|
371
|
+ case '31':
|
|
372
|
+ case '53':
|
330
|
373
|
default:
|
331
|
374
|
return require('../assets/images/icon-1.png')
|
332
|
375
|
}
|
|
@@ -429,7 +472,7 @@ export default {
|
429
|
472
|
}
|
430
|
473
|
ul {
|
431
|
474
|
li {
|
432
|
|
- border-bottom: 1px solid #b3bcc3;
|
|
475
|
+ border-bottom: 1px solid #eee;
|
433
|
476
|
font-size: 0;
|
434
|
477
|
white-space: nowrap;
|
435
|
478
|
padding: 6px 0;
|