diff --git a/iot_two_template_V.zip b/iot_two_template_V.zip deleted file mode 100644 index 7d9d4c5..0000000 Binary files a/iot_two_template_V.zip and /dev/null differ diff --git a/src/components/keyboardByWritten/keyboardByWritten.vue b/src/components/KeyboardByWritten/KeyboardByWritten.vue similarity index 100% rename from src/components/keyboardByWritten/keyboardByWritten.vue rename to src/components/KeyboardByWritten/KeyboardByWritten.vue diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index e899309..64b15e3 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -4,7 +4,7 @@
-
+
{{ switchLanguage(shop, 'shopName') }}
{{ $t('detail') }}
@@ -44,22 +44,24 @@ function handleDetail() { position: absolute; top: 0; left: 0; - height: 1006px; + height: 920px; width: 1080px; - z-index: 50; + z-index: 10; } #shopInfo { position: absolute; - z-index: 400; + z-index: 9000 !important; visibility: hidden; width: 235px; - height: 157px; - background-size: 235px 157px; + height: 158px; + background-size: contain; + background-repeat: no-repeat; + background-position: center center; #shopNum { height: 75px; line-height: 80px; - padding: 0 36px 0 36px; + padding: 10px 36px 0 36px; color: #ffffff; font-family: 'font_medium'; font-size: 20px; @@ -68,12 +70,11 @@ function handleDetail() { .go-button { width: 50%; text-align: center; - line-height: 60px; - + line-height: 50px; font-weight: bold; font-size: 18px; color: #6a5e59; - height: 55px; + height: 50px; font-family: 'font_medium'; text-align: center; } @@ -82,8 +83,8 @@ function handleDetail() { font-weight: bold; font-size: 17px; width: 50%; - height: 55px; - line-height: 60px; + height: 50px; + line-height: 50px; color: #6a5e59; overflow: hidden; font-family: 'font_medium'; diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue index f6bc1f2..48fccca 100644 --- a/src/components/PublicComponent/PublicComponent.vue +++ b/src/components/PublicComponent/PublicComponent.vue @@ -1,6 +1,6 @@