From 9aa84e8a5add1e62b2fa14856f7e41d1b65d37b0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 15 Aug 2024 11:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E8=BF=91=E7=9A=84BU?=
 =?UTF-8?q?G?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/inject.js          | 2 +-
 src/views/AppStoresTable.vue | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/utils/inject.js b/src/utils/inject.js
index a39ce2e..5354979 100644
--- a/src/utils/inject.js
+++ b/src/utils/inject.js
@@ -184,7 +184,7 @@ Vue.component("tableColumn", {
           return config.custom ? h('div', {
               style: {color: row.preSaleNum > row.stockNum ? 'red' : '#fff'}, class: 'pointer'
             }, '周边库存情况') :
-            h('span', row[config.prop] || '')
+            h('span', row[config.prop] ?? '')
         }
       }
     })
diff --git a/src/views/AppStoresTable.vue b/src/views/AppStoresTable.vue
index e6d9864..e145264 100644
--- a/src/views/AppStoresTable.vue
+++ b/src/views/AppStoresTable.vue
@@ -137,9 +137,8 @@ export default {
             column.format ? column.format(e) : e[column.prop])) || [],
       }
     },
-    openNearbyStores({rowIndex}, store) {
-      const {thirdGoodsCode} = this.storeKeyGoods[rowIndex],
-          {storeCode, longitude, latitude} = store
+    openNearbyStores({thirdGoodsCode}, store) {
+      const {storeCode, longitude, latitude} = store
       return $http.post("/data-boot/la/screen/multipleStoreBoard/aroundStock", {
         type: "1", ...this.search, storeCode, longitude, latitude, thirdGoodsCode,
       }).then(res => {
@@ -151,14 +150,14 @@ export default {
     },
   },
   mounted() {
-    this.height = `${this.$el.clientHeight}px`
+    this.height = `${this.$el.clientHeight - 30}px`
   }
 }
 </script>
 
 <template>
   <section class="AppStoresTable" @click="dialog=false">
-    <el-carousel indicator-position="none" :height="height" :autoplay="search.changeWay==1" @change="v=>curI=(v||0)" :interval="15000">
+    <el-carousel indicator-position="outside" :height="height" :autoplay="search.changeWay==1" @change="v=>curI=(v||0)" :interval="60000">
       <el-carousel-item v-for="(group,i) in storeList" :key="i">
         <div class="layout">
           <div class="store" v-for="store in group" :key="store.storeCode">