From d94dc757bf8ed11119034f41df5c5b0cf9bdb28c Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Oct 2023 16:49:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E6=A1=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.wxml | 4 ++-- pages/tabs/tabs.js | 3 +++ pages/tabs/tabs.wxml | 3 ++- pages/tabs/tabs.wxss | 41 ++++++++++++++++++++++------------------- pages/tabs/tip.png | Bin 0 -> 3015 bytes pages/tabs/tomob.png | Bin 0 -> 3550 bytes 6 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pages/tabs/tip.png create mode 100644 pages/tabs/tomob.png diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 52cf3ab..badafa2 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -62,7 +62,7 @@ {{state===states.startScan?'开始定位':'努力定位中'}} - {{state===states.startScan?'请抬起手机,缓慢扫描周围环境。':'请扫描其他区域试试'}} + {{state===states.startScan?'请缓慢扫描周围店铺名称':'请扫描其他区域试试'}} 返回 @@ -78,4 +78,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/tabs/tabs.js b/pages/tabs/tabs.js index 64686ce..9c62b59 100644 --- a/pages/tabs/tabs.js +++ b/pages/tabs/tabs.js @@ -28,5 +28,8 @@ Component({ handleToMap() { this.triggerEvent("tomap"); }, + handleToMob() { + this.triggerEvent("tomob"); + }, }, }); diff --git a/pages/tabs/tabs.wxml b/pages/tabs/tabs.wxml index c730484..43861a2 100644 --- a/pages/tabs/tabs.wxml +++ b/pages/tabs/tabs.wxml @@ -11,4 +11,5 @@ 当前楼层 {{floor}} -请按照导航路线行走 \ No newline at end of file + + \ No newline at end of file diff --git a/pages/tabs/tabs.wxss b/pages/tabs/tabs.wxss index f4db58f..a2e62ba 100644 --- a/pages/tabs/tabs.wxss +++ b/pages/tabs/tabs.wxss @@ -37,14 +37,27 @@ .relocate { position: fixed; z-index: 15 !important; - right: 4px; - width: 46px; - height: 46px; - bottom: 235px; + right: 8px; + width: 38px; + height: 38px; + bottom: 262px; } .relocate.high { - bottom: 362px; + bottom: 381px; +} + +.tomob { + position: fixed; + z-index: 15 !important; + right: 8px; + width: 128px; + height: 40px; + bottom: 210px; +} + +.tomob.high { + bottom: 338px; } .floor { @@ -82,24 +95,14 @@ color: #ef9617; } .tip { - display: inline-flex; z-index: 15 !important; position: fixed; right: 8px; - bottom: 211px; - padding: 0 10px; - height: 25px; - line-height: 25px; - background: #f37b6f; - backdrop-filter: blur(2px); - border-radius: 50px; - font-family: PingFang SC; - font-style: normal; - font-weight: bold; - font-size: 12px; - color: #ffffff; + bottom: 306px; + width: 112px; + height: 34px; } .tip.high { - bottom: 338px; + bottom: 426px; } diff --git a/pages/tabs/tip.png b/pages/tabs/tip.png new file mode 100644 index 0000000000000000000000000000000000000000..2263d4101a74e789daab6b577dc8194798a4be14 GIT binary patch literal 3015 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 literal 0 HcmV?d00001 diff --git a/pages/tabs/tomob.png b/pages/tabs/tomob.png new file mode 100644 index 0000000000000000000000000000000000000000..b93981d1977de2451f641f395e890ed0ca56fb89 GIT binary patch literal 3550 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