From 39f668c53c69318e2531d1674661f77abc7bb678 Mon Sep 17 00:00:00 2001 From: "du.meimei" Date: Sun, 18 May 2025 13:30:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=88=91=E7=9A=84=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/publish/user.png | Bin 0 -> 666 bytes src/components/Search/Index.vue | 42 +++++++++++++++--- src/router/index.ts | 2 +- src/views/Survey/Index.vue | 4 +- .../Survey/components/EmptyContainer.vue | 12 +++-- src/views/Survey/components/SurveyItem.vue | 36 +++++++++++++-- 6 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 src/assets/img/publish/user.png diff --git a/src/assets/img/publish/user.png b/src/assets/img/publish/user.png new file mode 100644 index 0000000000000000000000000000000000000000..15d00b6060370db72d477b2de36558e5265a4abf GIT binary patch literal 666 zcmV;L0%iS)P)Px%R7pfZR7gv$l;3MoVHn51&++JXws0xV)AF9_ z8*jP^`UBQ|6C%1wiGpN97>#Wgsf=V%+d`bP#@wcx)APpbrm1HhMSOX$-sk&%&i6d; z^E`xOmOl^+GA2u&2cx%-ivw#XatkC-pk2KA4=G*Ggx!4p9)pjIl087;gk7 zCTj@7G#C=HKzDUJL*FMRs94sQz`jsOv}a9T0zC&{P;=QhMri=A;_jiBJ|dZXJ|@^* zvG)W#Y!6s}i@o)@M;?iZtdZ(Oj}G_8Y!F4EB4LanG`E8FKf9`MRq(|NW(=S2 zR{++M8H5+t+6P}7J`KCor~q)cU%vioA8Z-WW9+I$0r(bAA-25HKA7LUJ~{}S<$up4 z(>s`+Uxh3;e45e+RdZanWbEsPK`)i6BGu&4DlM&66w!$lE@&`o(XO@xMFQ_}_QJqc$t>$p>l-htXz5(K!Dy7GpWG`PhjMc4{ z8l+|WRYDHtwbF1Nw*v)` - 搜索 +

+ 搜索 +

+ @@ -38,28 +41,55 @@ function handleSearchActino() { .search-container { :deep(.van-search) { padding: 0; +<<<<<<< Updated upstream margin: 0 -10px; +======= + //margin: 0 10px; +>>>>>>> Stashed changes border-radius: 0; - background-color: #f5f5f5; + background-color: #fff; } - :deep(.el-text) { + .search { margin: 0 10px; - font-size: 14px; - color: #999; cursor: pointer; + display: flex; justify-self: center; + align-items: center; + font-weight: 500; + font-size: 12px; + color: var(--primary-color); + &::after { + content: '|'; + position: absolute; + right: 11vh; + top: 1vh; + //transform: translateY(-50%); + font-weight: bold; + color: #E7DEDF; // 竖线颜色与搜索文字一致 + pointer-events: none; // 确保不影响点击事件 + } + } + + :deep(.van-search__content){ + background-color: #fff; } border-radius: 18px; +<<<<<<< Updated upstream border: solid 2px #70b937; background-color: #f5f5f5; +======= + border: solid 1px var(--primary-color); + background-color: #fff; +>>>>>>> Stashed changes //width: 100vw; display: grid; grid-template-columns: 1fr 60px; - padding: 0 10px; + //padding: 0 10px; margin: 0 10px; overflow: hidden; } + diff --git a/src/router/index.ts b/src/router/index.ts index 85beb5e..a397588 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -38,7 +38,7 @@ const router = createRouter({ path: '/survey', name: 'survey', meta: { - title: '最新问卷' + title: '我的' }, component: () => import('../views/Survey/Index.vue') }, diff --git a/src/views/Survey/Index.vue b/src/views/Survey/Index.vue index 4d981ed..74b92c6 100644 --- a/src/views/Survey/Index.vue +++ b/src/views/Survey/Index.vue @@ -86,8 +86,8 @@ onMounted(() => { .new-survey_item { margin: 0 10px 10px; - padding: 10px 0 8px 7px; - border-radius: 8px; + padding: 15px; + border-radius: 16px; background-color: white; } diff --git a/src/views/Survey/components/EmptyContainer.vue b/src/views/Survey/components/EmptyContainer.vue index 90433a9..ef21ed1 100644 --- a/src/views/Survey/components/EmptyContainer.vue +++ b/src/views/Survey/components/EmptyContainer.vue @@ -10,10 +10,16 @@ - 新建问卷 + + 新建问卷 \ No newline at end of file +.btn{ + color: #fff; + background-color: var(--primary-color); + border: solid 1px var(--primary-color); + font-weight: 400; + border-radius: 8px; +} + diff --git a/src/views/Survey/components/SurveyItem.vue b/src/views/Survey/components/SurveyItem.vue index 25618ca..bc75b66 100644 --- a/src/views/Survey/components/SurveyItem.vue +++ b/src/views/Survey/components/SurveyItem.vue @@ -157,7 +157,7 @@ function copyItem(item: SurveyItem) {
Content Icon @@ -251,6 +251,7 @@ function copyItem(item: SurveyItem) { .survey_item_info_status { display: flex; margin-bottom: 15px; + color: #666; img { height: 12px; @@ -276,9 +277,13 @@ function copyItem(item: SurveyItem) { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + font-weight: 500; + font-size: 14px; + color: #000; } } +<<<<<<< Updated upstream .wrap { margin-left: 5px; padding: 1px 3px; @@ -286,6 +291,24 @@ function copyItem(item: SurveyItem) { border-radius: 6px; font-size: 12px; text-wrap: nowrap; +======= + & > :nth-child(2) { + position: relative; + left: 9px; + padding: 0 4px; + border: 0.5px solid rgba(192,192,192,0.35); + border-radius: 6px; + font-size: 12px; + color: #333333; + } + & > :nth-child(3) { + padding: 0 4px; + border-radius: 6px; + font-size: 12px; + color: #333333; + margin-left: 17px; + border: 0.5px solid rgba(192,192,192,0.35); +>>>>>>> Stashed changes } } @@ -298,11 +321,15 @@ function copyItem(item: SurveyItem) { background-color: #f6f7f8; overflow: hidden; text-overflow: ellipsis; - padding: 10px 15px; + padding: 14px 30px; box-sizing: border-box; +<<<<<<< Updated upstream margin: 0 10px 10px 5px; +======= + //margin: 0 10px 10px 10px; +>>>>>>> Stashed changes color: #828282; - font-weight: 400; + //font-weight: 400; font-size: 12px; section { @@ -325,7 +352,8 @@ function copyItem(item: SurveyItem) { align-items: center; justify-content: space-between; padding: 5px; - border-top: 1px dashed #f5f5f5; + margin-top: 10px; + font-weight: 400; .el-button { width: 18vw; From 0cb570ea5412c2a5c8625bd1cc609ffb419dd0d1 Mon Sep 17 00:00:00 2001 From: "du.meimei" Date: Sun, 18 May 2025 13:35:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=88=91=E7=9A=84=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Search/Index.vue | 9 --------- src/views/Survey/components/SurveyItem.vue | 19 ++----------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/components/Search/Index.vue b/src/components/Search/Index.vue index 9e46620..fac4e9f 100644 --- a/src/components/Search/Index.vue +++ b/src/components/Search/Index.vue @@ -41,11 +41,7 @@ function handleSearchActino() { .search-container { :deep(.van-search) { padding: 0; -<<<<<<< Updated upstream - margin: 0 -10px; -======= //margin: 0 10px; ->>>>>>> Stashed changes border-radius: 0; background-color: #fff; } @@ -76,13 +72,8 @@ function handleSearchActino() { } border-radius: 18px; -<<<<<<< Updated upstream - border: solid 2px #70b937; - background-color: #f5f5f5; -======= border: solid 1px var(--primary-color); background-color: #fff; ->>>>>>> Stashed changes //width: 100vw; display: grid; diff --git a/src/views/Survey/components/SurveyItem.vue b/src/views/Survey/components/SurveyItem.vue index bc75b66..984b0b5 100644 --- a/src/views/Survey/components/SurveyItem.vue +++ b/src/views/Survey/components/SurveyItem.vue @@ -283,22 +283,13 @@ function copyItem(item: SurveyItem) { } } -<<<<<<< Updated upstream .wrap { margin-left: 5px; padding: 1px 3px; - border: 2px solid #f5f5f5; - border-radius: 6px; - font-size: 12px; - text-wrap: nowrap; -======= - & > :nth-child(2) { - position: relative; - left: 9px; - padding: 0 4px; border: 0.5px solid rgba(192,192,192,0.35); border-radius: 6px; font-size: 12px; + text-wrap: nowrap; color: #333333; } & > :nth-child(3) { @@ -306,9 +297,8 @@ function copyItem(item: SurveyItem) { border-radius: 6px; font-size: 12px; color: #333333; - margin-left: 17px; + margin-left: 7px; border: 0.5px solid rgba(192,192,192,0.35); ->>>>>>> Stashed changes } } @@ -323,11 +313,6 @@ function copyItem(item: SurveyItem) { text-overflow: ellipsis; padding: 14px 30px; box-sizing: border-box; -<<<<<<< Updated upstream - margin: 0 10px 10px 5px; -======= - //margin: 0 10px 10px 10px; ->>>>>>> Stashed changes color: #828282; //font-weight: 400; font-size: 12px;