Compare commits

..

37 Commits

Author SHA1 Message Date
jacy f5e523a425 merge(dev): mini-user store list card redesign
CI / verify (push) Has been cancelled
2026-08-05 00:11:34 +08:00
jacy b21403a47c merge(dev): kb doc edit, validation auto-tickets, support batch ops
CI / verify (push) Has been cancelled
2026-08-05 00:09:07 +08:00
jacy f9a5b6e81a merge(dev): fix h5-shop upload export for v3.4.12
CI / verify (push) Has been cancelled
2026-08-04 23:54:22 +08:00
jacy 1c787ed576 merge(dev): release v3.4.12
CI / verify (push) Has been cancelled
2026-08-04 23:53:48 +08:00
jacy aca3df4bf2 merge(dev): release v3.4.11 dev plan, wecom push and bot fixes
CI / verify (push) Has been cancelled
2026-08-04 22:41:49 +08:00
jacy fa0d928980 merge(dev): release v3.4.10
CI / verify (push) Has been cancelled
2026-08-03 22:54:23 +08:00
jacy 6f427cb553 merge(dev): persona logging and Sentry system config
CI / verify (push) Has been cancelled
2026-08-03 22:31:27 +08:00
jacy a7d55b7293 merge(dev): 走马灯滚出终点调整
CI / verify (push) Has been cancelled
2026-08-03 17:52:18 +08:00
jacy f09e00e16f merge(dev): 门店核销走马灯优化
CI / verify (push) Has been cancelled
2026-08-03 16:34:36 +08:00
jacy aa0e140fec merge(dev): 核销方式标记与统计
CI / verify (push) Has been cancelled
2026-08-03 16:21:47 +08:00
jacy f8d8e2d6d5 merge(dev): 统一门店结算账单
CI / verify (push) Has been cancelled
2026-08-03 16:04:55 +08:00
jacy 9859abba7e merge(dev): 全部门店可提现+企微提醒
CI / verify (push) Has been cancelled
2026-08-03 15:43:34 +08:00
jacy c89560e4f8 merge(dev): 门店手动提现 OPT-010
CI / verify (push) Has been cancelled
2026-08-03 15:32:17 +08:00
jacy ffed560d43 merge(dev): 小程序 Intl 兜底
CI / verify (push) Has been cancelled
2026-08-03 14:54:02 +08:00
jacy 5199b495e0 merge(dev): 门店核销走马灯兼容 H5/小程序
CI / verify (push) Has been cancelled
2026-08-03 14:48:41 +08:00
jacy 82b98aa4e3 merge(dev): 修复 Intl is not defined
CI / verify (push) Has been cancelled
2026-08-03 14:37:48 +08:00
jacy 7dffd40f3f merge(dev): 走马灯 JS 实现
CI / verify (push) Has been cancelled
2026-08-03 14:33:35 +08:00
jacy 0304201e80 merge(dev): 发版默认生产约定
CI / verify (push) Has been cancelled
2026-08-03 14:29:55 +08:00
jacy dd4362c397 merge(dev): 门店详情修复
CI / verify (push) Has been cancelled
2026-08-03 14:29:03 +08:00
jacy 87515decb3 merge(dev): 核销时间格式与门店走马灯
CI / verify (push) Has been cancelled
2026-08-03 14:20:36 +08:00
jacy 28ef916a22 merge(dev): 门店可见白名单
CI / verify (push) Has been cancelled
2026-08-03 13:58:47 +08:00
jacy 39e38aac7e merge(dev): mini-user eight fixes and catalog whitelist
CI / verify (push) Has been cancelled
2026-08-03 13:12:40 +08:00
jacy daf534b4db merge(dev): skip WeCom audit client-error noise
CI / verify (push) Has been cancelled
2026-08-02 21:52:18 +08:00
jacy 118993a01f merge(dev): deploy default DB sync
CI / verify (push) Has been cancelled
2026-08-02 18:12:37 +08:00
jacy 8f361981bf merge(dev): product fulfillment flags and auto SKU
CI / verify (push) Has been cancelled
2026-08-02 18:10:31 +08:00
jacy 4bb6ae20cd merge(dev): fix partner image picker after cancel
CI / verify (push) Has been cancelled
2026-08-02 17:11:31 +08:00
jacy ad757e9ba8 merge(dev): restore camera and fix mine benefit-detail back
CI / verify (push) Has been cancelled
2026-08-02 17:00:58 +08:00
jacy e63b57db19 merge(dev): client error reporting
CI / verify (push) Has been cancelled
2026-08-02 16:27:20 +08:00
jacy fb4432b307 merge(dev): WeCom webhook ops alerts
CI / verify (push) Has been cancelled
2026-08-02 16:02:35 +08:00
jacy ab44515e8b merge(dev_jacy): on-site pickup COMPLETED on pay
CI / verify (push) Has been cancelled
2026-08-02 13:42:17 +08:00
jacy 78365d648c merge(dev_jacy): proxy-order real pay
CI / verify (push) Has been cancelled
2026-08-02 13:28:16 +08:00
jacy e9eddbb26e merge(dev_jacy): shop WeChat unbound tip
CI / verify (push) Has been cancelled
2026-08-02 13:15:50 +08:00
jacy c00ca3620d merge(dev): partner dropdown label company-name
CI / verify (push) Has been cancelled
2026-08-02 13:07:41 +08:00
jacy 4d76ee6d0e merge(dev): WeChat login restore, proxy pay, staging SSL verify
CI / verify (push) Has been cancelled
2026-08-02 12:53:53 +08:00
jacy 2dbe665bdc Merge pull request '合并到main 创建8.1最后一波修改,后面测试和正式就会分离' (#11) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/11
2026-07-31 11:27:55 +08:00
jacy 1bc3bec977 Merge pull request 'Dev Main by v3.4 测试数据删除' (#10) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/10
2026-07-28 17:19:21 +08:00
jacy 81a6e3674b Merge pull request 'Dev' (#9) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/9
2026-07-17 10:50:17 +08:00
2 changed files with 62 additions and 88 deletions
+16 -23
View File
@@ -343,11 +343,10 @@ export default function StoresPage() {
} }
function formatHours(store: Store) { function formatHours(store: Store) {
// 列表只展示第一段营业时间,避免挤占一行 const parts: string[] = [];
if (store.openTime && store.closeTime) { if (store.openTime && store.closeTime) parts.push(`${store.openTime}-${store.closeTime}`);
return `营业时间: ${store.openTime}-${store.closeTime}`; if (store.openTime2 && store.closeTime2) parts.push(`${store.openTime2}-${store.closeTime2}`);
} return parts.length ? `营业时间: ${parts.join('')}` : '营业时间: 10:00-22:00';
return '营业时间: 10:00-22:00';
} }
function formatStatus(store: Store) { function formatStatus(store: Store) {
@@ -438,36 +437,30 @@ export default function StoresPage() {
<View className="store-card-cover store-card-cover--empty" /> <View className="store-card-cover store-card-cover--empty" />
)} )}
<View className="store-card-body"> <View className="store-card-body">
{/* 第1行:标题 + 距离 */} <View className="store-card-head">
<View className="store-card-row store-card-row--head"> <Text className="store-card-name">{s.name}</Text>
<Text className="store-card-name" numberOfLines={1}>
{s.name}
</Text>
<Text className="store-card-distance"> <Text className="store-card-distance">
{formatDistanceMeters(s.distanceMeters)} {formatDistanceMeters(s.distanceMeters)}
</Text> </Text>
</View> </View>
{/* 第2行:状态 + 营业时间(仅第一段) */} <View className="store-card-status-row">
<View className="store-card-row store-card-row--meta">
<Text className="store-card-status">{formatStatus(s)}</Text> <Text className="store-card-status">{formatStatus(s)}</Text>
<Text className="store-card-hours" numberOfLines={1}> <Text className="store-card-hours">{formatHours(s)}</Text>
{formatHours(s)}
</Text>
</View> </View>
{/* 第3行:地址 + 去核销 */} <Text className="store-card-address">
<View className="store-card-row store-card-row--foot"> {s.address || (s.district ? `${s.district}` : '地址待完善')}
<Text className="store-card-address" numberOfLines={1}> </Text>
{s.address || (s.district ? `${s.district}` : '地址待完善')} <View className="store-card-footer">
</Text> <View className="store-card-footer-spacer" />
<View <Text
className="store-card-cta" className="store-card-cta"
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
Taro.navigateTo({ url: '/pages/redeem/index' }); Taro.navigateTo({ url: '/pages/redeem/index' });
}} }}
> >
<Text className="store-card-cta-text"></Text>
</View> </Text>
</View> </View>
</View> </View>
</View> </View>
+46 -65
View File
@@ -144,25 +144,24 @@
padding: 4px var(--space-page) 16px; padding: 4px var(--space-page) 16px;
} }
/* 左图右文,卡片等高 */
.store-card { .store-card {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: stretch; align-items: stretch;
gap: 12px; gap: 12px;
padding: 12px; padding: 12px;
box-sizing: border-box;
background: var(--color-card); background: var(--color-card);
border-radius: var(--radius-lg); border-radius: var(--radius-lg);
box-shadow: var(--shadow-card); box-shadow: var(--shadow-card);
margin-bottom: 12px; margin-bottom: 12px;
box-sizing: border-box;
} }
.store-card-cover { .store-card-cover {
flex-shrink: 0; flex-shrink: 0;
width: 96px; width: 96px;
height: 96px; height: 96px;
border-radius: 8px; border-radius: var(--radius-md);
background: var(--color-surface-container); background: var(--color-surface-container);
display: block; display: block;
} }
@@ -174,24 +173,16 @@
.store-card-body { .store-card-body {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
height: 96px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between;
box-sizing: border-box;
} }
.store-card-row { .store-card-head {
display: flex; display: flex;
align-items: center; align-items: flex-start;
min-width: 0; justify-content: space-between;
overflow: hidden;
}
/* 第1行:加粗标题(单行截断)+ 右对齐距离 */
.store-card-row--head {
gap: 8px; gap: 8px;
height: 22px; margin-bottom: 6px;
} }
.store-card-name { .store-card-name {
@@ -200,88 +191,78 @@
font-family: var(--font-headline); font-family: var(--font-headline);
font-size: 15px; font-size: 15px;
font-weight: 700; font-weight: 700;
line-height: 22px; line-height: 1.35;
color: #1a1a1a; color: var(--color-on-surface);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
.store-card-distance { .store-card-distance {
flex-shrink: 0; flex-shrink: 0;
max-width: 40%;
font-size: 12px; font-size: 12px;
font-weight: 400; line-height: 1.35;
line-height: 22px; color: var(--color-subtle-gray);
color: #999;
text-align: right;
white-space: nowrap;
} }
/* 第2行:营业状态 + 营业时间(单行) */ .store-card-status-row {
.store-card-row--meta { display: flex;
align-items: center;
flex-wrap: wrap;
gap: 6px; gap: 6px;
height: 20px; margin-bottom: 4px;
} }
.store-card-status { .store-card-status {
flex-shrink: 0; flex-shrink: 0;
padding: 0 6px; padding: 2px 8px;
border-radius: 4px; border-radius: var(--radius-sm);
background: rgba(45, 106, 79, 0.12); background: rgba(45, 106, 79, 0.12);
color: #2d6a4f; color: var(--color-success-green);
font-size: 11px; font-size: 11px;
font-weight: 600; font-weight: 600;
line-height: 18px; line-height: 1.4;
white-space: nowrap;
} }
.store-card-hours { .store-card-hours {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
font-size: 11px; font-size: 11px;
font-weight: 400; line-height: 1.4;
line-height: 20px; color: var(--color-subtle-gray);
color: #999;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* 第3行:地址(单行截断)+ 右对齐去核销 */
.store-card-row--foot {
gap: 8px;
height: 28px;
} }
.store-card-address { .store-card-address {
flex: 1; font-size: 12px;
min-width: 0; line-height: 1.45;
font-size: 9px; color: var(--color-subtle-gray);
font-weight: 400;
line-height: 28px;
color: #999;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.store-card-footer {
display: flex;
align-items: center;
margin-top: auto;
padding-top: 8px;
}
.store-card-footer-spacer {
flex: 1;
} }
.store-card-cta { .store-card-cta {
flex-shrink: 0; flex-shrink: 0;
display: flex; padding: 6px 16px;
align-items: center; border-radius: var(--radius-full);
justify-content: center; background: var(--color-heritage-red);
padding: 0 14px; color: #fff;
height: 26px;
border-radius: 999px;
background: var(--color-heritage-red, #a61d24);
box-sizing: border-box;
}
.store-card-cta-text {
font-size: 12px; font-size: 12px;
font-weight: 600; font-weight: 600;
line-height: 26px; line-height: 1.4;
color: #fff;
white-space: nowrap;
} }