-
-
-
-
+
+
+
+
+
diff --git a/src/components/TypeBtnList/TypeBtnList.vue b/src/components/TypeBtnList/TypeBtnList.vue
index 06c97f1..2d723c0 100644
--- a/src/components/TypeBtnList/TypeBtnList.vue
+++ b/src/components/TypeBtnList/TypeBtnList.vue
@@ -45,7 +45,7 @@ function changeType(item: TypeItem, index: number) {
display: flex;
h4 {
- width: 96px;
+ // width: 96px;
height: 40px;
font-size: 24px;
font-family: 'font_regular';
diff --git a/src/composables/useHandleScreen.ts b/src/composables/useHandleScreen.ts
index 15bd85e..3328f16 100644
--- a/src/composables/useHandleScreen.ts
+++ b/src/composables/useHandleScreen.ts
@@ -84,9 +84,11 @@ export const useHandleScreen = (callback: () => void) => {
onMounted(() => {
//获取返回首页和进入屏保的具体时间
getBackTime().then(({ data }) => {
- totalTime.value = data
+ const noWallpaper = data[1] === 0 //判断有无屏保 为0时没有
+ const paperTime = noWallpaper ? -1 : data[1]
+ totalTime.value = [data[0], paperTime]
toIndexTime.value = data[0]
- toWallpaperTime.value = data[1]
+ toWallpaperTime.value = paperTime
})
})
return {
diff --git a/src/composables/useParkingKeyboard.ts b/src/composables/useParkingKeyboard.ts
index d65efc3..f583be8 100644
--- a/src/composables/useParkingKeyboard.ts
+++ b/src/composables/useParkingKeyboard.ts
@@ -1,15 +1,17 @@
import { ref, computed } from 'vue'
import { isZhWord, isUppercaseWord } from '@/utils/utils'
+type SearchMethods = '车牌' | '车位'
+
export const useParkingKeyboard = () => {
const NOT_ENERGY_PLATE = 7 //非能源车牌长度
const ENERGY_PLATE = 8 //能源车牌长度
- const SPACE_MAX_LENGTH = 6 //车位最大允许长度
+ const SPACE_MAX_LENGTH = 4 //车位最大允许长度
const LICENSE = ['苏', 'A'] //默认车牌前缀
const plate = ref(LICENSE.slice())
const plateToString = computed(() => plate.value.join(''))
- const searchMethod = ref<'车牌' | '车位'>('车牌')
+ const searchMethod = ref
('车牌')
const inputLength = computed(() => (searchMethod.value === '车牌' ? ENERGY_PLATE : SPACE_MAX_LENGTH))
const isEnergy = ref(false)
function handleEnergy(energy: boolean) {
@@ -42,6 +44,9 @@ export const useParkingKeyboard = () => {
function del() {
plate.value.pop()
}
+ function changeSearchMethod(method: SearchMethods) {
+ searchMethod.value = method
+ }
- return { del, handleKeyboard, handleEnergy, inputLength, plate, plateToString, LICENSE, searchMethod }
+ return { del, handleKeyboard, handleEnergy, inputLength, plate, plateToString, LICENSE, searchMethod, changeSearchMethod }
}
diff --git a/src/http/api/parking/index.ts b/src/http/api/parking/index.ts
index 6730808..aa50010 100644
--- a/src/http/api/parking/index.ts
+++ b/src/http/api/parking/index.ts
@@ -1,3 +1,5 @@
import { request } from '../../http'
//找车
export const getFindCar = (license: string) => request({ url: `/ThirdPark/GetPlaceInfo?carCode=${license}` })
+
+export const getParkingInfo = () => request({ url: `/JSON/getParkingInfo.json` })
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 0dec1ae..ecf47be 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -23,5 +23,7 @@
"dispoint": "Activity and Discount",
"service": "Service",
"school": "College Of Culture",
- "hot": "Hot Shop"
+ "hot": "Hot Shop",
+ "searB": "Search Brand",
+ "road": "Traffic"
}
diff --git a/src/i18n/lang/tw.json b/src/i18n/lang/tw.json
index 821d345..f57391f 100644
--- a/src/i18n/lang/tw.json
+++ b/src/i18n/lang/tw.json
@@ -23,5 +23,7 @@
"dispoint": "優惠與活動",
"service": "貼心服務",
"school": "文化學院",
- "hot": "熱門店鋪"
+ "hot": "熱門店鋪",
+ "searB": "搜索品牌",
+ "road": "路況說明"
}
diff --git a/src/i18n/lang/zh.json b/src/i18n/lang/zh.json
index eb224a7..5d0e465 100644
--- a/src/i18n/lang/zh.json
+++ b/src/i18n/lang/zh.json
@@ -23,5 +23,7 @@
"dispoint": "优惠与活动",
"service": "贴心服务",
"school": "文化学院",
- "hot": "热门店铺"
+ "hot": "热门店铺",
+ "searB": "搜索品牌",
+ "road": "路况说明"
}
diff --git a/src/types/parking.d.ts b/src/types/parking.d.ts
new file mode 100644
index 0000000..a6d5967
--- /dev/null
+++ b/src/types/parking.d.ts
@@ -0,0 +1,8 @@
+declare interface ParkingInfo {
+ title: string
+ titleEn: string
+ content: string
+ contentEn: string
+ fileList: string[]
+ qrFileList: Array<{ name: string; nameEn: string; fileUrl: string }>
+}
diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue
index 5bf44f1..b6ae4d0 100644
--- a/src/views/Activity/Activity.vue
+++ b/src/views/Activity/Activity.vue
@@ -1,10 +1,10 @@
{{ $t('dispoint') }}
-
+
-
+
+
+
diff --git a/src/views/School/School.vue b/src/views/School/School.vue
index 7803fa6..539c34e 100644
--- a/src/views/School/School.vue
+++ b/src/views/School/School.vue
@@ -1,10 +1,10 @@
{{ $t('school') }}
-
+
-
+
+