From 021d1d8376246638d4f28d5f1c0fecb8e7ffdb36 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 11 Dec 2023 18:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Businesses2.vue            |  6 +++---
 src/components/headView.vue               | 17 ++++++++++++++++-
 src/view/index/components/centerItem2.vue | 20 ++++++++++++--------
 src/view/index/components/centerMap.vue   |  5 +++--
 src/view/index/components/leftItme1.vue   |  2 +-
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/components/Businesses2.vue b/src/components/Businesses2.vue
index d45ebd1..ae6bede 100644
--- a/src/components/Businesses2.vue
+++ b/src/components/Businesses2.vue
@@ -78,9 +78,9 @@ const pages = ref({
 
 const loadOrderList = (pramas) => {
   logisticsList(pramas).then((res) => {
-    initData(res.data.currOrderList);
-    pages.value.total = res.data.currOrderCount;
-    pages.value.pageAll = Math.ceil(res.data.currOrderCount / pages.value.limit);
+    initData(res.data.list);
+    pages.value.total = res.data.count;
+    pages.value.pageAll = Math.ceil(res.data.count / pages.value.limit);
   }).catch(err => {
     console.error(err);
   })
diff --git a/src/components/headView.vue b/src/components/headView.vue
index 10dc0f7..adfbf04 100644
--- a/src/components/headView.vue
+++ b/src/components/headView.vue
@@ -6,6 +6,7 @@ import mitt from "@/utils/mitt";
 import { getStreet } from "@/api/index.js";
 import { useAppStore } from "@/store/app.js";
 import { useUserStore } from "@/store/user.js";
+import axios from "axios";
 
 const reload = inject('reload');
 
@@ -105,11 +106,25 @@ const logout = () => {
   router.push('/login')
 }
 
+const weather = ref("暂无天气信息")
+const initWeather = (city = 510500) => {
+  axios.get(`https://restapi.amap.com/v3/weather/weatherInfo?city=${city}&key=5731d3b4c3f34e09226e084ce556e259`).then((res) => {
+    if (res.data.status == 1) {
+      weather.value = res.data.lives[0].weather;
+    }
+  }).catch((e) => {
+    console.log(e);
+  })
+}
+
+
 onMounted(() => {
   initList();
 
   // 每秒钟更新一次时间
   setInterval(updateClock, 1000);
+
+  initWeather();
 })
 </script>
 
@@ -141,7 +156,7 @@ onMounted(() => {
       <img class="icon item" src="/src/assets/head_img/icon.png" alt="" />
       <div class="item">
         <img src="/src/assets/head_img/weather.png" alt="" />
-        多云
+        {{ weather }}
       </div>
       <img class="icon item" src="/src/assets/head_img/icon.png" alt="" />
       <div class="item" @click="logout">
diff --git a/src/view/index/components/centerItem2.vue b/src/view/index/components/centerItem2.vue
index f8151bb..2c0f517 100644
--- a/src/view/index/components/centerItem2.vue
+++ b/src/view/index/components/centerItem2.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, reactive, ref } from "vue";
+import { nextTick, onMounted, reactive, ref } from "vue";
 import * as echarts from 'echarts';
 import border from "../../../components/border.vue"
 import { orderRanking } from "@/api/index.js"
@@ -12,12 +12,9 @@ const data1 = ref([]);
 const data_bottom = ref([]);
 const orderCount = ref(0);
 
-const echartsRef = ref(null);
+const echartsRef = ref();
 const initMap = () => {
 
-  // 基于DOM元素初始化echarts实例
-  const chart = echarts.init(echartsRef.value);
-
   let option = {
     backgroundColor: 'rgba(0,0,0,0)',
     tooltip: {
@@ -154,8 +151,15 @@ const initMap = () => {
     ]
   }
 
-  // 使用配置项显示图表
-  chart.setOption(option);
+  try {
+    // 基于DOM元素初始化echarts实例
+    const chart = echarts.init(echartsRef?.value);
+
+    // 使用配置项显示图表
+    chart.setOption(option);
+  } catch (error) {
+    console.log(error);
+  }
 }
 
 const loadOrderList = () => {
@@ -192,7 +196,7 @@ onMounted(() => {
           </div>
           <div>订单总数</div>
         </div>
-        <div class="map" ref="echartsRef"></div>
+        <div class="map" id="c2map" ref="echartsRef"></div>
       </div>
     </div>
   </border>
diff --git a/src/view/index/components/centerMap.vue b/src/view/index/components/centerMap.vue
index e8f8a18..e7b091b 100644
--- a/src/view/index/components/centerMap.vue
+++ b/src/view/index/components/centerMap.vue
@@ -260,7 +260,6 @@ const mapInfo = () => {
   if (area.name == "江阳区") map = jiangyang_geo;
   if (area.name == "叙永县") map = xuyong_geo;
   map = JSON.parse(JSON.stringify(map));
-
   if (appStore.address.streetCode) {
     let street = appStore.street.find(item => item.code == appStore.address.streetCode);
     initStreetMap(street, map);
@@ -281,7 +280,9 @@ onMounted(() => {
   changeType('xuyong');
   mapInfo();
   initDataValue();
-  initMap();
+  setTimeout(() => {
+    initMap();
+  })
 })
 
 </script>
diff --git a/src/view/index/components/leftItme1.vue b/src/view/index/components/leftItme1.vue
index 6303f54..b9185a9 100644
--- a/src/view/index/components/leftItme1.vue
+++ b/src/view/index/components/leftItme1.vue
@@ -25,7 +25,7 @@ const initData = (data) => {
     )
   }
   list.data = arr;
-  scrollBoardRef.value.updateRows(list.data);
+  scrollBoardRef.value?.updateRows(list.data);
 }
 
 const scrollBoardRef = ref(null);