merge(dev): mini-user store list card redesign

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/11

apps/admin-web/src/pages/DevPlanTasksPage.tsx

@@ -16,12 +16,10 @@ import type { ColumnsType } from 'antd/es/table';
 import {
   DEV_PLAN_TASK_STATUS_LABELS,
   DEV_PLAN_TASK_TYPE_LABELS,
-  SUPPORT_TICKET_STATUS_LABELS,
   type DevPlanTaskDto,
   type DevPlanTaskStatusDto,
   type DevPlanTaskTypeDto,
   type DevPlanVersionDto,
-  type SupportTicketDto,
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
@@ -52,7 +50,6 @@ export default function DevPlanTasksPage() {
   const [batchEditOpen, setBatchEditOpen] = useState(false);
   const [batchSaving, setBatchSaving] = useState(false);
   const [versions, setVersions] = useState<DevPlanVersionDto[]>([]);
-  const [supportTickets, setSupportTickets] = useState<SupportTicketDto[]>([]);
   const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
   const [saving, setSaving] = useState(false);
   const [dispatching, setDispatching] = useState(false);
@@ -67,13 +64,6 @@ export default function DevPlanTasksPage() {
       .catch(() => setVersions([]));
   }, [batchEditOpen]);
 
-  useEffect(() => {
-    if (!modalOpen || editing) return;
-    request<{ items: SupportTicketDto[] }>('/admin/support-tickets?pageSize=100')
-      .then((res) => setSupportTickets(res.items ?? []))
-      .catch(() => setSupportTickets([]));
-  }, [modalOpen, editing]);
-
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<DevPlanTaskDto>(
     '/admin/dev-plan/tasks',
     () => {
@@ -88,7 +78,7 @@ export default function DevPlanTasksPage() {
 
   function openCreate() {
     setEditing(null);
-    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined });
+    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO' });
     setModalOpen(true);
   }
 
@@ -111,11 +101,7 @@ export default function DevPlanTasksPage() {
       } else {
         await request('/admin/dev-plan/tasks', {
           method: 'POST',
-          body: JSON.stringify({
+          body: JSON.stringify({ content: values.content, type: values.type }),
-            content: values.content,
-            type: values.type,
-            supportTicketId: values.supportTicketId || undefined,
-          }),
         });
         message.success('已创建');
       }
@@ -319,20 +305,7 @@ export default function DevPlanTasksPage() {
             <Form.Item name="status" label="状态" rules={[{ required: true }]}>
               <Select options={STATUS_OPTIONS} />
             </Form.Item>
-          ) : (
+          ) : null}
-            <Form.Item name="supportTicketId" label="绑定技术支持工单">
-              <Select
-                allowClear
-                showSearch
-                optionFilterProp="label"
-                placeholder="可选：关联工单"
-                options={supportTickets.map((t) => ({
-                  value: t.id,
-                  label: `${t.ticketNo} · ${SUPPORT_TICKET_STATUS_LABELS[t.status]} · ${t.title}`,
-                }))}
-              />
-            </Form.Item>
-          )}
         </Form>
       </Modal>
 

apps/admin-web/src/pages/SupportTicketsPage.tsx

@@ -577,7 +577,11 @@ export default function SupportTicketsPage() {
           isSuperAdmin
             ? {
                 selectedRowKeys,
-                onChange: (keys) => setSelectedRowKeys(keys as string[]),
+                onChange: (keys, rows) => {
+                  const pending = rows.filter((r) => r.status === 'PENDING_REVIEW').map((r) => String(r.id));
+                  setSelectedRowKeys(pending.length === rows.length ? (keys as string[]) : pending);
+                },
+                getCheckboxProps: (row) => ({ disabled: row.status !== 'PENDING_REVIEW' }),
               }
             : undefined
         }

apps/mini-user/src/pages/stores/index.tsx

@@ -343,11 +343,10 @@ export default function StoresPage() {
   }
 
   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) {
@@ -438,36 +437,30 @@ export default function StoresPage() {
                 <View className="store-card-cover store-card-cover--empty" />
               )}
               <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">
                     {formatDistanceMeters(s.distanceMeters)}
                   </Text>
                 </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-hours" numberOfLines={1}>
+                  <Text className="store-card-hours">{formatHours(s)}</Text>
-                    {formatHours(s)}
-                  </Text>
                 </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"
                     onClick={(e) => {
                       e.stopPropagation();
                       Taro.navigateTo({ url: '/pages/redeem/index' });
                     }}
                   >
-                    <Text className="store-card-cta-text">去核销</Text>
+                    去核销
-                  </View>
+                  </Text>
                 </View>
               </View>
             </View>

apps/mini-user/src/styles/stores.css

@@ -144,25 +144,24 @@
   padding: 4px var(--space-page) 16px;
 }
 
-/* 左图右文，卡片等高 */
 .store-card {
   display: flex;
   flex-direction: row;
   align-items: stretch;
   gap: 12px;
   padding: 12px;
-  box-sizing: border-box;
   background: var(--color-card);
   border-radius: var(--radius-lg);
   box-shadow: var(--shadow-card);
   margin-bottom: 12px;
+  box-sizing: border-box;
 }
 
 .store-card-cover {
   flex-shrink: 0;
   width: 96px;
   height: 96px;
-  border-radius: 8px;
+  border-radius: var(--radius-md);
   background: var(--color-surface-container);
   display: block;
 }
@@ -174,24 +173,16 @@
 .store-card-body {
   flex: 1;
   min-width: 0;
-  height: 96px;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  box-sizing: border-box;
 }
 
-.store-card-row {
+.store-card-head {
   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;
-  height: 22px;
+  margin-bottom: 6px;
 }
 
 .store-card-name {
@@ -200,88 +191,78 @@
   font-family: var(--font-headline);
   font-size: 15px;
   font-weight: 700;
-  line-height: 22px;
+  line-height: 1.35;
-  color: #1a1a1a;
+  color: var(--color-on-surface);
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
 }
 
 .store-card-distance {
   flex-shrink: 0;
-  max-width: 40%;
   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;
-  height: 20px;
+  margin-bottom: 4px;
 }
 
 .store-card-status {
   flex-shrink: 0;
-  padding: 0 6px;
+  padding: 2px 8px;
-  border-radius: 4px;
+  border-radius: var(--radius-sm);
   background: rgba(45, 106, 79, 0.12);
-  color: #2d6a4f;
+  color: var(--color-success-green);
   font-size: 11px;
   font-weight: 600;
-  line-height: 18px;
+  line-height: 1.4;
-  white-space: nowrap;
 }
 
 .store-card-hours {
   flex: 1;
   min-width: 0;
   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 {
-  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;
   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 {
   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-weight: 600;
-  line-height: 26px;
+  line-height: 1.4;
-  color: #fff;
-  white-space: nowrap;
 }