diff --git a/src/assets/images/search/resultPo.png b/src/assets/images/search/resultPo.png new file mode 100644 index 0000000..7309486 Binary files /dev/null and b/src/assets/images/search/resultPo.png differ diff --git a/src/assets/images/traffic.png b/src/assets/images/traffic.png new file mode 100644 index 0000000..6314f8e Binary files /dev/null and b/src/assets/images/traffic.png differ diff --git a/src/components/Search/Hot.vue b/src/components/Search/Hot.vue index 48931cf..750a6cf 100644 --- a/src/components/Search/Hot.vue +++ b/src/components/Search/Hot.vue @@ -3,7 +3,7 @@
{{ $t('hot') }}
-
+
@@ -23,11 +23,18 @@ diff --git a/src/components/Search/Result.vue b/src/components/Search/Result.vue new file mode 100644 index 0000000..af3d912 --- /dev/null +++ b/src/components/Search/Result.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue index cacbcb1..75b86ea 100644 --- a/src/components/Search/Search.vue +++ b/src/components/Search/Search.vue @@ -1,24 +1,63 @@ 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/i18n/lang/en.json b/src/i18n/lang/en.json index ab00497..0355c8b 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -21,5 +21,6 @@ "service": "Service", "school": "College Of Culture", "hot": "Hot Shop", - "searB": "Search Brand" + "searB": "Search Brand", + "road": "Traffic" } diff --git a/src/i18n/lang/tw.json b/src/i18n/lang/tw.json index 2123142..e631a6d 100644 --- a/src/i18n/lang/tw.json +++ b/src/i18n/lang/tw.json @@ -21,5 +21,6 @@ "service": "貼心服務", "school": "文化學院", "hot": "熱門店鋪", - "searB": "搜索品牌" + "searB": "搜索品牌", + "road": "路況說明" } diff --git a/src/i18n/lang/zh.json b/src/i18n/lang/zh.json index a6b8eaf..0640410 100644 --- a/src/i18n/lang/zh.json +++ b/src/i18n/lang/zh.json @@ -21,5 +21,6 @@ "service": "贴心服务", "school": "文化学院", "hot": "热门店铺", - "searB": "搜索品牌" + "searB": "搜索品牌", + "road": "路况说明" } 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 @@