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 0000000..2263d41 Binary files /dev/null and b/pages/tabs/tip.png differ diff --git a/pages/tabs/tomob.png b/pages/tabs/tomob.png new file mode 100644 index 0000000..b93981d Binary files /dev/null and b/pages/tabs/tomob.png differ