diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 0eb9d1c..980fd45 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -50,7 +50,8 @@ a, position: sticky; top: 0; width: 100%; - background-color: theme.$nav-header-color; + // background-color: linear-gradient(to bottom, theme.$theme-color 200px, theme.$nav-color 300px); + background: url("../img/home/nav.png") theme.$nav-color; color: #000; & .van-nav-bar__content { diff --git a/src/assets/css/theme.scss b/src/assets/css/theme.scss index 68a5c29..e016976 100644 --- a/src/assets/css/theme.scss +++ b/src/assets/css/theme.scss @@ -1,4 +1,5 @@ $theme-color: #71b73c; $card-radius: 10px; $gap: 10px; -$nav-header-color: #f2f2f2; \ No newline at end of file +$nav-header-color: #f2f2f2; +$nav-color: #EEFDE8; diff --git a/src/assets/img/home/nav.png b/src/assets/img/home/nav.png new file mode 100644 index 0000000..110cacf Binary files /dev/null and b/src/assets/img/home/nav.png differ diff --git a/src/assets/img/search/clock.svg b/src/assets/img/search/clock.svg new file mode 100644 index 0000000..6943aae --- /dev/null +++ b/src/assets/img/search/clock.svg @@ -0,0 +1,14 @@ + + + 编组 10 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/search/date.svg b/src/assets/img/search/date.svg new file mode 100644 index 0000000..b7a72ae --- /dev/null +++ b/src/assets/img/search/date.svg @@ -0,0 +1,19 @@ + + + 编组 14备份@3x + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/search/people.svg b/src/assets/img/search/people.svg new file mode 100644 index 0000000..7359006 --- /dev/null +++ b/src/assets/img/search/people.svg @@ -0,0 +1,20 @@ + + + 编组 2备份 2 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/search/编组 10(1).svg b/src/assets/img/search/编组 10(1).svg new file mode 100644 index 0000000..ba618a5 --- /dev/null +++ b/src/assets/img/search/编组 10(1).svg @@ -0,0 +1,14 @@ + + + 编组 10 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/search/编组 14备份 2.svg b/src/assets/img/search/编组 14备份 2.svg new file mode 100644 index 0000000..a8f6c1a --- /dev/null +++ b/src/assets/img/search/编组 14备份 2.svg @@ -0,0 +1,19 @@ + + + 编组 14备份 2@3x + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/search/编组 14备份(1).svg b/src/assets/img/search/编组 14备份(1).svg new file mode 100644 index 0000000..f8111e5 --- /dev/null +++ b/src/assets/img/search/编组 14备份(1).svg @@ -0,0 +1,19 @@ + + + 编组 14备份@3x + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/search/编组 2备份 2(1).svg b/src/assets/img/search/编组 2备份 2(1).svg new file mode 100644 index 0000000..b58352e --- /dev/null +++ b/src/assets/img/search/编组 2备份 2(1).svg @@ -0,0 +1,20 @@ + + + 编组 2备份 2 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/search/编组.svg b/src/assets/img/search/编组.svg new file mode 100644 index 0000000..cd96f32 --- /dev/null +++ b/src/assets/img/search/编组.svg @@ -0,0 +1,14 @@ + + + 编组 + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Layout/CommonLayout.vue b/src/components/Layout/CommonLayout.vue index 5061779..2516be9 100644 --- a/src/components/Layout/CommonLayout.vue +++ b/src/components/Layout/CommonLayout.vue @@ -6,15 +6,17 @@ const show = ref(true); @@ -22,4 +24,11 @@ const show = ref(true); .common-layout { margin-bottom: 20px; } + +.title { + margin-bottom: 10px; + color: rgba(102, 102, 102, 1); + font-size: 13px; + font-family: PingFangSC; +} diff --git a/src/components/Search/Index.vue b/src/components/Search/Index.vue index caa16ea..0c1cc02 100644 --- a/src/components/Search/Index.vue +++ b/src/components/Search/Index.vue @@ -38,7 +38,7 @@ function handleSearchActino() { .search-container { :deep(.van-search) { padding: 0; - margin: 0 10px; + margin: 0 -10px; border-radius: 0; background-color: #f5f5f5; } diff --git a/src/components/SurveyItem/Index.vue b/src/components/SurveyItem/Index.vue index 21578af..1781d66 100644 --- a/src/components/SurveyItem/Index.vue +++ b/src/components/SurveyItem/Index.vue @@ -1,22 +1,35 @@ + + - - - +h1 { + margin: 17px 0 12px 0; + font-weight: 800; + line-height: 15px; + text-align: left; + font-style: normal; +} + diff --git a/src/components/TemplateMarketItem/Index.vue b/src/components/TemplateMarketItem/Index.vue index ec1ec75..9a5536e 100644 --- a/src/components/TemplateMarketItem/Index.vue +++ b/src/components/TemplateMarketItem/Index.vue @@ -20,6 +20,4 @@ diff --git a/src/layouts/redirect.vue b/src/layouts/redirect.vue index 795aa18..7c98801 100644 --- a/src/layouts/redirect.vue +++ b/src/layouts/redirect.vue @@ -54,12 +54,13 @@ const handlePopState = () => { diff --git a/src/views/HomeSearch/components/Recommend/Index.vue b/src/views/HomeSearch/components/Recommend/Index.vue index 0ef2c1a..decd2ce 100644 --- a/src/views/HomeSearch/components/Recommend/Index.vue +++ b/src/views/HomeSearch/components/Recommend/Index.vue @@ -10,11 +10,11 @@ useFetchRecommon(); - {{ tag }} + {{ tag }} @@ -39,7 +46,7 @@ useFetchRecommon(); .recommend-container { margin-top: 20px; - padding: 0 theme.$card-radius; + padding: 0 (theme.$gap * 2); } .history-title { diff --git a/src/views/HomeSearch/components/TemplateMarket/Index.vue b/src/views/HomeSearch/components/TemplateMarket/Index.vue index 58e750f..1519077 100644 --- a/src/views/HomeSearch/components/TemplateMarket/Index.vue +++ b/src/views/HomeSearch/components/TemplateMarket/Index.vue @@ -77,3 +77,10 @@ function handleTemplateClick(template: any) { /> + +