From 7dd3f765206d8217dff55d32be69b1200fe94de5 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Tue, 12 Nov 2024 16:46:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/calibrator/calibrator.js | 6 +-
pages/index/index.wxml | 20 ++---
pages/index/index.wxss | 149 ++++++++++++---------------------
pages/index/p1.png | Bin 0 -> 1380 bytes
4 files changed, 61 insertions(+), 114 deletions(-)
create mode 100644 pages/index/p1.png
diff --git a/pages/calibrator/calibrator.js b/pages/calibrator/calibrator.js
index ee6483c..52e6680 100644
--- a/pages/calibrator/calibrator.js
+++ b/pages/calibrator/calibrator.js
@@ -47,14 +47,12 @@ Component({
lineStyle: `top: ${top}px;`,
pendingStart: Date.now(),
});
- } else if (Date.now() - this.data.pendingStart > 750) {
+ } else if (Date.now() - this.data.pendingStart > 500) {
this.setData({
lineStyle: `top: ${top}px;`,
success: true,
});
- setTimeout(() => {
- this.triggerEvent("success");
- }, 500);
+ this.triggerEvent("success");
} else {
this.setData({
lineStyle: `top: ${top}px;`,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 837a405..0a6317c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,5 @@
-
+
@@ -52,20 +52,12 @@
-
-
-
-
-
-
+ {{state===states.startScan?'校准请左右缓慢移动手机':'继续定位中，请换个场景试试'}}
+
+
+
-
- {{state===states.startScan?'开始定位':'努力定位中'}}
-
-
- {{state===states.startScan?'请缓慢扫描周围店铺名称':'请扫描其他区域试试'}}
-
- 返回
+ 取消导航
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 2077962..14b6050 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -277,119 +277,76 @@
bottom: 0;
left: 0;
right: 0;
- margin: auto;
- width: calc(100vw - 36px - 36px);
- height: calc(100vw - 36px - 36px);
- border-radius: 16px;
- box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.75);
- z-index: 10 !important;
+ z-index: 10;
+ background: rgba(0, 0, 0, 0.8);
}
-
-.scan-modal > .corner {
+.scan-modal > .meta {
position: absolute;
- z-index: 1;
- width: 32px;
- height: 32px;
- bottom: -16px;
- right: -16px;
-}
-
-.corner.lb {
- bottom: -16px;
- left: -16px;
- transform: rotate(90deg);
+ left: 0;
+ right: 0;
+ top: calc(50vh - 40px - 192px - 34px);
+ margin: auto;
+ color: var(--T-G1, #eee9de);
+ text-align: center;
+ font-family: "PingFang SC";
+ font-size: 24px;
+ font-style: normal;
+ font-weight: 500;
+ line-height: normal;
+ z-index: 2;
}
-
-.corner.tl {
- top: -16px;
- left: -16px;
- transform: rotate(180deg);
+.rect {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ left: 0;
+ top: calc(50vh - 40px);
+ width: 100vw;
+ height: 80px;
+ background: rgba(238, 233, 222, 0.3);
+ backdrop-filter: blur(3px);
}
-
-.corner.tr {
- top: -16px;
- right: -16px;
- transform: rotate(270deg);
+.rect > .line {
+ position: absolute;
+ bottom: 25px;
+ left: 14px;
+ right: 14px;
+ border-top: 2px dashed #ffdb00;
}
-
-@keyframes scan {
+@keyframes phone {
0% {
- height: 100%;
+ left: 47px;
+ }
+ 50% {
+ left: calc(100vw - 47px - 21px);
}
-
100% {
- height: 0;
+ left: 47px;
}
}
-
-.scan-modal > .scaner {
- position: absolute;
- top: -16px;
- bottom: -16px;
- left: -16px;
- right: -16px;
- border-radius: 16px;
- overflow: hidden;
-}
-
-.scan-modal > .scaner > .bg {
- position: absolute;
- left: 0;
- right: 0;
- bottom: 0;
- background: linear-gradient(
- 180deg,
- rgba(255, 255, 255, 0.48) 0.2%,
- rgba(255, 255, 255, 0) 100%
- );
- animation: 1s scan infinite ease-in-out;
-}
-
-.scan-modal > .title {
+.rect > .phone {
position: absolute;
- bottom: -68px;
- left: 0;
- right: 0;
- height: 34px;
- font-style: normal;
- font-weight: bold;
- font-size: 24px;
- line-height: 34px;
- text-align: center;
- letter-spacing: 1px;
- color: #eee9de;
-}
-
-.scan-modal > .meta {
- position: absolute;
- bottom: -97px;
- left: 0;
- right: 0;
- font-style: normal;
- font-weight: normal;
- font-size: 14px;
- line-height: 20px;
- text-align: center;
- color: #b3aea7;
+ bottom: 16px;
+ width: 21px;
+ height: 40px;
+ animation: phone 3s ease-in-out infinite;
}
-
.scan-modal > .btn {
position: absolute;
- bottom: -170px;
- left: 0;
- right: 0;
- margin: auto;
- width: 180px;
- font-family: PingFang SC;
- font-style: normal;
- font-weight: 900;
+ left: 53px;
+ right: 53px;
+ bottom: 80px;
+ border-radius: 100px;
+ background: var(--V-Y1, #ffdb00);
+ color: var(--T-_, #333);
+ text-align: center;
+ font-family: "Noto IKEA Simplified Chinese";
font-size: 16px;
+ font-style: normal;
+ font-weight: 700;
line-height: 50px;
height: 50px;
- text-align: center;
- color: #333333;
- background: #ffdb00;
- border-radius: 63px;
}
.success-prompt {
diff --git a/pages/index/p1.png b/pages/index/p1.png
new file mode 100644
index 0000000000000000000000000000000000000000..be767017ab09d8e4017899a17a771233338eff6b
GIT binary patch
literal 1380
zcmeAS@N?(olHy`uVBq!ia0vp^PC#7F!3HF^Kc4mtNO2Z;L>4nJh^c}wqi2xH2cRHh
zage(c!@6@aFM%AEbVpxD28NCO+-E{-7;jBn?9XT*d`9RL6Q+!BL+6=zoN
zZ7;TDzGCK_*?M8ug_Dao?q(EbikGVI2rz%7*D38d;gyqs>l%SO9T)OmDRm#~<&P=R
z`EkIcq~)5B;@hp2=d`y!-~BVqsJ}S9XtMQ%IluoNGBE!>$LHPOv*qV(=j<%DbNH~K
zEa>FkP9CijtIihA53gkUtGqbQzInlpf`r8#zJJnslh%cQU8i)X^2yc9ORAo1oWF63
zfOx!eU-z}Zt!vjVa&$dlv1&)dU%dsgrzabv%7zD7b=?XG{IIQR7sKY6VP{iURkq*#
z(>=+db(yz<+Rqqi6Q!ovhfP@$N_G3Der3#!v*W+L9eCr;6Iay!$?hJ1&>nr1F6E_zX*a*J6Z?V3t?rL2By^k;Ti{^DKxZqgx
zp$;s-itz=U@fg>+g*OR9G)#d=g^_Iif_cM8YU`#pXjy4Ot4F9
zzuMB~SHULlSgrc}@Bj7;4+&5znihZG;P>am8k5gDK25Vu>@?<{%W9aCYx=1w@Voo{
z8v92F4ASZ?*XZAHndg#X%@rf^PDizgKU==&#j3?`-^6xt+_kvZRCqBUJ=OQV`Aq?v
zU7ZGIS|uGEZnM~gEd{swu3m9lU(j*Ki4KlKVuHLbEXqm}f(L=pE(Y6nwTUVIaB1Ow
z{7mW9n%pB>pFg{9!XqZgt)f%}R-n`*DA?1H0M+xOOTuevs@41*`>PyWX7tQDcYWW%
ziNb+vJ2~o~6!)?zE$V|Sz41ytNZG?a=gJ3rr6X>dCrb7$-EVo9#q5;P-20+X+mQ|5
zX+0lklL@a{k;#WaTv}FkuUzrZ!W4_kKOLv{EWdiSG~g3M)Va#_A^wD(yxs+Gbh1zAEv%7P
z?tjlsVnWD$6$Zr%;euB#pO3NZ``gf?Bl-Wg@}<-n9#)YT-)&#J{Hybu+K*4LNe*3;mN`)L75ft*iX$nWYu^
zMt{!6i@PN!8JJa_Uw^J_p5CFq!E>K5toy0=XZ5X%^4yZo&jl@t(Arw(VKie^+C^s3
zN#_!beq^Oj>Fbl*`-)dx+b?a$+pp$VrEkCG{x8C-UNFThdXu%A%I3#nC5mkl9F)TH~536e3cqXqpRypI~
z9INTwyWXsKIsfE@j>`I^=c#@*9{p9%pH_Hw{5~4@PWZmpu4gNrH+410-%?&Mmwnse
WxQc|&-`4>PMFvk-KbLh*2~7Y=BYuAX
literal 0
HcmV?d00001