Merge branch 'master' of http://git.ycjcjy.com/welcome/screen

config/index.js

@@ -26,7 +26,7 @@ module.exports = {
 
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 5010, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,

src/pages/page3.vue

@@ -11,20 +11,24 @@
           </div>
           <div class="weatherDetail flex-h">
             <div class="imgData" v-if="pageDetail.detail.weatherShow">
-              <img :src="weatherIcon(weatherDetail.weather)" width="100%" alt>
+              <img :src="weatherIcon(weatherDetail.day_weather_code)" width="100%" alt>
               <span>{{tempRange}}</span>
             </div>
             <div class="flex-item">
               <div v-if="weatherDetail">
-                <span>今日 {{ weatherDetail.dayweather }}</span>
+                <span>今日 {{ weatherDetail.day_weather }} {{weatherDetail.index.gj.title}}外出</span>
                 <ul>
                   <li>
-                    <span>白天</span>
-                    <span>{{weatherDetail.daywind}} 风 {{weatherDetail.daypower.indexOf('级') > 0 ? weatherDetail.daypower : `${weatherDetail.daypower} 级`}}</span>
+                    <span>{{weatherDetail.wind_direction}}{{weatherDetail.wind_power}}</span>
+                    <span>空气湿度: {{weatherDetail.sd}}</span>
                   </li>
                   <li>
-                    <span>晚上</span>
-                    <span>{{weatherDetail.nightwind}} 风 {{weatherDetail.nightpower.indexOf('级') > 0 ? weatherDetail.nightpower : `${weatherDetail.nightpower} 级`}}</span>
+                    <span>体感温度: {{weatherDetail.temperature}}</span>
+                    <span>空气指数: {{weatherDetail.aqi}}</span>
+                  </li>
+                  <li>
+                    <span>PM2.5: {{weatherDetail.aqiDetail.pm2_5}}</span>
+                    <span>穿衣指数: {{weatherDetail.index.clothes.title}}</span>
                   </li>
                 </ul>
               </div>
@@ -118,14 +122,18 @@ export default {
     },
     weatherDetail () {
       let target = this.pageDetail.weather ? JSON.parse(this.pageDetail.weather) : undefined
-      return !target ? undefined : target.forecasts[0].casts[0]
+
+      if (!target) return undefined
+
+      const { f1, now } = target.showapi_res_body
+      return { ...f1, ...now }
     },
     tempRange () {
       if (!this.weatherDetail) return ''
       let min, max
-      const f = () => (this.weatherDetail.daytemp) - 0 > (this.weatherDetail.nighttemp - 0)
-        ? ((min = this.weatherDetail.nighttemp) | (max = this.weatherDetail.daytemp))
-        : ((max = this.weatherDetail.nighttemp) | (min = this.weatherDetail.daytemp))
+      const f = () => (this.weatherDetail.day_air_temperature) - 0 > (this.weatherDetail.night_air_temperature - 0)
+        ? ((min = this.weatherDetail.night_air_temperature) | (max = this.weatherDetail.day_air_temperature))
+        : ((max = this.weatherDetail.night_air_temperature) | (min = this.weatherDetail.day_air_temperature))
       f()
       return `${min}℃ ~ ${max}℃`
     }
@@ -258,13 +266,16 @@ export default {
     weatherIcon (target) { // 返回天气图标
       switch (target) {
         case '晴':
+        case '00':
           return require('../assets/images/icon-6.png')
         case '少云':
         case '晴间多云':
         case '多云':
+        case '01':
           return require('../assets/images/icon-4.png')
         case '阴':
         case '平静':
+        case '02':
           return require('../assets/images/icon-9.png')
         case '有风':
         case '微风':
@@ -280,6 +291,8 @@ export default {
         case '热带风暴':
         case '浮尘':
         case '扬沙':
+        case '29':
+        case '30':
           return require('../assets/images/icon-1.png')
         case '阵雨':
         case '大雨':
@@ -294,17 +307,34 @@ export default {
         case '极端降雨':
         case '雷阵雨':
         case '雷阵雨并伴有冰雹':
+        case '03':
+        case '04':
+        case '05':
+        case '06':
+        case '09':
+        case '10':
+        case '11':
+        case '12':
+        case '22':
+        case '23':
+        case '24':
+        case '25':
           return require('../assets/images/icon-5.png')
         case '毛毛雨/细雨':
         case '小雨':
         case '雨':
         case '中雨':
         case '小雨-中雨':
+        case '07':
+        case '08':
+        case '21':
+        case '301':
           return require('../assets/images/icon-3.png')
         case '雨夹雪':
         case '阵雨夹雪':
         case '雨雪天气':
         case '冻雨':
+        case '19':
           return require('../assets/images/icon-10.png')
         case '阵雪':
         case '小雪':
@@ -315,6 +345,15 @@ export default {
         case '中雪-大雪':
         case '大雪-暴雪':
         case '雪':
+        case '13':
+        case '14':
+        case '15':
+        case '16':
+        case '17':
+        case '26':
+        case '27':
+        case '28':
+        case '302':
           return require('../assets/images/icon-2.png')
         case '沙尘暴':
         case '强沙尘暴':
@@ -329,6 +368,10 @@ export default {
         case '中度霾':
         case '重度霾':
         case '严重霾':
+        case '18':
+        case '20':
+        case '31':
+        case '53':
         default:
           return require('../assets/images/icon-1.png')
       }
@@ -431,7 +474,7 @@ export default {
               }
               ul {
                 li {
-                  border-bottom: 1px solid #b3bcc3;
+                  border-bottom: 1px solid #eee;
                   font-size: 0;
                   white-space: nowrap;
                   padding: 6px 0;