From 0c1d6bf53bcc0e3c570f1a1178dbeea448bbaca5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 28 Mar 2023 10:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.css | 27 ++++++++--
components/SearchBox.vue | 92 +++++++++++++++++----------------
static/iconfont/iconfont.ttf | Bin 3188 -> 3480 bytes
static/iconfont/iconfont.woff | Bin 2064 -> 2260 bytes
static/iconfont/iconfont.woff2 | Bin 1636 -> 1796 bytes
5 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/common/style/layout.css b/common/style/layout.css
index af80069..a66ac11 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -55,18 +55,35 @@ uni-button:after {
color: #fff;
}
.icon_scan {
- font-size: 48rpx;
- line-height: 70rpx;
+ width: 42rpx;
+ height: 48rpx;
+ font-size: 40rpx;
+ line-height: 48rpx;
color: #323232;
+ text-align: center;
+}
+.icon_phone {
+ width: 48rpx;
+ height: 48rpx;
+ font-size: 36rpx;
+ line-height: 48rpx;
+ color: #323232;
+ text-align: center;
}
.icon_del {
- font-size: 48rpx;
- line-height: 70rpx;
+ width: 46rpx;
+ height: 48rpx;
+ font-size: 46rpx;
+ line-height: 48rpx;
color: #323232;
+ text-align: center;
}
.icon_search {
+ width: 48rpx;
+ height: 48rpx;
+ font-size: 40rpx;
color: #323232;
- line-height: 70rpx;
+ line-height: 48rpx;
}
.cancel_icon::before {
content: "\e6dc";
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 2c87628..7525607 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -8,9 +8,10 @@
@blur="handleBlur($event)"
@input="handleChange($event)">
-
-
-
+
+
+
+
@@ -72,49 +73,49 @@
}, 300)
this.cur = ''
this.$emit('input', '')
+ },
+ async toPhone() {
+ // #ifdef APP-PLUS
+ let status = await this.checkPermission();
+ if (status !== 1) {
+ return;
+ }
+ // #endif
+ uni.scanCode({
+ success: (res) => {
+ this.$emit('input', res.result)
+ this.$emit('handleChange', res.result)
+ },
+ fail: (err) => {
+ // uni.showToast({
+ // title: '出错',
+ // icon: 'none'
+ // })
+ }
+ });
}
- // async toScan() {
- // // #ifdef APP-PLUS
- // let status = await this.checkPermission();
- // if (status !== 1) {
- // return;
- // }
- // // #endif
- // uni.scanCode({
- // success: (res) => {
- // this.$emit('input', res.result)
- // this.$emit('handleChange', res.result)
- // },
- // fail: (err) => {
- // // uni.showToast({
- // // title: '出错',
- // // icon: 'none'
- // // })
- // }
- // });
- // }
- // // #ifdef APP-PLUS
- // ,
- // async checkPermission(code) {
- // let status = permision.isIOS ? await permision.requestIOS('camera') :
- // await permision.requestAndroid('android.permission.CAMERA');
+ // #ifdef APP-PLUS
+ ,
+ async checkPermission(code) {
+ let status = permision.isIOS ? await permision.requestIOS('camera') :
+ await permision.requestAndroid('android.permission.CAMERA');
- // if (status === null || status === 1) {
- // status = 1;
- // } else {
- // uni.showModal({
- // content: "需要相机权限",
- // confirmText: "设置",
- // success: function(res) {
- // if (res.confirm) {
- // permision.gotoAppSetting();
- // }
- // }
- // })
- // }
- // return status;
- // }
- // // #endif
+ if (status === null || status === 1) {
+ status = 1;
+ } else {
+ uni.showModal({
+ content: "需要相机权限",
+ confirmText: "设置",
+ success: function(res) {
+ if (res.confirm) {
+ permision.gotoAppSetting();
+ }
+ }
+ })
+ }
+ return status;
+ }
+ // #endif
}
}
@@ -129,8 +130,9 @@
.buttons_wraper
position absolute
top 0
- right 0
+ right 10rpx
_wh(auto, 70rpx)
+ _fj(flex-end)
.icon_scan_active
color $red
diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
index 4ee5e5b650c09664b02fb0a6d698c67eddfb63bb..b68f8e9004f95975f077aaef535a6d31e7464d60 100644
GIT binary patch
delta 807
zcmX|8&rcIU6n<~I-L^|9ty@+KZf&;&sX-*Av?jFBNHCgska#l@TPn8vC^V5nZA_}+
zVj?lJzPZ(;Vyqqlq0KLMl^fLtz4<{m~q-WVnBAt6zu1IK~wCB-|0
z&SGhy(oF&B{i3CNc0QkTRUON8zmsyUl&h4n9iCFXjq=c3t~7bU`#!Y|plp$0p*;V1
zVf6ls4*<>706c%a6B$+jDI`qXuKOOer2asYLzx0>CTc3rY{|3b9u}f(gpKG)al)`3zs<>wJUn^P|&Kabn(M9Z?}H
zIRECkh83ebc2bbRK`pq5B%ANpvANA$H8(LpJi9Td#`6}0KcBH6+U9E(8vg4P6G#>K
zh6U0G{@nsO0pGVkp1^-tAa~$L7DOKaHL~7gY;aFn87w=O2
zG8MWgObp^MhA(1&OlxH|NEcG6LRBp3t7CnAW8-4k3tkS=m(6PSfV=+8bKb6HqsjIw
z0k#`WCLOwZl2LVCT~suzYRaOjv+S7&Db>qoDkO#JRv{GJ9C7=+%_GTZJ=4(>NJf!#
zP7YPwqpP^9>Y+>~q^kg5LJ~R+1sU2Y5Ph?`yW|qTzeJj&WfMqi2({(E1M;|ilIW#{r;9B}Wm;tNYN
zmR|BVaDN^1ux;ft)QT0ZN0>(!Ej!WPbPzuR%w1lZ%q(Sd6W31!C_S<}mCgYZOcjDd
zEfwK|az*CxiSHAd`Y{#_9*Y0Lo`{XaE2J
diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff
index ad3eb7973cabee26c3493225e2cbfb3c30126f26..655b9ec46650b60023ac9ab90232d1a13ef0f8f6 100644
GIT binary patch
delta 1788
zcmVq005N$
z00IzD1&l*yYaBp*T000PV
z0001I0001iMO}!blL!H40VR`g0Th3S*bSw4ob8dl4Z=_igzu3b@(=}L4yFoaR>%xg
zbZMfjl{86lYlO26MRvf}_avX5UEBev02JaON+7+FVD*xkTrY5Oy+o_|rq+Kx*>T{=
zi3_)VKPWR-Qx27U^VfG*PP$a-ZjCb*_D3S97U7%ssIcyrM0*cK(j
zvxg3yy%fW+d7{-i@q7&5xpf!6TU$0SPDYoFJh!)MgVO#Y-L4G=(#e1AuI3ykcO_%P
zB|CE^=g_T@2tssWq=EoLD;9D;KRh`-r5_&DqScwj;-ChovwJ_*fbEez|Mm`2X3~b&H^Gm$>EywMEEv#)
z=~3tg-F^kMk0iUn#fJ~09|LZ%45J*LV;TYnv~*rGvym{YM_XHPC;H|Vlak$n;nzRU
zBU9%(gPfv750I#H%Dm`@tZ8Pg%Y=x;x6`yuvZP5?$Z_%lIgfuHc4Oa6u@B1r5PG39
z2r(Eg#cMF=F9QxiS_Z}I5cK_UZtQdele`Q;-p0F-9ty)}^FjKTJ&sJ&{^7uHQzDZQ
zQ&Lrjr<(9sBo!0|TvfK>ty-AlECnf8|5U4ex=*D91vCk3XP1`FtWl}m
z|F0CgsEb5OjQX4|5?{oqk9|R2>I?Q5R+hx}8G4zRq)m>IXECk@2DBG;{mQtk`aRhh
zgmLQye%#7Z#LdjxNh_zby_C~QXU&uo{JS3M%ha5;tn7cR=d@>M+Xq|DE5pab#$4Vq
z^KK(N@Xmp-;pQ!?5F5iMj~r}QOL@CgZ5`bFI5vv5U8=Q~jyzRATB{vBwOOxk!cBe3
zaxBwnp_7XtBt0Z*HjS}#x$Xi3A18r@?IhB(kTkG=<=(>s%lMfZ{=
z&SMJr5HMq``H;RxDrjJw@P3(D$j2bcP0Tcc-&?`$5aK#}w390D?4(jVJIr9Hk3Dt<
zgBzp4&i@bzP4at;{zP1|kC27&W(K~4(p@w#e{!3`kBA`P=j{}ZK7--ls`)XWncZ=(r%cddwQ~Qrq8z(*KSFf+x
e7nQ}lgpuXZ$>ddIRh}isDqPMNq8}pw8odCX0u)35
delta 1597
zcmV-D2EzH&5s(lRcTYw}00961000OO01E&B000bhkrX|DfJw4rZDDW#00D>q0058x
z00H{cyKRYQY%ZeeX@000Jb0003%0007K5TiV>aBp*T000NH
z000160001UThQwPlL!H40cDeL0Th3T&<(A4ob8dp4Z<)G1jlg*7D9+ZD2N{TPy{bp
z$R|o$$tQVi8{y6eh$1*^EbU4@OS`}h$i~HJAw5a>Jj_ki&m5}Xay5OT(9r3oUV}!>
zTDJ|pdeY+hXOg}7oO9KU?aKCZ$KJM)I{tI4_x-JkCmMJQ>H|v-4S~0%G4Ou|H3iJ@i6V2_aMoWntc~
zW5fYJdFIW$-~MKHX6F$g_|t#Bp&t;B5D10TA+*5tz+D2jy9x0S;!wM3_(rmr{F(Dz
z$iWI_Tw0QI3V$0w-!{NF`U|)L4x;W*s%aXdlm>>6)G7ZP^lM^~Rno>7bG<=7UWcw*
zhTdGnr3hOPsxVy-e8__ZEts=KHK>GxVQ)|c<5S6QaPi55`p$
zWG{u~bNMiP(wVr+F<9DCQgS>2U
z#tNFrEum?s-<)BLH-xFpXqsqnlP=F_rl{lLM89QmQ!60ILQp}|z}ID4g=%Au^Ax0D
zgR||<{(wpe8W<9`URz&3zeS~S=f70!vMEw3G12p;NOKVrt#W@sT$T%JEGtWE`#ilu
zY|8fPjeun90UOU4?*ns{9
zbbYWbps!N9kxswN9xLEOu&-)mHJ}Sq#oMc2hbOswC;W(IxsL)`ft2VZgV|
zMy(&|C}`2Z4>h^X7>saZaGv}GA*Z(%tSRRM`XQ;Jfpx;~%g%$R
zgs8Nz(n$q7PMrok+z
zR;E2mJLcFzVz2v6$ofvd`dpEl{L4r8SNC?d!&)ue-nqK79Yw7_wl8gMUHV9g-@agJ
z=&K9GC`y0NGvMCn!jlsSiZqQ>^yneZah*It$UNRKy&#)nb&m|I*(4wPvdIq8#Ly8;
zFQg2fLJxIGpHt&n0-+BKXpK$4LG6>tIoM-KvWc${NlU|?V&fB^#Z03`qb00000
z05AZ40W1Ny0pbE20%8KZc${NkWME+6WGG-@V*mjrAm#!>28RD&J_7(0w*i&_c$|fi
zJ#Moy2R;EG9C{RM7f`&nj2A1@7
vxcG>g(jw;c*^fb5xn)?lvU3p6CVLSr!QZuj;`S
diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2
index b16925975192b8ecc658f58e3d54f5070cdb7eb8..c634af459efd58bb8d1a94274ea9cd2a783da720 100644
GIT binary patch
delta 1789
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
a%S~%u_S?3B4R#`*>#{LJ%Y3@s7YhI}3I?kH