Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3

src/views/mall/home/components/OperationDataCard.vue

@@ -53,10 +53,18 @@ const data = reactive({
 /** 查询订单数据 */
 const getOrderData = async () => {
   const orderCount = await TradeStatisticsApi.getOrderCount()
-  data.orderUndelivered.value = orderCount.undelivered
+  if (orderCount.undelivered != null) {
-  data.orderAfterSaleApply.value = orderCount.afterSaleApply
+    data.orderUndelivered.value = orderCount.undelivered
-  data.orderWaitePickUp.value = orderCount.pickUp
+  }
-  data.withdrawAuditing.value = orderCount.auditingWithdraw
+  if (orderCount.afterSaleApply != null) {
+    data.orderAfterSaleApply.value = orderCount.afterSaleApply
+  }
+  if (orderCount.pickUp != null) {
+    data.orderWaitePickUp.value = orderCount.pickUp
+  }
+  if (orderCount.auditingWithdraw != null) {
+    data.withdrawAuditing.value = orderCount.auditingWithdraw
+  }
 }
 
 /** 查询商品数据 */
@@ -83,6 +91,13 @@ const handleClick = (routerName: string) => {
   router.push({ name: routerName })
 }
 
+/** 激活时 */
+onActivated(() => {
+  getOrderData()
+  getProductData()
+  getWalletRechargeData()
+})
+
 /** 初始化 **/
 onMounted(() => {
   getOrderData()