From a9776044c75d821a420445e5e784583230c64327 Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 4 May 2023 09:22:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Search/Key.vue | 47 ++++++++++++++++---------------- src/components/Search/Result.vue | 8 ++++-- src/i18n/lang/en.json | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/components/Search/Key.vue b/src/components/Search/Key.vue index 32bccd9..fd61b03 100644 --- a/src/components/Search/Key.vue +++ b/src/components/Search/Key.vue @@ -17,8 +17,13 @@ > {{ item }} -
  • - +
  • + + +
    • @@ -63,6 +68,7 @@ const letter = [ 'M' ] const current = ref(-1) +const time = ref() // 点击键盘其他按键 function handleLetter(item: string | number, index: number) { if (current.value === index) { @@ -71,11 +77,20 @@ function handleLetter(item: string | number, index: number) { if (props.word.length < 10) { emit('change', item) current.value = index + time.value = setTimeout(() => { + clearTimeout(time.value) + current.value = -1 + }, 500) } } // 删除 -function del() { +function del(index: number) { + current.value = index + time.value = setTimeout(() => { + clearTimeout(time.value) + current.value = -1 + }, 500) emit('del') } @@ -160,7 +175,11 @@ function del() { } } .active-btn { - animation: gradient 3s ease 1; + color: #fff; + background: #9b8c85; + img { + filter: invert(1) brightness(100%); + } } .del { width: 184px; @@ -169,24 +188,4 @@ function del() { } } } - -@keyframes gradient { - 0% { - background: #f4f4f4; - } - 25% { - color: #fff; - background: #9b8c85; - } - 50% { - color: #fff; - background: #9b8c85; - } - 75% { - background: #f4f4f4; - } - 100% { - background: #f4f4f4; - } -} diff --git a/src/components/Search/Result.vue b/src/components/Search/Result.vue index af3d912..5e4414b 100644 --- a/src/components/Search/Result.vue +++ b/src/components/Search/Result.vue @@ -1,6 +1,6 @@ @@ -40,7 +41,7 @@ function show(item: Shop) { padding-top: 64px; padding-left: 65px; background: #fff; - border-radius: 12px; + border-radius: 12px 12px 0 0; .myScoll { overflow: hidden; height: 630px; @@ -104,5 +105,8 @@ function show(item: Shop) { } } } + .empty { + margin-left: 45px; + } } diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index 0355c8b..0ff0c16 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -19,7 +19,7 @@ }, "dispoint": "Activity and Discount", "service": "Service", - "school": "College Of Culture", + "school": "School", "hot": "Hot Shop", "searB": "Search Brand", "road": "Traffic" From 142dfd9a33898c6c63f1ea3d78b70ec2afd63f8a Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 4 May 2023 16:11:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Search/Result.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/Search/Result.vue b/src/components/Search/Result.vue index 5e4414b..22e75ec 100644 --- a/src/components/Search/Result.vue +++ b/src/components/Search/Result.vue @@ -38,8 +38,7 @@ function show(item: Shop) { .result-container { width: 714px; height: 694px; - padding-top: 64px; - padding-left: 65px; + padding: 64px 85px 0 65px; background: #fff; border-radius: 12px 12px 0 0; .myScoll { @@ -48,7 +47,7 @@ function show(item: Shop) { } .shop_list { display: grid; - gap: 32px 180px; + gap: 32px 150px; grid-template-columns: 1fr 1fr; padding-bottom: 10px; .shop_item { @@ -71,12 +70,12 @@ function show(item: Shop) { } } .info { - width: 96px; + width: 120px; height: 60px; .name { @include no-wrap; - width: 96px; + width: 120px; height: 32px; margin-bottom: 6px; font-size: 24px; From d8915eef1d0e4a84140cba3f1de99f019f5faf01 Mon Sep 17 00:00:00 2001 From: liyongle Date: Fri, 5 May 2023 10:35:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PlateInput/PlateInput.vue | 3 +-- src/views/Member/Member.vue | 4 ++-- src/views/Parking/Parking.vue | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/PlateInput/PlateInput.vue b/src/components/PlateInput/PlateInput.vue index 8f3fb9f..6d1e61f 100644 --- a/src/components/PlateInput/PlateInput.vue +++ b/src/components/PlateInput/PlateInput.vue @@ -19,7 +19,7 @@
    - {{ btnText }} + 查找车辆
    @@ -41,7 +41,6 @@ const props = withDefaults(defineProps(), { const PLATE_LENGTH = 8 //车牌长度 const renderInputLength = computed(() => (props.searchMethod === '车牌' ? PLATE_LENGTH : props.spaceLength)) -const btnText = computed(() => (props.searchMethod === '车牌' ? '寻车缴费' : '寻车导航')) const emits = defineEmits(['handle-energy', 'confirm']) const isEnergy = ref(false) diff --git a/src/views/Member/Member.vue b/src/views/Member/Member.vue index d725797..4f9517c 100644 --- a/src/views/Member/Member.vue +++ b/src/views/Member/Member.vue @@ -3,8 +3,8 @@
    -
    > + +