From 591ccbd63d0ef8d71442ee043b4a5f485ec89462 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 11 二月 2025 11:25:02 +0800
Subject: [PATCH] feat: 修改项目相关配置
---
apps/cMiniApp/src/assets/tabbar/icon-home-active.png | 0
apps/cMiniApp/src/components/Layout/PageLayoutWithBg.vue | 2
apps/cMiniApp/src/assets/tabbar/icon-mine.png | 0
apps/cMiniApp/src/styles/var.scss | 6 +-
apps/cMiniApp/src/pages/home/index.vue | 35 ++++++++++-
apps/cMiniApp/src/assets/tabbar/icon-task-active.png | 0
apps/cMiniApp/src/assets/home/icon-logo.png | 0
apps/cMiniApp/src/assets/tabbar/icon-task.png | 0
/dev/null | 0
apps/cMiniApp/src/assets/tabbar/icon-mine-active.png | 0
apps/cMiniApp/src/constants/img.ts | 2
apps/cMiniApp/src/pages/task/task.config.ts | 3 +
apps/bMiniApp/src/styles/custom_theme.scss | 2
apps/cMiniApp/src/pages/task/task.vue | 13 ++++
apps/cMiniApp/src/constants/tabBar.ts | 1
apps/cMiniApp/src/custom-tab-bar/index.scss | 8 +-
apps/cMiniApp/src/constants/router.ts | 1
apps/cMiniApp/src/app.config.ts | 8 ++
apps/cMiniApp/src/components/Searchbar/BlSearchbar.vue | 29 +++++++++
apps/cMiniApp/src/assets/tabbar/icon-home.png | 0
apps/cMiniApp/src/custom-tab-bar/index.tsx | 36 +++--------
21 files changed, 106 insertions(+), 40 deletions(-)
diff --git a/apps/bMiniApp/src/styles/custom_theme.scss b/apps/bMiniApp/src/styles/custom_theme.scss
index b2641aa..7c3f048 100644
--- a/apps/bMiniApp/src/styles/custom_theme.scss
+++ b/apps/bMiniApp/src/styles/custom_theme.scss
@@ -8,4 +8,4 @@
$button-border-width: 0;
$button-primary-background-color: $primary-color;
-$body-background-color: #f9f9fb;
+$body-background-color: #f6f6f8;
diff --git a/apps/cMiniApp/src/app.config.ts b/apps/cMiniApp/src/app.config.ts
index 0a16e9a..78083e0 100644
--- a/apps/cMiniApp/src/app.config.ts
+++ b/apps/cMiniApp/src/app.config.ts
@@ -1,6 +1,6 @@
export default defineAppConfig({
entryPagePath: 'pages/home/index',
- pages: ['pages/home/index', 'pages/mine/index'],
+ pages: ['pages/home/index', 'pages/task/task', 'pages/mine/index'],
requiredPrivateInfos: ['getLocation'],
permission: {
'scope.userLocation': {
@@ -26,6 +26,12 @@
text: '棣栭〉',
},
{
+ pagePath: 'pages/task/task',
+ iconPath: 'assets/tabbar/icon-task.png',
+ selectedIconPath: 'assets/tabbar/icon-task-active.png',
+ text: '浠诲姟',
+ },
+ {
pagePath: 'pages/mine/index',
iconPath: 'assets/tabbar/icon-mine.png',
selectedIconPath: 'assets/tabbar/icon-mine-active.png',
diff --git a/apps/cMiniApp/src/assets/home/icon-logo.png b/apps/cMiniApp/src/assets/home/icon-logo.png
new file mode 100644
index 0000000..084a4b0
--- /dev/null
+++ b/apps/cMiniApp/src/assets/home/icon-logo.png
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-follow-active.png b/apps/cMiniApp/src/assets/tabbar/icon-follow-active.png
deleted file mode 100644
index 8935690..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-follow-active.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-follow.png b/apps/cMiniApp/src/assets/tabbar/icon-follow.png
deleted file mode 100644
index 1a52d69..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-follow.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-friend-active.png b/apps/cMiniApp/src/assets/tabbar/icon-friend-active.png
deleted file mode 100644
index 9c87699..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-friend-active.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-friend.png b/apps/cMiniApp/src/assets/tabbar/icon-friend.png
deleted file mode 100644
index e7925dd..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-friend.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-home-active.png b/apps/cMiniApp/src/assets/tabbar/icon-home-active.png
index 89b000a..6ac80b1 100644
--- a/apps/cMiniApp/src/assets/tabbar/icon-home-active.png
+++ b/apps/cMiniApp/src/assets/tabbar/icon-home-active.png
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-home.png b/apps/cMiniApp/src/assets/tabbar/icon-home.png
index 8fcdf1c..76ad785 100644
--- a/apps/cMiniApp/src/assets/tabbar/icon-home.png
+++ b/apps/cMiniApp/src/assets/tabbar/icon-home.png
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-information-active.png b/apps/cMiniApp/src/assets/tabbar/icon-information-active.png
deleted file mode 100644
index c0d442f..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-information-active.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-information.png b/apps/cMiniApp/src/assets/tabbar/icon-information.png
deleted file mode 100644
index bff15c8..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-information.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-message-active.png b/apps/cMiniApp/src/assets/tabbar/icon-message-active.png
deleted file mode 100644
index fb4e87d..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-message-active.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-message.png b/apps/cMiniApp/src/assets/tabbar/icon-message.png
deleted file mode 100644
index 0635f33..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-message.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-mine-active.png b/apps/cMiniApp/src/assets/tabbar/icon-mine-active.png
index ba19ce1..4170967 100644
--- a/apps/cMiniApp/src/assets/tabbar/icon-mine-active.png
+++ b/apps/cMiniApp/src/assets/tabbar/icon-mine-active.png
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-mine.png b/apps/cMiniApp/src/assets/tabbar/icon-mine.png
index dddc254..d399adb 100644
--- a/apps/cMiniApp/src/assets/tabbar/icon-mine.png
+++ b/apps/cMiniApp/src/assets/tabbar/icon-mine.png
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-product-active.png b/apps/cMiniApp/src/assets/tabbar/icon-product-active.png
deleted file mode 100644
index a5d9e0c..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-product-active.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-product.png b/apps/cMiniApp/src/assets/tabbar/icon-product.png
deleted file mode 100644
index 7167f0d..0000000
--- a/apps/cMiniApp/src/assets/tabbar/icon-product.png
+++ /dev/null
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-task-active.png b/apps/cMiniApp/src/assets/tabbar/icon-task-active.png
new file mode 100644
index 0000000..2844544
--- /dev/null
+++ b/apps/cMiniApp/src/assets/tabbar/icon-task-active.png
Binary files differ
diff --git a/apps/cMiniApp/src/assets/tabbar/icon-task.png b/apps/cMiniApp/src/assets/tabbar/icon-task.png
new file mode 100644
index 0000000..b1ce967
--- /dev/null
+++ b/apps/cMiniApp/src/assets/tabbar/icon-task.png
Binary files differ
diff --git a/apps/cMiniApp/src/components/Layout/PageLayoutWithBg.vue b/apps/cMiniApp/src/components/Layout/PageLayoutWithBg.vue
index 5456a67..414d78b 100644
--- a/apps/cMiniApp/src/components/Layout/PageLayoutWithBg.vue
+++ b/apps/cMiniApp/src/components/Layout/PageLayoutWithBg.vue
@@ -42,7 +42,7 @@
top: 0;
left: 0;
width: 100%;
- height: 516px;
+ height: 644px;
object-fit: cover;
}
</style>
diff --git a/apps/cMiniApp/src/components/Searchbar/BlSearchbar.vue b/apps/cMiniApp/src/components/Searchbar/BlSearchbar.vue
new file mode 100644
index 0000000..0c4a669
--- /dev/null
+++ b/apps/cMiniApp/src/components/Searchbar/BlSearchbar.vue
@@ -0,0 +1,29 @@
+<template>
+ <nut-searchbar shape="round" class="bole-search-bar" v-model.trim="model" v-bind="$attrs">
+ <template #leftin>
+ <Search2 />
+ </template>
+ </nut-searchbar>
+</template>
+
+<script setup lang="ts">
+import { Search2 } from '@nutui/icons-vue-taro';
+
+defineOptions({
+ name: 'BlSearchbar',
+});
+
+// type Props = {};
+
+// const props = withDefaults(defineProps<Props>(), {});
+const model = defineModel<string>();
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+
+.bole-search-bar {
+ padding: 0;
+ background-color: transparent;
+}
+</style>
diff --git a/apps/cMiniApp/src/constants/img.ts b/apps/cMiniApp/src/constants/img.ts
index d4f66e0..b397868 100644
--- a/apps/cMiniApp/src/constants/img.ts
+++ b/apps/cMiniApp/src/constants/img.ts
@@ -2,7 +2,7 @@
export const OssAssets = {
common: {
- CommonPageBg: `${OssBasePath}/matchMakingMini/assets/common/icon-common-page-bg.png`,
+ CommonPageBg: `${OssBasePath}/flexJobMini/assets/common/icon-common-page-bg.png`,
},
mine: {
Bg: `${OssBasePath}/matchMakingMini/assets/mine/icon-bg.png`,
diff --git a/apps/cMiniApp/src/constants/router.ts b/apps/cMiniApp/src/constants/router.ts
index 0c2dd71..23c1956 100644
--- a/apps/cMiniApp/src/constants/router.ts
+++ b/apps/cMiniApp/src/constants/router.ts
@@ -4,6 +4,7 @@
loginByForm = '/subpackages/login/loginByForm/loginByForm',
registerForm = '/subpackages/login/registerForm/registerForm',
home = '/pages/home/index',
+ task = '/pages/task/task',
mine = '/pages/mine/index',
editRichContent = '/subpackages/editRichContent/editRichContent',
diff --git a/apps/cMiniApp/src/constants/tabBar.ts b/apps/cMiniApp/src/constants/tabBar.ts
index 405c9bd..49092b8 100644
--- a/apps/cMiniApp/src/constants/tabBar.ts
+++ b/apps/cMiniApp/src/constants/tabBar.ts
@@ -1,4 +1,5 @@
export const TabBarPageRouter = {
Home: '/pages/home/index',
+ Task: '/pages/task/task',
Mine: '/pages/mine/index',
};
diff --git a/apps/cMiniApp/src/custom-tab-bar/index.scss b/apps/cMiniApp/src/custom-tab-bar/index.scss
index 8b60f24..d084602 100644
--- a/apps/cMiniApp/src/custom-tab-bar/index.scss
+++ b/apps/cMiniApp/src/custom-tab-bar/index.scss
@@ -43,14 +43,14 @@
}
.bottom-tab-item-icon {
- width: 40px;
- height: 40px;
+ width: 48px;
+ height: 48px;
}
.bottom-tab-item-text {
color: #707070;
- font-size: 20px;
- line-height: 24px;
+ font-size: 24px;
+ line-height: 28px;
}
.bottom-tab-item-badge {
diff --git a/apps/cMiniApp/src/custom-tab-bar/index.tsx b/apps/cMiniApp/src/custom-tab-bar/index.tsx
index fd1eeda..703b631 100644
--- a/apps/cMiniApp/src/custom-tab-bar/index.tsx
+++ b/apps/cMiniApp/src/custom-tab-bar/index.tsx
@@ -117,7 +117,7 @@
}}
>
<TarBarItem
- text={'homeTitle'}
+ text={'鎵惧伐浣�'}
icon="../assets/tabbar/icon-home.png"
activeIcon="../assets/tabbar/icon-home-active.png"
pagePath={TabBarPageRouter.Home}
@@ -126,40 +126,26 @@
className="home"
onClick={switchTab}
></TarBarItem>
- {/* <TarBarItem
- text="琛屼笟鍦�"
- icon="../assets/tabbar/icon-friend.png"
- activeIcon="../assets/tabbar/icon-friend-active.png"
- pagePath={TabBarPageRouter.CircleFriend}
- index={1}
- active={system.activeTab === 1}
- className="circleFriend"
- onClick={switchTab}
- ></TarBarItem>
- <div class="bottom-tab-item publish-wrapper" onClick={goPublish}>
- <img class="bottom-tab-item-img-publish" src={IconPublish} />
- <div class="bottom-tab-item-text">鍙戝竷</div>
- </div>
+
<TarBarItem
text="娑堟伅"
- icon="../assets/tabbar/icon-message.png"
- activeIcon="../assets/tabbar/icon-message-active.png"
- pagePath={TabBarPageRouter.Message}
- active={system.activeTab === 2}
- className="message"
+ icon="../assets/tabbar/icon-task.png"
+ activeIcon="../assets/tabbar/icon-task-active.png"
+ pagePath={TabBarPageRouter.Task}
+ active={system.activeTab === 1}
+ className="task"
onClick={switchTab}
- index={2}
- badge={(isLogin.value && myMessageCount.value?.unReadCount) ?? 0}
- ></TarBarItem> */}
+ index={1}
+ ></TarBarItem>
<TarBarItem
text="鎴戠殑"
icon="../assets/tabbar/icon-mine.png"
activeIcon="../assets/tabbar/icon-mine-active.png"
pagePath={TabBarPageRouter.Mine}
- active={system.activeTab === 3}
+ active={system.activeTab === 2}
className="mine"
onClick={switchTab}
- index={3}
+ index={2}
></TarBarItem>
</View>
);
diff --git a/apps/cMiniApp/src/pages/home/index.vue b/apps/cMiniApp/src/pages/home/index.vue
index e3d38b0..daa5593 100644
--- a/apps/cMiniApp/src/pages/home/index.vue
+++ b/apps/cMiniApp/src/pages/home/index.vue
@@ -1,11 +1,13 @@
<template>
<PageLayoutWithBg class="index-page-wrapper" :title="'棣栭〉'" :need-auth="false">
<template #left>
- <div class="menu-btn-wrapper city-btn" @click="goCitySelect">
- <div class="city-btn-text">{{ locationCity }}</div>
- <RectDown :size="12" />
+ <div class="menu-btn-wrapper menu-logo">
+ <img :src="IconLogo" class="logo" />
</div>
</template>
+ <div class="home-searchbar-wrapper">
+ <BlSearchbar v-model.trim="searchValue"></BlSearchbar>
+ </div>
</PageLayoutWithBg>
</template>
@@ -14,9 +16,21 @@
import { useUserStore } from '@/stores/modules/user';
import { RectDown } from '@nutui/icons-vue-taro';
import Taro from '@tarojs/taro';
-import { LocationUtils } from '@12333/utils';
+import { LocationUtils, trim } from '@12333/utils';
+import _ from 'lodash';
+import IconLogo from '@/assets/home/icon-logo.png';
const { locationCity } = useUser();
+
+const searchValue = ref('');
+
+const queryState = reactive({
+ searchValueTrim: '',
+});
+
+const handleSearch = _.debounce(function () {
+ queryState.searchValueTrim = trim(searchValue.value);
+}, 300);
const userStore = useUserStore();
@@ -38,6 +52,15 @@
@import '@/styles/common.scss';
.index-page-wrapper {
+ .menu-logo {
+ padding: 0;
+
+ .logo {
+ width: 96px;
+ height: 64px;
+ }
+ }
+
.city-btn {
display: flex;
align-items: center;
@@ -48,5 +71,9 @@
margin-right: 12px;
}
}
+
+ .home-searchbar-wrapper {
+ padding: 32px 0;
+ }
}
</style>
diff --git a/apps/cMiniApp/src/pages/task/task.config.ts b/apps/cMiniApp/src/pages/task/task.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/cMiniApp/src/pages/task/task.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/cMiniApp/src/pages/task/task.vue b/apps/cMiniApp/src/pages/task/task.vue
new file mode 100644
index 0000000..b8a0b8f
--- /dev/null
+++ b/apps/cMiniApp/src/pages/task/task.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>task</div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+ name: 'task',
+});
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+</style>
diff --git a/apps/cMiniApp/src/styles/var.scss b/apps/cMiniApp/src/styles/var.scss
index ada928e..ee7a0b6 100644
--- a/apps/cMiniApp/src/styles/var.scss
+++ b/apps/cMiniApp/src/styles/var.scss
@@ -18,9 +18,9 @@
);
$bole-text-color: (
- 'primary': #444444,
- 'regular': #7c7c7c,
- 'secondary': #9e9e9e,
+ 'primary': #1d2129,
+ 'regular': #4e5969,
+ 'secondary': #9fa4ac,
'placeholder': #cbcbcb,
);
--
Gitblit v1.9.1