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/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..22e75ec 100644
--- a/src/components/Search/Result.vue
+++ b/src/components/Search/Result.vue
@@ -1,6 +1,6 @@
-
+
+
@@ -37,17 +38,16 @@ 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;
+ border-radius: 12px 12px 0 0;
.myScoll {
overflow: hidden;
height: 630px;
}
.shop_list {
display: grid;
- gap: 32px 180px;
+ gap: 32px 150px;
grid-template-columns: 1fr 1fr;
padding-bottom: 10px;
.shop_item {
@@ -70,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;
@@ -104,5 +104,8 @@ function show(item: Shop) {
}
}
}
+ .empty {
+ margin-left: 45px;
+ }
}
diff --git a/src/http/api/brand/index.ts b/src/http/api/brand/index.ts
index 35439a8..e8bc72d 100644
--- a/src/http/api/brand/index.ts
+++ b/src/http/api/brand/index.ts
@@ -8,6 +8,6 @@ export const getShopListByFloor = () => request<{ list: GroupList }>({ url: `/JS
export const getShopListByIndustry = () => request<{ list: GroupList }>({ url: `/JSON/getBrandShopListByIndustryId.json` })
//点击喜欢按钮
-export const setBrandStar = (data: starPara) => request<{ code: number }>({ url: `/api/guide/v1/web/setBrandStar`, data, method: 'get' })
+export const setBrandStar = (params: starPara) => request<{ code: number }>({ url: `/guide/v1/web/setBrandStar`, params, method: 'get' })
//获取喜欢按钮
-export const getBrandStar = (data: starPara) => request({ url: `/api/guide/v1/web/getBrandStar`, data, method: 'get' })
+export const getBrandStar = (params: starPara) => request({ url: `/guide/v1/web/getBrandStar`, params, method: 'get' })
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index ecf47be..e489d4c 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -22,8 +22,10 @@
},
"dispoint": "Activity and Discount",
"service": "Service",
- "school": "College Of Culture",
+ "school": "School",
"hot": "Hot Shop",
"searB": "Search Brand",
- "road": "Traffic"
+ "road": "Traffic",
+ "navt": "Navigate to",
+ "fuwu": "Service Desk"
}
diff --git a/src/i18n/lang/tw.json b/src/i18n/lang/tw.json
index f57391f..18895d3 100644
--- a/src/i18n/lang/tw.json
+++ b/src/i18n/lang/tw.json
@@ -25,5 +25,7 @@
"school": "文化學院",
"hot": "熱門店鋪",
"searB": "搜索品牌",
- "road": "路況說明"
+ "road": "路況說明",
+ "navt": "導航至",
+ "fuwu": "服務臺"
}
diff --git a/src/i18n/lang/zh.json b/src/i18n/lang/zh.json
index 5d0e465..d55bf7e 100644
--- a/src/i18n/lang/zh.json
+++ b/src/i18n/lang/zh.json
@@ -25,5 +25,7 @@
"school": "文化学院",
"hot": "热门店铺",
"searB": "搜索品牌",
- "road": "路况说明"
+ "road": "路况说明",
+ "navt": "导航至",
+ "fuwu": "服务台"
}
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 @@
-
>
+
+