feats

src/components/AMap/weather.js

@@ -1,18 +1,25 @@
 const SERVER_KEY = 'a30b66a26ea1890fd656cf11cb2647fb';
 
-export default function getWeather(city) {
-  const url = `https://restapi.amap.com/v3/weather/weatherInfo?key=${SERVER_KEY}&city=${city}&extensions=all`;
-
-  return fetch(url)
+export default function getWeather() {
+  // 先获取当前位置
+  return fetch(`https://restapi.amap.com/v3/ip?key=${SERVER_KEY}`)
     .then((res) => res.json())
     .then((res) => {
-      if (res.info === 'OK') {
-        return res.forecasts;
-      } else {
-        return Promise.reject(res.info);
+      if (res.adcode) {
+        const url = `https://restapi.amap.com/v3/weather/weatherInfo?key=${SERVER_KEY}&city=${res.adcode}&extensions=all`;
+
+        return fetch(url)
+          .then((res) => res.json())
+          .then((res) => {
+            if (res.info === 'OK') {
+              return res.forecasts;
+            } else {
+              return Promise.reject(res.info);
+            }
+          })
+          .catch((err) => {
+            console.log(err.message);
+          });
       }
-    })
-    .catch((err) => {
-      console.log(err.message);
     });
 }

src/pages/MonitoringScreen/index.jsx

@@ -128,14 +128,14 @@ export default (props) => {
   ]);
 
   useEffect(() => {
-    getWeather('邓州市')
+    getWeather()
       .then((res) => {
         if (res && res.length) {
-          const { casts } = res[0];
+          const { casts, city } = res[0];
           const { dayweather, nighttemp, daytemp } = casts[0];
           const [min, max] =
             parseInt(nighttemp) > parseInt(daytemp) ? [daytemp, nighttemp] : [nighttemp, daytemp];
-          setWeather(`${dayweather} ${min}-${max} °C`);
+          setWeather(`${city} ${dayweather} ${min}-${max} °C`);
         } else {
           setWeather('暂无天气信息');
         }