From d113f5c5536cfe9aeecf5e3d5fd3b0295fa567e3 Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Thu, 29 Oct 2026 17:00:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(buyer):=20=E6=96=B0=E5=A2=9EPC=E7=AB=AF?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2=E4=B8=8E=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/shopentry.js | 13 +- buyer/src/components/Search.vue | 93 ++- buyer/src/components/goods/GoodsThumb.vue | 26 +- buyer/src/pages/StoreList.vue | 878 ++++++++++++++++++++++ buyer/src/router/index.js | 7 + 5 files changed, 1007 insertions(+), 10 deletions(-) create mode 100644 buyer/src/pages/StoreList.vue diff --git a/buyer/src/api/shopentry.js b/buyer/src/api/shopentry.js index 18aefdc90..015ad40d1 100644 --- a/buyer/src/api/shopentry.js +++ b/buyer/src/api/shopentry.js @@ -6,7 +6,8 @@ import request, { export function shopList (params) { return request({ url: '/buyer/store/store', - needToken: true, + needToken: false, + optionalToken: true, method: Method.GET, params }) @@ -52,6 +53,16 @@ export function getStoreById (id) { } // 店铺详情 +// 获取店铺工商/营业执照信息 +export function getLicencePhoto (id) { + return request({ + url: `/buyer/store/store/get/licencePhoto/${id}`, + needToken: false, + optionalToken: true, + method: Method.GET + }) +} + export function getDetailById (id) { return request({ url: `/buyer/store/store/get/detail/${id}`, diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue index 38ad65737..5975c9983 100644 --- a/buyer/src/components/Search.vue +++ b/buyer/src/components/Search.vue @@ -6,7 +6,7 @@ v-model="searchData" size="large" class="search-input" - placeholder="输入你想查找的商品" + :placeholder="placeholderText" @focus="openPanel" @input="queueSuggest" @keyup.enter="search" @@ -37,12 +37,22 @@ @click="$router.push('/')" />
+ +
+ {{ item.label }} +
{ return parseHotWords(appStore.hotWordsList) }) +// 搜索类型：goods 商品 / store 店铺 +const searchTypes = [ + { label: '商品', value: 'goods' }, + { label: '店铺', value: 'store' }, +] +const searchType = ref(route.path === '/storeList' ? 'store' : 'goods') +// 店铺内搜索（传了 storeId）只能搜本店商品，不展示切换 +const showTypeSwitch = computed(() => !props.storeId && props.useClass !== 'fixed-show') +const isStoreMode = computed(() => searchType.value === 'store' && !props.storeId) +const placeholderText = computed(() => (isStoreMode.value ? '输入你想查找的店铺' : '输入你想查找的商品')) + +function switchType(type) { + if (searchType.value === type) return + searchType.value = type + suggestions.value = [] + suggesting.value = false +} + const showPanel = computed(() => { + // 店铺搜索暂无联想/历史，不展示下拉面板 + if (isStoreMode.value) return false if (!panelVisible.value) return false if (trimmedKeyword.value) return true return history.value.length > 0 || promotionTags.value.length > 0 @@ -179,6 +209,8 @@ watch( ) function selectTags(item) { + // 热词/历史均为商品关键词，点击时按商品搜索 + searchType.value = 'goods' searchData.value = item search() } @@ -208,6 +240,7 @@ function onDocumentClick(event) { } function queueSuggest() { + if (isStoreMode.value) return panelVisible.value = true clearTimeout(suggestTimer) const keyword = trimmedKeyword.value @@ -254,6 +287,14 @@ function search() { const keyword = trimmedKeyword.value searchData.value = keyword closePanel() + if (isStoreMode.value) { + if (route.path === '/storeList') { + emit('search', keyword) + } else { + router.push({ path: '/storeList', query: keyword ? { keyword } : {} }) + } + return + } if (keyword) remember(keyword) const url = route.path if (url == '/goodsList') { @@ -261,7 +302,7 @@ function search() { } else { const pushData = { path: '/goodsList', - query: { keyword }, + query: keyword ? { keyword } : {}, } if (props.storeId) pushData.query.storeId = props.storeId @@ -346,9 +387,8 @@ onUnmounted(() => { width: 100%; :deep(.el-input__wrapper) { - border: 1.4px solid $theme_color; - box-sizing: border-box; - border-radius: 19.6px; + border: 2px solid #409EFF; + border-radius: 4px; padding-left: 26px; padding-right: calc(#{$btn-gap * 2} + #{$btn-width}); font-size: 14px; @@ -365,15 +405,20 @@ onUnmounted(() => { top: $btn-gap; bottom: $btn-gap; width: $btn-width; - border-radius: calc((#{$input-height} - #{$btn-gap * 2}) / 2); + border-radius: 0 3px 3px 0; cursor: pointer; box-sizing: border-box; display: flex; align-items: center; justify-content: center; z-index: 1; - background-color: $theme_color; + background-color: #409EFF; color: #ffffff; + transition: background 0.2s; + + &:hover { + background-color: #66b1ff; + } } } @@ -384,6 +429,38 @@ onUnmounted(() => { .search-box{ margin-left: 28px; } + +.search-type { + display: flex; + align-items: flex-end; + gap: 4px; + height: 22px; + padding-left: 18px; + margin-top: 4px; +} + +.search-type-item { + padding: 2px 10px; + border-radius: 4px 4px 0 0; + color: #666; + font-size: 13px; + line-height: 18px; + cursor: pointer; + user-select: none; + + &:hover { + color: $theme_color; + } + + &.active { + color: #fff; + background: $theme_color; + } +} + +.search-type + .search { + margin-top: 0; +} .logo-img { max-width: 150px; cursor: pointer; diff --git a/buyer/src/components/goods/GoodsThumb.vue b/buyer/src/components/goods/GoodsThumb.vue index 05ad30b3b..05a68f595 100644 --- a/buyer/src/components/goods/GoodsThumb.vue +++ b/buyer/src/components/goods/GoodsThumb.vue @@ -1,11 +1,13 @@ + + + + diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js index c89ba0e7a..c036ce603 100644 --- a/buyer/src/router/index.js +++ b/buyer/src/router/index.js @@ -53,6 +53,7 @@ const MyGiftCards = () => import("@/pages/home/userCenter/MyGiftCards"); const Home = () => import("@/pages/user/Home"); const UserCenter = () => import("@/pages/home/Main"); const Merchant = () => import("@/pages/Merchant"); +const StoreList = () => import("@/pages/StoreList"); const NotFound = () => import("@/pages/NotFound"); const topic = () => import("@/pages/Topic"); const ShopEntry = () => import("@/pages/shopEntry/ShopEntry"); @@ -338,6 +339,12 @@ export const router = createRouter({ component: Merchant, meta: { title: "店铺" }, }, + { + path: "/storeList", + name: "StoreList", + component: StoreList, + meta: { title: "店铺列表" }, + }, { path: "/:pathMatch(.*)*", name: "NotFound",