From fcce2f5c51b8c1f191e3e7c52e546ec27e3a55ed Mon Sep 17 00:00:00 2001
From: iven <iven_h@qq.com>
Date: Sun, 17 May 2026 18:54:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(mp):=20=E4=BA=8C=E8=BD=AE=E5=AE=A1=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E2=80=94=20ScrollView=E5=B5=8C=E5=A5=97/I?=
 =?UTF-8?q?nputField=E9=87=8D=E5=BB=BA/markdown=E5=88=86=E7=BB=84/BLE?=
 =?UTF-8?q?=E4=B8=8A=E9=99=90/=E7=BC=93=E5=AD=98=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CRITICAL: ai-report/list PageShell scroll=false 修复双重滚动冲突
HIGH: dialysis/create InputField 提取为独立组件避免 render 销毁重建
MEDIUM: markdownToHtml 连续<li>合并到单个<ul>
MEDIUM: 咨询详情页图片添加 lazyLoad
MEDIUM: BLEManager readings 添加 MAX_LIVE_READINGS=200 上限
MEDIUM: DataBuffer trimToMax 时重建 seenKeys 保持一致性
MEDIUM: auth.ts logout 清理模块级缓存变量
LOW: request.ts safeReLaunch 添加 console.warn + doRefresh 死锁警告注释
---
 .../src/pages/ai-report/detail/index.tsx      |  5 +-
 .../src/pages/ai-report/list/index.tsx        |  2 +-
 .../pages/pkg-consultation/detail/index.tsx   |  1 +
 .../dialysis/create/index.tsx                 | 56 ++++++++++---------
 apps/miniprogram/src/pages/profile/index.tsx  |  2 +-
 .../src/services/ble/BLEManager.ts            |  7 ++-
 .../src/services/ble/DataBuffer.ts            |  7 +++
 apps/miniprogram/src/services/request.ts      |  5 +-
 apps/miniprogram/src/stores/auth.ts           |  7 +++
 9 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/apps/miniprogram/src/pages/ai-report/detail/index.tsx b/apps/miniprogram/src/pages/ai-report/detail/index.tsx
index 19c2a26..5b2fb4f 100644
--- a/apps/miniprogram/src/pages/ai-report/detail/index.tsx
+++ b/apps/miniprogram/src/pages/ai-report/detail/index.tsx
@@ -19,14 +19,15 @@ const TYPE_LABELS: Record<string, string> = {
 
 function markdownToHtml(md: string): string {
   const escaped = sanitizeHtml(md);
-  return escaped
+  const html = escaped
     .replace(/^(#{1,3}) (.+)$/gm, (_, h: string, t: string) => `<h${h.length}>${t}</h${h.length}>`)
     .replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
     .replace(/\*(.+?)\*/g, '<em>$1</em>')
     .replace(/^- (.+)$/gm, '<li>$1</li>')
-    .replace(/(<li>[\s\S]*?<\/li>)/g, '<ul>$1</ul>')
     .replace(/\n\n/g, '<br/><br/>')
     .replace(/\n/g, '<br/>');
+  // 合并连续 <li> 到单个 <ul>
+  return html.replace(/(<li>[\s\S]*?<\/li>)(?:<br\/>?\s*(<li>[\s\S]*?<\/li>))*/g, (match) => `<ul>${match}</ul>`);
 }
 
 export default function AiReportDetail() {
diff --git a/apps/miniprogram/src/pages/ai-report/list/index.tsx b/apps/miniprogram/src/pages/ai-report/list/index.tsx
index f759b05..dc22685 100644
--- a/apps/miniprogram/src/pages/ai-report/list/index.tsx
+++ b/apps/miniprogram/src/pages/ai-report/list/index.tsx
@@ -70,7 +70,7 @@ export default function AiReportList() {
   }
 
   return (
-    <PageShell className={modeClass}>
+    <PageShell scroll={false} className={modeClass}>
       <View className='page-title'>AI 分析报告</View>
       <ScrollView scrollY className='report-scroll' onScrollToLower={loadMore}>
         {list.map((item) => {
diff --git a/apps/miniprogram/src/pages/pkg-consultation/detail/index.tsx b/apps/miniprogram/src/pages/pkg-consultation/detail/index.tsx
index aab2620..97a298b 100644
--- a/apps/miniprogram/src/pages/pkg-consultation/detail/index.tsx
+++ b/apps/miniprogram/src/pages/pkg-consultation/detail/index.tsx
@@ -190,6 +190,7 @@ export default function ConsultationDetail() {
                       className='chat-msg__image'
                       src={msg.content}
                       mode='widthFix'
+                      lazyLoad
                       onClick={() => Taro.previewImage({ urls: [msg.content], current: msg.content })}
                     />
                   ) : (
diff --git a/apps/miniprogram/src/pages/pkg-doctor-clinical/dialysis/create/index.tsx b/apps/miniprogram/src/pages/pkg-doctor-clinical/dialysis/create/index.tsx
index ea03133..1f856e7 100644
--- a/apps/miniprogram/src/pages/pkg-doctor-clinical/dialysis/create/index.tsx
+++ b/apps/miniprogram/src/pages/pkg-doctor-clinical/dialysis/create/index.tsx
@@ -13,6 +13,23 @@ import './index.scss';
 
 const DIALYSIS_TYPES = ['HD', 'HDF', 'HF'];
 
+function InputField({ label, value, placeholder, type = 'digit', onChange }: {
+  label: string; value: string; placeholder: string; type?: string; onChange: (v: string) => void;
+}) {
+  return (
+    <View className='form-row'>
+      <Text className='form-label'>{label}</Text>
+      <Input
+        className='form-input'
+        type={type as any}
+        placeholder={placeholder}
+        value={value}
+        onInput={(e) => onChange(e.detail.value)}
+      />
+    </View>
+  );
+}
+
 interface FormState {
   patient_id: string;
   dialysis_date: string;
@@ -159,21 +176,6 @@ export default function DialysisCreate() {
 
   if (loading) return <Loading />;
 
-  const InputField = ({ label, field, placeholder, type = 'digit' }: {
-    label: string; field: keyof FormState; placeholder: string; type?: string;
-  }) => (
-    <View className='form-row'>
-      <Text className='form-label'>{label}</Text>
-      <Input
-        className='form-input'
-        type={type as any}
-        placeholder={placeholder}
-        value={form[field]}
-        onInput={(e) => updateField(field, e.detail.value)}
-      />
-    </View>
-  );
-
   return (
     <PageShell safeBottom={false} className={modeClass}>
       <ContentCard className='section'>
@@ -208,30 +210,30 @@ export default function DialysisCreate() {
             <Text className='form-value'>{form.dialysis_type}</Text>
           </Picker>
         </View>
-        <InputField label='透析时长' field='dialysis_duration' placeholder='分钟' type='number' />
-        <InputField label='血流速' field='blood_flow_rate' placeholder='ml/min' type='number' />
+        <InputField label='透析时长' value={form.dialysis_duration} placeholder='分钟' type='number' onChange={(v) => updateField('dialysis_duration', v)} />
+        <InputField label='血流速' value={form.blood_flow_rate} placeholder='ml/min' type='number' onChange={(v) => updateField('blood_flow_rate', v)} />
       </ContentCard>
 
       <ContentCard className='section'>
         <Text className='section-title'>体重</Text>
-        <InputField label='干体重' field='dry_weight' placeholder='kg' />
-        <InputField label='透前体重' field='pre_weight' placeholder='kg' />
-        <InputField label='透后体重' field='post_weight' placeholder='kg' />
+        <InputField label='干体重' value={form.dry_weight} placeholder='kg' onChange={(v) => updateField('dry_weight', v)} />
+        <InputField label='透前体重' value={form.pre_weight} placeholder='kg' onChange={(v) => updateField('pre_weight', v)} />
+        <InputField label='透后体重' value={form.post_weight} placeholder='kg' onChange={(v) => updateField('post_weight', v)} />
       </ContentCard>
 
       <ContentCard className='section'>
         <Text className='section-title'>血压与心率</Text>
-        <InputField label='透前收缩压' field='pre_bp_systolic' placeholder='mmHg' type='number' />
-        <InputField label='透前舒张压' field='pre_bp_diastolic' placeholder='mmHg' type='number' />
-        <InputField label='透后收缩压' field='post_bp_systolic' placeholder='mmHg' type='number' />
-        <InputField label='透后舒张压' field='post_bp_diastolic' placeholder='mmHg' type='number' />
-        <InputField label='透前心率' field='pre_heart_rate' placeholder='bpm' type='number' />
-        <InputField label='透后心率' field='post_heart_rate' placeholder='bpm' type='number' />
+        <InputField label='透前收缩压' value={form.pre_bp_systolic} placeholder='mmHg' type='number' onChange={(v) => updateField('pre_bp_systolic', v)} />
+        <InputField label='透前舒张压' value={form.pre_bp_diastolic} placeholder='mmHg' type='number' onChange={(v) => updateField('pre_bp_diastolic', v)} />
+        <InputField label='透后收缩压' value={form.post_bp_systolic} placeholder='mmHg' type='number' onChange={(v) => updateField('post_bp_systolic', v)} />
+        <InputField label='透后舒张压' value={form.post_bp_diastolic} placeholder='mmHg' type='number' onChange={(v) => updateField('post_bp_diastolic', v)} />
+        <InputField label='透前心率' value={form.pre_heart_rate} placeholder='bpm' type='number' onChange={(v) => updateField('pre_heart_rate', v)} />
+        <InputField label='透后心率' value={form.post_heart_rate} placeholder='bpm' type='number' onChange={(v) => updateField('post_heart_rate', v)} />
       </ContentCard>
 
       <ContentCard className='section'>
         <Text className='section-title'>超滤与备注</Text>
-        <InputField label='超滤量' field='ultrafiltration_volume' placeholder='ml' type='number' />
+        <InputField label='超滤量' value={form.ultrafiltration_volume} placeholder='ml' type='number' onChange={(v) => updateField('ultrafiltration_volume', v)} />
         <View className='form-row form-row--textarea'>
           <Text className='form-label'>并发症备注</Text>
           <Textarea
diff --git a/apps/miniprogram/src/pages/profile/index.tsx b/apps/miniprogram/src/pages/profile/index.tsx
index 42892c8..f183378 100644
--- a/apps/miniprogram/src/pages/profile/index.tsx
+++ b/apps/miniprogram/src/pages/profile/index.tsx
@@ -57,7 +57,7 @@ const LOGGED_IN_GROUPS: MenuGroup[] = [
   {
     title: '生活服务',
     items: [
-      { label: '积分商城', icon: '礼', bg: 'pri-l', color: 'pri', path: '/pages/mall/index', isSwitchTab: true },
+      { label: '积分商城', icon: '礼', bg: 'pri-l', color: 'pri', path: '/pages/mall/index' },
       { label: '线下活动', icon: '活', bg: 'acc-l', color: 'acc', path: '/pages/pkg-profile/events/index' },
     ],
   },
diff --git a/apps/miniprogram/src/services/ble/BLEManager.ts b/apps/miniprogram/src/services/ble/BLEManager.ts
index 01c0faa..e186e24 100644
--- a/apps/miniprogram/src/services/ble/BLEManager.ts
+++ b/apps/miniprogram/src/services/ble/BLEManager.ts
@@ -16,6 +16,8 @@ const DEFAULT_CONFIG: BLEManagerConfig = {
   retryCount: 3,
 };
 
+const MAX_LIVE_READINGS = 200;
+
 export class BLEManager {
   private adapters: DeviceAdapter[] = [];
   private connection: BLEConnection | null = null;
@@ -193,7 +195,10 @@ export class BLEManager {
           res.value,
         );
         if (newReadings.length > 0) {
-          this.readings = [...this.readings, ...newReadings];
+          const combined = [...this.readings, ...newReadings];
+          this.readings = combined.length > MAX_LIVE_READINGS
+            ? combined.slice(-MAX_LIVE_READINGS)
+            : combined;
           this.dataBuffer.push(newReadings);
           this.onReadings?.(newReadings);
         }
diff --git a/apps/miniprogram/src/services/ble/DataBuffer.ts b/apps/miniprogram/src/services/ble/DataBuffer.ts
index 6be8ba9..13e973f 100644
--- a/apps/miniprogram/src/services/ble/DataBuffer.ts
+++ b/apps/miniprogram/src/services/ble/DataBuffer.ts
@@ -132,6 +132,13 @@ export class DataBuffer {
       const excess = total - this.config.maxTotal;
       this.buckets[0] = this.buckets[0].slice(excess);
     }
+    // 重建 seenKeys 与实际数据一致
+    this.seenKeys.clear();
+    for (const bucket of this.buckets) {
+      for (const r of bucket) {
+        this.seenKeys.add(this.dedupeKey(r));
+      }
+    }
   }
 
   private persistCurrentBucket(): void {
diff --git a/apps/miniprogram/src/services/request.ts b/apps/miniprogram/src/services/request.ts
index 19c6ab0..83ab01b 100644
--- a/apps/miniprogram/src/services/request.ts
+++ b/apps/miniprogram/src/services/request.ts
@@ -185,6 +185,7 @@ async function tryRefreshToken(): Promise<boolean> {
   return refreshPromise;
 }
 
+// 直接调用 Taro.request() 而非 request()，避免 ConcurrencyLimiter 死锁
 async function doRefresh(): Promise<boolean> {
   const refreshToken = secureGet('refresh_token');
   if (!refreshToken) return false;
@@ -227,7 +228,9 @@ let reLaunchPromise: Promise<void> | null = null;
 
 function safeReLaunch(url: string): void {
   if (reLaunchPromise) return;
-  reLaunchPromise = Taro.reLaunch({ url }).then(() => {}, () => {}).then(() => {
+  reLaunchPromise = Taro.reLaunch({ url }).then(() => {}, (err) => {
+    console.warn('[request] reLaunch failed:', err);
+  }).then(() => {
     setTimeout(() => { reLaunchPromise = null; }, 2000);
   });
 }
diff --git a/apps/miniprogram/src/stores/auth.ts b/apps/miniprogram/src/stores/auth.ts
index 8f9025c..b8df890 100644
--- a/apps/miniprogram/src/stores/auth.ts
+++ b/apps/miniprogram/src/stores/auth.ts
@@ -241,6 +241,13 @@ export const useAuthStore = create<AuthState>((set, get) => ({
     markLoggingOut();
     clearRequestCache();
     setCachedPatientId('');
+    // 清理模块级缓存
+    cachedUserJson = '';
+    cachedUserObj = null;
+    cachedRolesJson = '';
+    cachedRolesObj = [];
+    cachedPatientJson = '';
+    cachedPatientObj = null;
     secureRemove('access_token');
     secureRemove('refresh_token');
     secureRemove('token_expires_at');