From 5ce0d76154bf4c1d70543476cdfad9a30195b0f8 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期六, 10 十月 2026 16:44:38 +0800
Subject: [PATCH] fix(miniapp): 调整首页圆角布局并隐藏滚动条
---
rencaika/pages/benefits/benefits.uvue | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/rencaika/pages/benefits/benefits.uvue b/rencaika/pages/benefits/benefits.uvue
index b0991d9..e70cc6c 100644
--- a/rencaika/pages/benefits/benefits.uvue
+++ b/rencaika/pages/benefits/benefits.uvue
@@ -9,7 +9,7 @@
</view>
</view>
- <scroll-view class="content" scroll-y lower-threshold="80" @scroll="handleScroll" @scrolltolower="loadMoreBenefits">
+ <scroll-view :show-scrollbar="false" class="content" scroll-y lower-threshold="80" @scroll="handleScroll" @scrolltolower="loadMoreBenefits">
<view class="hero">
<image class="hero-image" src="/static/benefits-assets/benefits-hero.jpg" mode="aspectFill"></image>
<view class="hero-shade"></view>
@@ -43,7 +43,7 @@
<image class="merchant-image" :src="item.image" mode="aspectFill" @error="replaceImage(item)"></image>
<view class="benefit-info">
<text class="benefit-name">{{item.name}}</text>
- <view v-if="item.hasCoupon || item.discount != ''" class="tag-row"><text v-if="item.hasCoupon" class="coupon-tag">券</text><text v-if="item.discount != ''" :class="item.hasCoupon ? 'discount-tag' : 'discount-tag no-coupon'">{{item.discount}}</text></view>
+ <view v-if="item.tags != null && item.tags.length > 0" class="tag-row"><text v-for="tag in item.tags" :key="tag" :class="tag == '券' ? 'coupon-tag' : 'discount-tag'">{{tag}}</text></view>
<view class="address-row"><image src="/static/benefits-assets/map-pin.svg"></image><text>{{item.address}}</text></view>
</view>
</view>
@@ -68,7 +68,8 @@
import { isApiConfigured } from '../../config/api.uts'
import { getMerchants } from '../../services/portal.uts'
import { resolveApiUrl } from '../../services/http.uts'
- import { getSession } from '../../services/session.uts'
+ import { resolveTalentId } from '../../utils/talent-id.uts'
+ import { openMerchantDetail } from '../../utils/merchant-navigation.uts'
const navTop = ref(28)
const navHeight = ref(32)
@@ -93,8 +94,7 @@
failInitialOnce.value = previewState == 'initialError'
failLoadMoreOnce.value = previewState == 'loadMoreError'
}
- const session = getSession()
- if (session != null && session.talentId != null) talentId.value = '' + session.talentId
+ talentId.value = resolveTalentId()
loadInitialBenefits()
})
@@ -110,18 +110,18 @@
]
const allBenefits = [
- { id: 1, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/food-assets/food-1.jpg' },
- { id: 2, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/food-assets/food-2.jpg' },
- { id: 3, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/food-assets/food-1.jpg' },
- { id: 4, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/food-assets/food-2.jpg' },
- { id: 5, name: '百杏厨房（中环天地店）', discount: '8.8折', address: '东区炳三区新福路20号中环天地负一层', image: '/static/food-assets/food-1.jpg' },
- { id: 6, name: '香佰里鲜货火锅（万象城店）', discount: '8.8折', address: '东区攀枝花大道东段298号', image: '/static/food-assets/food-2.jpg' },
- { id: 7, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/food-assets/food-1.jpg' },
- { id: 8, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/food-assets/food-2.jpg' },
- { id: 9, name: '百杏厨房（中环天地店）', discount: '8.8折', address: '东区炳三区新福路20号中环天地负一层', image: '/static/food-assets/food-1.jpg' },
- { id: 10, name: '香佰里鲜货火锅（万象城店）', discount: '8.8折', address: '东区攀枝花大道东段298号', image: '/static/food-assets/food-2.jpg' },
- { id: 11, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/food-assets/food-1.jpg' },
- { id: 12, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/food-assets/food-2.jpg' }
+ { id: 1, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/common/image-placeholder.png' },
+ { id: 2, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/common/image-placeholder.png' },
+ { id: 3, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/common/image-placeholder.png' },
+ { id: 4, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/common/image-placeholder.png' },
+ { id: 5, name: '百杏厨房（中环天地店）', discount: '8.8折', address: '东区炳三区新福路20号中环天地负一层', image: '/static/common/image-placeholder.png' },
+ { id: 6, name: '香佰里鲜货火锅（万象城店）', discount: '8.8折', address: '东区攀枝花大道东段298号', image: '/static/common/image-placeholder.png' },
+ { id: 7, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/common/image-placeholder.png' },
+ { id: 8, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/common/image-placeholder.png' },
+ { id: 9, name: '百杏厨房（中环天地店）', discount: '8.8折', address: '东区炳三区新福路20号中环天地负一层', image: '/static/common/image-placeholder.png' },
+ { id: 10, name: '香佰里鲜货火锅（万象城店）', discount: '8.8折', address: '东区攀枝花大道东段298号', image: '/static/common/image-placeholder.png' },
+ { id: 11, name: '乡菜郎·攀枝花特色延边菜', discount: '6折', address: '西区格里坪镇清香坪东街78号', image: '/static/common/image-placeholder.png' },
+ { id: 12, name: '金府酒楼（西区店）', discount: '6折', address: '西区清香坪北街51号', image: '/static/common/image-placeholder.png' }
]
const visibleBenefits = ref<any[]>([])
const loadedBenefitCount = ref(0)
@@ -140,12 +140,29 @@
const item: any = records[index]
const rawType = item.merchantType != null ? item.merchantType as string : 'food'
const merchantType = rawType == '餐饮服务' ? 'food' : rawType
+ const hasCoupon = item.couponAvailable === true || Number(item.couponAvailable) == 1
+ const discount = item.discountText != null ? item.discountText as string : ''
+ const hasConfiguredTags = item.benefitTags instanceof Array
+ const configuredTags: any[] = hasConfiguredTags ? item.benefitTags as any[] : []
+ const tags: string[] = []
+ for (let tagIndex = 0; tagIndex < configuredTags.length; tagIndex++) {
+ const tag = String(configuredTags[tagIndex]).trim()
+ if (tag != '' && tags.indexOf(tag) < 0) tags.push(tag)
+ }
+ if (!hasConfiguredTags) {
+ if (hasCoupon) tags.push('券')
+ if (discount != '' && discount != '券') tags.push(discount)
+ }
mapped.push({
id: '' + item.id,
name: item.merchantName != null ? item.merchantName as string : '人才权益商户',
merchantType: merchantType,
- hasCoupon: item.couponAvailable === true || Number(item.couponAvailable) == 1,
- discount: item.discountText != null ? item.discountText as string : '',
+ detailType: item.detailType != null ? item.detailType as string : 'MERCHANT',
+ detailBusinessId: item.detailBusinessId != null ? '' + item.detailBusinessId : '' + item.id,
+ targetAction: item.targetAction != null ? item.targetAction as string : 'MERCHANT',
+ hasCoupon: hasCoupon,
+ discount: discount,
+ tags: tags,
address: item.address != null ? item.address as string : '',
image: item.coverUrl != null && item.coverUrl != '' ? resolveApiUrl(item.coverUrl as string) : fallbackImage
})
@@ -228,13 +245,7 @@
}
uni.showToast({ title: '已选择' + name, icon: 'none' })
}
- const openMerchant = (item: any) => uni.navigateTo({
- url: '/pages/merchant/merchant?merchantType=' + encodeURIComponent(item.merchantType != null ? item.merchantType : 'food') + '&merchantId=' + encodeURIComponent(item.id)
- + '&name=' + encodeURIComponent(item.name)
- + '&image=' + encodeURIComponent(item.image)
- + '&address=' + encodeURIComponent(item.address)
- + '&discount=' + encodeURIComponent(item.discount)
- })
+ const openMerchant = (item: any) => openMerchantDetail(item)
const loadMoreBenefits = () => {
if (initialLoading.value || loadingMore.value || !hasMoreBenefits.value) return
loadMoreError.value = false
@@ -318,8 +329,9 @@
.benefit-info { height: 184rpx; flex: 1; min-width: 0; box-sizing: border-box; padding: 8rpx 0 7rpx 26rpx; justify-content: space-between; }
.benefit-name { color: #292929; font-size: 29rpx; line-height: 40rpx; font-weight: 700; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.tag-row { flex-direction: row; align-items: center; }
+ .tag-row text { margin-right: 11rpx; }
.coupon-tag { padding: 6rpx 8rpx; border-radius: 6rpx; background-color: #FFF0EC; color: #FF5D37; font-size: 21rpx; }
- .discount-tag { margin-left: 11rpx; padding: 6rpx 9rpx; border-radius: 6rpx; background-color: #FFF5E7; color: #FF7C2B; font-size: 21rpx; }.discount-tag.no-coupon { margin-left: 0; }
+ .discount-tag { padding: 6rpx 9rpx; border-radius: 6rpx; background-color: #FFF5E7; color: #FF7C2B; font-size: 21rpx; }
.address-row { display: flex; min-width: 0; box-sizing: border-box; padding: 7rpx 10rpx; border-radius: 7rpx; background-image: linear-gradient(90deg, rgba(239,240,242,.98) 0%, rgba(242,243,245,.76) 58%, rgba(255,255,255,0) 100%); flex-direction: row; align-items: center; }
.address-row image { width: 27rpx; height: 27rpx; margin-right: 9rpx; flex-shrink: 0; }
.address-row text { flex: 1; color: #7E8490; font-size: 21rpx; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
--
Gitblit v1.7.1