From aff1e52e3e2464bd3b4074a6e3b803b3c12c6fb4 Mon Sep 17 00:00:00 2001
From: weicw1996 <weicw1996@qq.com>
Date: Sun, 11 Oct 2026 22:50:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=87=AA=E4=B8=BB=E5=A1=AB=E6=8A=A5):=20?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A9=BB=E5=BA=97/=E8=B7=91=E5=BA=97?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=B9=B6=E6=96=B0=E5=A2=9E=E8=B7=91=E5=BA=97?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

「自主填报」原本只有一种表单。本次拆成两种类型：

1. 新增选择填报类型页 packageUser/self-report/select
   - 按设计稿：hero 页头 + 两张类型卡（驻店填报 / 跑店填报）+ 确认选择
   - 入口（首页、我的）由直接进 create 改为先进 select

2. 原自主填报页改为「驻店填报」
   - 仅改导航标题，表单内容不变

3. 新增跑店填报页 packageUser/self-report/visit
   - 复制现有跑店/巡店任务（pages/task/detail 的 cateId=4 分支）的填报页并改造：
     保留巡店列表与下方内容，去掉列表上方的任务卡片/总进度/任务详情；
     打卡、摆台照、销量、小票、门店评分一并不保留
   - 巡店列表内「连锁筛选」「门店筛选」是两个并列的独立输入框，
     各自弹各自的选择器（不串联），样式与驻店填报逐项对齐；
     换连锁会清空已选门店
   - 每条巡店可新增/删除，独立获取定位 + 打卡拍照（最多 9 张）
   - 定位不强制（巡店任务里是强制的，这里放开）
   - 底部「保存草稿」+「提交填报」，草稿交互与驻店填报一致：
     进页面询问是否加载、提交成功后清除；storage key 与驻店分开
   - 驳回后重新提交复用同一页面（mode=resubmit）

4. 填报记录页加「驻店 / 跑店」类型切换
   - 两表分表查询，各自分页；跑店卡片展示门店数、巡店列表（门店/定位/照片）
   - 连锁与门店关键词筛选落到巡店列表的每一行

5. 药审核加「跑店填报」类型
   - 新增 AuditVisitReportItem，展开时按 id 拉详情（列表不下发 store_list）
   - 跑店没有销量小计，审核通过需手填奖金，故补奖金输入弹层

顺带重构：
- 门店解析（扁平列表 / 连锁嵌套两种结构的兼容、门店明细不入页面 data
  的性能处理）抽到 util/store-picker，create 与 visit 共用一份，
  避免两页各自维护导致解析口径不一致
---
 api/visit-report.js                           |   21 +
 packageUser/self-report/create.vue            |  144 +-
 packageUser/self-report/records.vue           |  211 ++-
 packageUser/self-report/select.vue            |  268 ++++
 packageUser/self-report/visit.vue             | 1216 +++++++++++++++++
 pages.json                                    |   16 +-
 .../audit/components/AuditVisitReportItem.vue |  185 +++
 pages/audit/index.vue                         |  195 ++-
 pages/index/index.vue                         |    3 +-
 pages/mine/index.vue                          |    3 +-
 util/store-picker.js                          |  142 ++
 11 files changed, 2264 insertions(+), 140 deletions(-)
 create mode 100644 api/visit-report.js
 create mode 100644 packageUser/self-report/select.vue
 create mode 100644 packageUser/self-report/visit.vue
 create mode 100644 pages/audit/components/AuditVisitReportItem.vue
 create mode 100644 util/store-picker.js

diff --git a/api/visit-report.js b/api/visit-report.js
new file mode 100644
index 0000000..b519436
--- /dev/null
+++ b/api/visit-report.js
@@ -0,0 +1,21 @@
+import post, {get, put, del} from "@/api/request";
+
+// 跑店填报（巡店列表 + 活动小结）
+export const visitReportAddReq = data => post('/yxe/yxe-visit-report', data)
+
+export const visitReportListReq = params => get('/yxe/yxe-visit-report', {params})
+
+export const visitReportPageReq = params => get('/yxe/yxe-visit-report/page', {params})
+
+export const visitReportAuditPageReq = params => get('/yxe/yxe-visit-report/audit/page', {params})
+
+export const visitReportInfoReq = id => get(`/yxe/yxe-visit-report/${id}`)
+
+export const visitReportUserListReq = params => get('/yxe/yxe-visit-report/userList', {params})
+
+export const visitReportChangeReq = data => put('/yxe/yxe-visit-report', data)
+
+// 驳回后重新提交：仅本人、仅已驳回记录可调用，状态由服务端置回待审核
+export const visitReportResubmitReq = data => put('/yxe/yxe-visit-report/resubmit', data)
+
+export const visitReportDeleteReq = id => del(`/yxe/yxe-visit-report/${id}`)
diff --git a/packageUser/self-report/create.vue b/packageUser/self-report/create.vue
index 73b3041..b6e6faf 100644
--- a/packageUser/self-report/create.vue
+++ b/packageUser/self-report/create.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="self-report-page">
-    <AppNavbar :title="isResubmit ? '重新提交填报' : '自主填报'" showBack/>
+    <AppNavbar :title="isResubmit ? '重新提交填报' : '驻店填报'" showBack/>
 
     <view class="sr-merchant-row" @tap="openChainPicker">
       <view class="sr-merchant-label">连锁筛选</view>
@@ -268,6 +268,15 @@ import {
   clearSalesHandoff,
   cloneSalesItems
 } from "@/util/sales-handoff";
+import {
+  normalizeMerchant as sharedNormalizeMerchant,
+  pickFirstText as sharedPickFirstText,
+  unwrapList as sharedUnwrapList,
+  normalizeMerchantChain as sharedNormalizeMerchantChain,
+  groupMerchantListByChain as sharedGroupMerchantListByChain,
+  flattenMerchantsFromChains as sharedFlattenMerchantsFromChains,
+  filterMerchantStores as sharedFilterMerchantStores
+} from "@/util/store-picker";
 
 export default {
   components: {Login, AppNavbar},
@@ -761,123 +770,36 @@ export default {
       this.currentCity = location.city_str || ''
       this.currentAddress = location.full || [location.province_str, location.city_str, location.area_str].filter(Boolean).join('')
     },
+    // 连锁/门店解析统一走 util/store-picker：跑店填报（visit.vue）用同一份逻辑，
+    // 两页各自维护一份迟早会出现解析口径不一致。
     normalizeMerchant(item) {
-      const id = item.id ?? item.merchantId ?? item.merchant_id
-      const text = item.name || item.merchantName || item.merchant_name || item.title || '未命名门店'
-      const lat = Number(item.lat ?? item.latitude ?? item.merchantLat ?? item.merchant_lat)
-      const lng = Number(item.lng ?? item.longitude ?? item.merchantLng ?? item.merchant_lng)
-      const address = [item.province, item.city, item.region, item.area, item.address].filter(Boolean).join('')
-      return {
-        id,
-        text,
-        chainId: item.chainId ?? item.chain_id ?? '',
-        chainName: item.chainName || item.chain || item.chainAbb || '',
-        lat: Number.isFinite(lat) ? lat : null,
-        lng: Number.isFinite(lng) ? lng : null,
-        province: item.province || item.province_str || '',
-        city: item.city || item.city_str || '',
-        address
-      }
+      return sharedNormalizeMerchant(item)
+    },
+    pickFirstText(source, keys = []) {
+      return sharedPickFirstText(source, keys)
+    },
+    unwrapList(data) {
+      return sharedUnwrapList(data)
+    },
+    normalizeMerchantChain(item, index) {
+      return sharedNormalizeMerchantChain(item, index)
+    },
+    groupMerchantListByChain(list) {
+      return sharedGroupMerchantListByChain(list)
+    },
+    flattenMerchantsFromChains(chainList) {
+      return sharedFlattenMerchantsFromChains(chainList)
+    },
+    // 本页的门店搜索关键词存在 data 里（merchantStoreSearchKeyword），
+    // 与 visit.vue 由调用方传入关键词的签名不同，这里保留本页签名。
+    filterMerchantStores(merchants) {
+      return sharedFilterMerchantStores(merchants, this.merchantStoreSearchKeyword)
     },
     normalizeChainIdForApi(rawChainId) {
       const text = String(rawChainId || '').trim()
       if (!text || text.startsWith('chain_')) return ''
       return text
     },
-    pickFirstText(source, keys = []) {
-      if (!source || typeof source !== 'object') return ''
-      for (let i = 0; i < keys.length; i += 1) {
-        const value = source[keys[i]]
-        if (value !== undefined && value !== null && String(value).trim()) {
-          return String(value).trim()
-        }
-      }
-      return ''
-    },
-    unwrapList(data) {
-      if (Array.isArray(data)) return data
-      if (!data || typeof data !== 'object') return []
-      const keys = ['list', 'records', 'rows', 'items', 'data', 'result', 'chainList']
-      for (let i = 0; i < keys.length; i += 1) {
-        const value = data[keys[i]]
-        if (Array.isArray(value)) return value
-        if (value && typeof value === 'object') {
-          const nested = this.unwrapList(value)
-          if (nested.length) return nested
-        }
-      }
-      return [data]
-    },
-    normalizeMerchantChain(item, index) {
-      const chainName = this.pickFirstText(item, ['chainName', 'chain', 'chainAbb', 'name', 'title']) || `连锁${index + 1}`
-      const rawChainId = item.chainId ?? item.chain_id ?? item.id ?? item.chainCode ?? item.chain_code ?? chainName
-      const chainId = rawChainId === undefined || rawChainId === null || String(rawChainId).trim() === ''
-        ? `chain_${index}`
-        : rawChainId
-      const childCandidates = ['children', 'merchantList', 'merchants', 'shopList', 'list', 'records']
-      let rawChildren = []
-      for (let i = 0; i < childCandidates.length; i += 1) {
-        const list = item[childCandidates[i]]
-        if (Array.isArray(list) && list.length) {
-          rawChildren = list
-          break
-        }
-      }
-      let merchants = rawChildren
-        .map(child => this.normalizeMerchant(child))
-        .filter(merchant => merchant.id !== undefined && merchant.id !== null && String(merchant.id).trim() !== '')
-        .map(merchant => Object.assign({}, merchant, {chainId, chainName}))
-      if (!merchants.length) {
-        const selfMerchant = this.normalizeMerchant(item)
-        if (selfMerchant.id !== undefined && selfMerchant.id !== null && String(selfMerchant.id).trim() !== '') {
-          merchants = [Object.assign({}, selfMerchant, {chainId, chainName})]
-        }
-      }
-      return {
-        id: chainId,
-        text: chainName,
-        merchants
-      }
-    },
-    groupMerchantListByChain(list) {
-      const chainMap = {}
-      ;(Array.isArray(list) ? list : []).forEach((item, index) => {
-        const merchant = this.normalizeMerchant(item)
-        if (merchant.id === undefined || merchant.id === null || String(merchant.id).trim() === '') return
-        const chainName = this.pickFirstText(item, ['chainName', 'chain', 'chainAbb', 'chain_name'])
-        if (!chainName) return
-        const rawChainId = item.chainId ?? item.chain_id ?? item.chainCode ?? item.chain_code ?? chainName
-        const chainId = rawChainId === undefined || rawChainId === null || String(rawChainId).trim() === ''
-          ? `chain_${index}`
-          : rawChainId
-        const key = String(chainId)
-        if (!chainMap[key]) {
-          chainMap[key] = {id: chainId, text: chainName, merchants: []}
-        }
-        chainMap[key].merchants.push(Object.assign({}, merchant, {chainId, chainName}))
-      })
-      return Object.keys(chainMap).map(key => chainMap[key])
-    },
-    flattenMerchantsFromChains(chainList) {
-      const list = []
-      ;(Array.isArray(chainList) ? chainList : []).forEach(chain => {
-        const merchants = Array.isArray(chain.merchants) ? chain.merchants : []
-        merchants.forEach(merchant => {
-          if (!merchant || merchant.id === '' || merchant.id === null || merchant.id === undefined) return
-          list.push(Object.assign({}, merchant, {
-            chainId: merchant.chainId || chain.id || '',
-            chainName: merchant.chainName || chain.text || ''
-          }))
-        })
-      })
-      return list
-    },
-    filterMerchantStores(merchants) {
-      const list = Array.isArray(merchants) ? merchants : []
-      const keyword = (this.merchantStoreSearchKeyword || '').trim()
-      if (!keyword) return list
-      return list.filter(merchant => (merchant.text || '').includes(keyword))
-    },
     applyMerchant(chain, merchant) {
       if (!merchant) return
       this.form.chainName = (chain && chain.text) || merchant.chainName || ''
diff --git a/packageUser/self-report/records.vue b/packageUser/self-report/records.vue
index d13c0b4..678351e 100644
--- a/packageUser/self-report/records.vue
+++ b/packageUser/self-report/records.vue
@@ -3,6 +3,16 @@
     <AppNavbar title="填报记录" showBack/>
 
     <view class="card subsection">
+      <view class="type-tabs">
+        <view
+          v-for="tab in typeTabs"
+          :key="tab.value"
+          :class="['tab', activeType === tab.value ? 'active' : '']"
+          @tap="changeType(tab.value)"
+        >
+          {{ tab.label }}
+        </view>
+      </view>
       <view class="status-tabs">
         <view
           v-for="tab in statusTabs"
@@ -45,21 +55,21 @@
         <view v-for="item in filteredRecords" :key="item.id" class="record-card">
           <view class="record-head">
             <view>
-              <view class="record-title">{{ item.merchantName || '-' }}</view>
-              <view class="record-sub" v-if="item.chainName && item.chainName !== '-'">连锁：{{ item.chainName }}</view>
+              <view class="record-title">{{ cardTitle(item) }}</view>
+              <view class="record-sub" v-if="cardSubTitle(item)">{{ cardSubTitle(item) }}</view>
             </view>
             <view :class="['status-badge', statusClass(item.status)]">{{ statusText(item.status) }}</view>
           </view>
           <view class="record-grid">
-            <view class="record-kv">
+            <view v-if="activeType === 'store'" class="record-kv">
               <text class="record-label">活动时间</text>
               <text class="record-value">{{ item.activityTime || '-' }}</text>
             </view>
-<!--            <view class="record-kv">-->
-<!--              <text class="record-label">奖金</text>-->
-<!--              <text class="record-value text-red">￥{{ formatPrice(item.reward) }}</text>-->
-<!--            </view>-->
-            <view class="record-kv">
+            <view v-else class="record-kv">
+              <text class="record-label">巡店门店数</text>
+              <text class="record-value">{{ item.storeCount || 0 }}家</text>
+            </view>
+            <view v-if="activeType === 'store'" class="record-kv">
               <text class="record-label">评分</text>
               <text class="record-value">{{ item.rating || '-' }}星</text>
             </view>
@@ -77,6 +87,35 @@
             <u-icon :name="isExpanded(item.id) ? 'arrow-up' : 'arrow-down'" size="20" color="#2fc6a7"/>
           </view>
           <view v-if="isExpanded(item.id)" class="record-detail">
+            <!-- 跑店填报：巡店列表（驻店填报没有门店列表，走下面的固定区块） -->
+            <block v-if="activeType === 'visit'">
+              <view v-if="!item.storeRows.length" class="detail-empty">暂无巡店记录</view>
+              <view v-for="(store, sIdx) in item.storeRows" :key="`store-${sIdx}`" class="store-block">
+                <view class="store-block-head">
+                  <text class="store-block-title">巡店{{ sIdx + 1 }}</text>
+                  <text class="store-block-time">{{ store.visitTime || '-' }}</text>
+                </view>
+                <view class="store-block-line">门店：{{ store.merchantName || '-' }}</view>
+                <view class="store-block-line">连锁：{{ store.chainName || '-' }}</view>
+                <view class="store-block-line">
+                  定位：{{ store.location || '-' }}
+                  <text v-if="store.lat && store.lng">（{{ store.lat }}, {{ store.lng }}）</text>
+                </view>
+                <view v-if="store.photos.length" class="media-images">
+                  <image
+                    v-for="(img, imgIdx) in store.photos"
+                    :key="`store-${sIdx}-photo-${imgIdx}`"
+                    class="media-image"
+                    :src="img"
+                    mode="aspectFill"
+                    @tap="preview(img, store.photos)"
+                  />
+                </view>
+                <view v-else class="detail-empty">暂无巡店照片</view>
+              </view>
+            </block>
+
+            <block v-else>
             <view class="record-section">
               <view class="record-section-title">上下班打卡</view>
               <view v-if="item.clockImages.length" class="media-images">
@@ -139,6 +178,7 @@
               </view>
               <view v-else class="detail-empty">暂无销量数据</view>
             </view>
+            </block>
           </view>
 
           <view v-if="isRejected(item.status)" class="record-actions">
@@ -185,12 +225,19 @@ import AppNavbar from "@/components/AppNavbar.vue";
 import Login from "@/components/Login.vue";
 import {dictDataListByDictReq} from "@/api/common";
 import {selfReportUserListReq} from "@/api/self-report";
+import {visitReportUserListReq} from "@/api/visit-report";
 import {getUserInfo} from "@/util/user";
 
 export default {
   components: {AppNavbar, Login},
   data() {
     return {
+      // 驻店填报 = yxe_self_report，跑店填报 = yxe_visit_report（两张表，分别拉取）
+      typeTabs: [
+        {label: '驻店填报', value: 'store'},
+        {label: '跑店填报', value: 'visit'}
+      ],
+      activeType: 'store',
       statusTabs: [
         {label: '全部', value: 'all'},
         {label: '待审核', value: 0},
@@ -226,10 +273,10 @@ export default {
         if (this.activeStatus !== 'all' && Number(item.status) !== Number(this.activeStatus)) {
           return false
         }
-        if (this.filterForm.chainId && !this.matchesSelectedChain(item.chainIdNormalized, item.chainName, this.filterForm.chainId)) {
+        if (this.filterForm.chainId && !this.matchesItemChain(item)) {
           return false
         }
-        if (keyword && !String(item.merchantName || '').toLowerCase().includes(keyword)) {
+        if (keyword && !this.matchesItemKeyword(item, keyword)) {
           return false
         }
         if ((startTs || endTs) && !Number.isFinite(item.submitTimestamp)) {
@@ -291,7 +338,8 @@ export default {
     async fetchList() {
       this.loading = true
       try {
-        const {data} = await selfReportUserListReq({})
+        const req = this.activeType === 'visit' ? visitReportUserListReq : selfReportUserListReq
+        const {data} = await req({})
         this.records = this.unwrapList(data)
       } catch (error) {
         this.records = []
@@ -321,6 +369,9 @@ export default {
       }
     },
     normalizeRecord(item = {}) {
+      if (this.activeType === 'visit') {
+        return this.normalizeVisitRecord(item)
+      }
       const createRaw = item.createTime || item.createdAt || item.date || ''
       const clockPhotos = this.parseMaybeJson(item.clockPhotos, [])
       const boothPhotos = this.parseMaybeJson(item.boothPhotos, [])
@@ -346,7 +397,48 @@ export default {
         clockImages: this.normalizeMediaList(clockPhotos),
         boothImages: this.normalizeMediaList(boothPhotos),
         receiptImages: this.normalizeMediaList(receiptPhoto),
-        salesRows: this.buildSalesRows(salesGroups)
+        salesRows: this.buildSalesRows(salesGroups),
+        storeCount: 0,
+        storeRows: []
+      }
+    },
+    // 跑店填报没有单门店/活动时间/打卡/销量，卡片主体是巡店列表
+    normalizeVisitRecord(item = {}) {
+      const createRaw = item.createTime || item.createdAt || ''
+      const summaryRaw = this.parseMaybeJson(item.summary, item.summary || '')
+      const summary = typeof summaryRaw === 'string' ? summaryRaw : JSON.stringify(summaryRaw || '')
+      const storeList = this.parseMaybeJson(item.storeList, [])
+      const storeRows = (Array.isArray(storeList) ? storeList : []).map(store => ({
+        merchantName: store && (store.merchantName || store.storeName) ? (store.merchantName || store.storeName) : '',
+        chainName: store && store.chainName ? store.chainName : '',
+        visitTime: store && (store.visitTime || store.time) ? (store.visitTime || store.time) : '',
+        location: store && store.location ? store.location : '',
+        lat: store && store.lat !== undefined ? store.lat : '',
+        lng: store && store.lng !== undefined ? store.lng : '',
+        photos: this.normalizeMediaList(store && store.photos)
+      }))
+      return {
+        id: item.id,
+        merchantId: '',
+        merchantName: '',
+        chainName: '-',
+        chainIdNormalized: '',
+        activityTime: '',
+        date: '',
+        status: item.status,
+        rejectReason: item.rejectReason || item.reject_reason || '',
+        reward: item.reward,
+        rating: '',
+        summary,
+        submitTime: this.formatDateTime(createRaw, createRaw || '-'),
+        submitTimestamp: this.parseDateToTimestamp(createRaw),
+        clockImages: [],
+        boothImages: [],
+        receiptImages: [],
+        salesRows: [],
+        // 门店数与主门店关键词都从列表内容推导，避免列表页再下发冗余字段
+        storeCount: Number(item.storeCount) || storeRows.length,
+        storeRows
       }
     },
     buildSalesRows(groups) {
@@ -413,6 +505,21 @@ export default {
         value
       }
     },
+    // 跑店记录没有单一门店/连锁，判定要落到巡店列表的每一行
+    matchesItemChain(item) {
+      const selectedId = this.filterForm.chainId
+      if (selectedId === '' || selectedId === null || selectedId === undefined) return true
+      if (this.activeType === 'visit') {
+        return (item.storeRows || []).some(store => this.matchesSelectedChain('', store.chainName, selectedId))
+      }
+      return this.matchesSelectedChain(item.chainIdNormalized, item.chainName, selectedId)
+    },
+    matchesItemKeyword(item, keyword) {
+      if (this.activeType === 'visit') {
+        return (item.storeRows || []).some(store => String(store.merchantName || '').toLowerCase().includes(keyword))
+      }
+      return String(item.merchantName || '').toLowerCase().includes(keyword)
+    },
     matchesSelectedChain(chainId, chainName, selectedId) {
       if (selectedId === '' || selectedId === null || selectedId === undefined) return true
       const option = this.chainOptions.find(item => String(item.id) === String(selectedId))
@@ -477,9 +584,33 @@ export default {
     },
     handleResubmit(item) {
       if (!item || item.id === undefined || item.id === null) return
-      uni.navigateTo({
-        url: `/packageUser/self-report/create?id=${item.id}&mode=resubmit`
-      })
+      const url = this.activeType === 'visit'
+        ? `/packageUser/self-report/visit?id=${item.id}&mode=resubmit`
+        : `/packageUser/self-report/create?id=${item.id}&mode=resubmit`
+      uni.navigateTo({url})
+    },
+    cardTitle(item) {
+      if (this.activeType === 'visit') {
+        const names = (item.storeRows || [])
+          .map(store => store.merchantName)
+          .filter(Boolean)
+        if (names.length) {
+          return names.length > 2 ? `${names.slice(0, 2).join('、')} 等${names.length}家` : names.join('、')
+        }
+        return '跑店填报'
+      }
+      return item.merchantName || '-'
+    },
+    cardSubTitle(item) {
+      if (this.activeType === 'visit') return ''
+      return item.chainName && item.chainName !== '-' ? `连锁：${item.chainName}` : ''
+    },
+    changeType(value) {
+      if (this.activeType === value) return
+      this.activeType = value
+      this.expandedMap = {}
+      this.records = []
+      this.fetchList()
     },
     changeStatus(value) {
       this.activeStatus = value
@@ -581,6 +712,14 @@ export default {
   margin: 18rpx 20rpx 0;
 }
 
+.type-tabs {
+  display: flex;
+  gap: 12rpx;
+  padding-bottom: 16rpx;
+  margin-bottom: 16rpx;
+  border-bottom: 1rpx solid #eef2f7;
+}
+
 .status-tabs {
   display: flex;
   gap: 12rpx;
@@ -839,6 +978,48 @@ export default {
   font-size: 24rpx;
 }
 
+.store-block {
+  padding: 18rpx;
+  margin-bottom: 16rpx;
+  border-radius: 16rpx;
+  background: #f9fafb;
+  border: 1rpx solid #eef2f7;
+}
+
+.store-block:last-child {
+  margin-bottom: 0;
+}
+
+.store-block-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12rpx;
+}
+
+.store-block-title {
+  font-size: 26rpx;
+  font-weight: 700;
+  color: #111827;
+}
+
+.store-block-time {
+  font-size: 22rpx;
+  color: #9ca3af;
+}
+
+.store-block-line {
+  margin-bottom: 8rpx;
+  font-size: 24rpx;
+  color: #4b5563;
+  line-height: 1.5;
+  word-break: break-all;
+}
+
+.store-block .media-images {
+  margin-top: 10rpx;
+}
+
 .sales-list {
   display: flex;
   flex-direction: column;
diff --git a/packageUser/self-report/select.vue b/packageUser/self-report/select.vue
new file mode 100644
index 0000000..694dcdd
--- /dev/null
+++ b/packageUser/self-report/select.vue
@@ -0,0 +1,268 @@
+<template>
+  <view class="select-page">
+    <!-- 本页 hero 即页头（设计如此），不套 AppNavbar；
+         navigationStyle 是 custom，状态栏高度要自己让出来，否则内容冲顶。 -->
+    <view class="hero" :style="{paddingTop: `${heroPaddingTop}px`}">
+      <view class="hero-back" @tap="back">
+        <u-icon name="arrow-left" size="20" color="#0f2f52"/>
+      </view>
+      <view class="hero-text">
+        <view class="hero-title">自主填报</view>
+        <view class="hero-sub">真实记录 · 及时上报 · 共创佳绩</view>
+      </view>
+      <image class="hero-avatar" :src="heroAvatar" mode="aspectFit"/>
+    </view>
+
+    <view class="card block">
+      <view class="section-title-row">
+        <view class="section-title">请选择填报类型</view>
+      </view>
+      <view class="section-desc">请选择您本次要填写的工作类型</view>
+
+      <view
+        v-for="item in typeOptions"
+        :key="item.value"
+        :class="['type-card', form.type === item.value ? 'type-card-active' : '']"
+        @tap="form.type = item.value"
+      >
+        <image class="type-icon" :src="item.icon" mode="aspectFit"/>
+        <view class="type-body">
+          <view class="type-title">{{ item.title }}</view>
+          <view class="type-desc">{{ item.desc }}</view>
+        </view>
+        <view :class="['type-radio', form.type === item.value ? 'type-radio-active' : '']">
+          <view v-if="form.type === item.value" class="type-radio-dot"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="select-actions">
+      <view class="primary-btn confirm" @tap="confirm">确认选择</view>
+    </view>
+    <view class="select-tip">① 请选择合适的填报类型，以便更准确地记录您的工作</view>
+  </view>
+</template>
+
+<script>
+// 顶部插画：暂无独立设计稿资源，沿用首页自主填报入口所用的同色系插图
+const HERO_AVATAR = 'https://yaodongxiao.oss-cn-guangzhou.aliyuncs.com/20260126/9c6c98843c2e30247355d86ea47552aa.png'
+const ICON_STORE = 'https://yaodongxiao.oss-cn-guangzhou.aliyuncs.com/20260126/0fd31838127cd57b1c1db44f2c749353.png'
+const ICON_VISIT = 'https://yaodongxiao.oss-cn-guangzhou.aliyuncs.com/20260127/f5fbb2e4be31bcc830156f174e7931b8.png'
+
+export default {
+  data() {
+    return {
+      heroAvatar: HERO_AVATAR,
+      // 状态栏高度：本页自绘页头，得自己避让，否则内容会顶到状态栏
+      statusBarHeight: 0,
+      form: {
+        type: 'store'
+      },
+      typeOptions: [
+        {
+          value: 'store',
+          title: '驻店填报',
+          desc: '适用于在门店驻店，进行商品陈列、销售等工作的场景',
+          icon: ICON_STORE
+        },
+        {
+          value: 'visit',
+          title: '跑店填报',
+          desc: '适用于外出拜访门店、客户或其他工作场景',
+          icon: ICON_VISIT
+        }
+      ]
+    }
+  },
+  computed: {
+    // 内联 padding-top 会覆盖 .hero 里 padding 简写的上边距，
+    // 所以这里把原有 24rpx（≈12px）一并算进去，视觉与设计稿一致。
+    heroPaddingTop() {
+      return this.statusBarHeight + 12
+    }
+  },
+  onLoad() {
+    const systemInfo = uni.getSystemInfoSync()
+    this.statusBarHeight = systemInfo.statusBarHeight || 0
+  },
+  methods: {
+    back() {
+      if (getCurrentPages().length === 1) {
+        uni.switchTab({url: '/pages/index/index'})
+        return
+      }
+      uni.navigateBack()
+    },
+    confirm() {
+      const type = this.form.type
+      const url = type === 'visit'
+        ? '/packageUser/self-report/visit'
+        : '/packageUser/self-report/create'
+      uni.navigateTo({
+        url,
+        fail: () => {
+          uni.showToast({title: '页面打开失败', icon: 'none'})
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.select-page {
+  min-height: 100vh;
+  background: #eef8f5;
+  padding-bottom: 60rpx;
+}
+
+.hero {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 40rpx 36rpx;
+  background: linear-gradient(180deg, #d9f5ec 0%, #eef8f5 100%);
+}
+
+/* 本页没有 AppNavbar，返回入口自绘；随流排布，避免与标题重叠 */
+.hero-back {
+  flex-shrink: 0;
+  margin-right: 20rpx;
+  width: 64rpx;
+  height: 64rpx;
+  border-radius: 999rpx;
+  background: rgba(255, 255, 255, 0.7);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 2;
+}
+
+.hero-text {
+  flex: 1;
+}
+
+.hero-title {
+  display: flex;
+  align-items: center;
+  font-size: 56rpx;
+  font-weight: 800;
+  color: #0f2f52;
+  letter-spacing: 4rpx;
+}
+
+.hero-sub {
+  margin-top: 14rpx;
+  font-size: 24rpx;
+  color: #5c6c84;
+  letter-spacing: 2rpx;
+}
+
+.hero-avatar {
+  width: 180rpx;
+  height: 150rpx;
+  flex-shrink: 0;
+}
+
+.block {
+  margin: 0 24rpx;
+}
+
+.section-title-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.section-desc {
+  margin: -6rpx 0 24rpx;
+  font-size: 24rpx;
+  color: #9aa3b2;
+}
+
+.type-card {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+  padding: 26rpx 22rpx;
+  margin-bottom: 22rpx;
+  border-radius: 20rpx;
+  border: 3rpx solid #e6eaf0;
+  background: #f8fafc;
+}
+
+.type-card:last-child {
+  margin-bottom: 0;
+}
+
+.type-card-active {
+  border-color: #2fc6a7;
+  background: #f1fbf8;
+}
+
+.type-icon {
+  width: 108rpx;
+  height: 96rpx;
+  flex-shrink: 0;
+}
+
+.type-body {
+  flex: 1;
+}
+
+.type-title {
+  font-size: 34rpx;
+  font-weight: 700;
+  color: #1f2937;
+}
+
+.type-desc {
+  margin-top: 12rpx;
+  font-size: 24rpx;
+  color: #7b8794;
+  line-height: 1.5;
+}
+
+.type-radio {
+  width: 44rpx;
+  height: 44rpx;
+  border-radius: 50%;
+  border: 3rpx solid #d3d9e2;
+  background: #ffffff;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+}
+
+.type-radio-active {
+  border-color: #2fc6a7;
+}
+
+.type-radio-dot {
+  width: 22rpx;
+  height: 22rpx;
+  border-radius: 50%;
+  background: #2fc6a7;
+}
+
+.select-actions {
+  margin: 48rpx 24rpx 0;
+}
+
+.confirm {
+  height: 92rpx;
+  font-size: 32rpx;
+  font-weight: 600;
+  box-shadow: 0 12rpx 26rpx rgba(47, 198, 167, 0.28);
+}
+
+.select-tip {
+  margin-top: 26rpx;
+  text-align: center;
+  font-size: 22rpx;
+  color: #9aa3b2;
+}
+</style>
diff --git a/packageUser/self-report/visit.vue b/packageUser/self-report/visit.vue
new file mode 100644
index 0000000..1e17d12
--- /dev/null
+++ b/packageUser/self-report/visit.vue
@@ -0,0 +1,1216 @@
+<template>
+  <view class="visit-report-page">
+    <AppNavbar :title="isResubmit ? '重新提交填报' : '跑店填报'" show-back/>
+
+    <view class="card block">
+      <view class="section-title-row">
+        <view class="section-title">巡店列表</view>
+        <view class="section-extra">{{ storeList.length }} 家门店</view>
+      </view>
+      <view v-if="!storeList.length" class="audit-empty-tip">暂无巡店记录，请点击下方「新增巡店」</view>
+      <view v-for="(item, idx) in storeList" :key="`store-${idx}`" class="visit-store-card">
+        <view class="visit-store-head">
+          <view>
+            <view class="visit-store-title">巡店{{ idx + 1 }}</view>
+            <view v-if="item.visitTime" class="visit-store-time">{{ item.visitTime }}</view>
+          </view>
+          <view v-if="storeList.length > 1" class="visit-store-remove" @tap="removeStoreItem(idx)">删除</view>
+        </view>
+
+        <!-- 连锁与门店拆成两个独立输入框，各自弹各自的选择器（与驻店填报一致） -->
+        <view class="sr-merchant-row" @tap="openChainPicker(idx)">
+          <view class="sr-merchant-label">连锁筛选</view>
+          <view class="sr-merchant-right">
+            <text :class="item.chainId ? 'sr-merchant-text' : 'sr-merchant-placeholder'">
+              {{ chainText(item) }}
+            </text>
+            <u-icon name="arrow-right" size="20" color="#9ca3af"/>
+          </view>
+        </view>
+
+        <view class="sr-merchant-row" @tap="openMerchantPicker(idx)">
+          <view class="sr-merchant-label">门店筛选</view>
+          <view class="sr-merchant-right">
+            <text :class="item.merchantId ? 'sr-merchant-text' : 'sr-merchant-placeholder'">
+              {{ merchantText(item) }}
+            </text>
+            <u-icon name="arrow-right" size="20" color="#9ca3af"/>
+          </view>
+        </view>
+
+        <view class="visit-store-field">
+          <view class="visit-store-label-row">
+            <view class="visit-store-label">定位</view>
+            <view class="visit-store-action" @tap="fetchStoreLocation(idx)">获取定位</view>
+          </view>
+          <view class="location-card">
+            <view class="location-row">
+              <text class="location-label">纬度：</text>
+              <text class="location-value">{{ formatCoordinate(item.lat) }}</text>
+            </view>
+            <view class="location-row">
+              <text class="location-label">经度：</text>
+              <text class="location-value">{{ formatCoordinate(item.lng) }}</text>
+            </view>
+            <view class="location-row">
+              <text class="location-label">详细地址：</text>
+              <text class="location-value">{{ item.location || '暂无地址（可不填）' }}</text>
+            </view>
+          </view>
+        </view>
+
+        <view class="visit-store-field">
+          <view class="section-title-row">
+            <view class="visit-store-label">打卡拍照</view>
+            <view class="section-extra">最多{{ storePhotoLimit }}张</view>
+          </view>
+          <view v-if="!item.photos || item.photos.length === 0" class="photo-grid">
+            <view class="photo-item add" @tap="uploadStorePhotos(idx)">
+              <u-icon name="photo" size="32" color="#c6ccd8"/>
+            </view>
+          </view>
+          <view v-else class="photo-grid">
+            <view v-for="(photo, photoIdx) in item.photos" :key="`store-${idx}-photo-${photoIdx}`" class="photo-item">
+              <image :src="photo" mode="aspectFill" class="photo-image" @tap="previewStorePhotos(idx, photoIdx)"/>
+              <view class="photo-remove" @tap="removeStorePhoto(idx, photoIdx)">x</view>
+            </view>
+            <view v-if="item.photos.length < storePhotoLimit" class="photo-item add" @tap="uploadStorePhotos(idx)">
+              <u-icon name="photo" size="32" color="#c6ccd8"/>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="visit-store-add" @tap="addStoreItem">新增巡店</view>
+    </view>
+
+    <view class="card block">
+      <view class="section-title">活动小结</view>
+      <textarea v-model="form.summary" class="summary-input" placeholder="请填写本次活动情况"/>
+    </view>
+
+    <view class="card block" v-if="isResubmit && rejectReason">
+      <view class="section-title">驳回原因</view>
+      <view class="reject-reason-text">{{ rejectReason }}</view>
+    </view>
+
+    <view class="form-actions">
+      <view v-if="!isResubmit" class="draft-btn" @tap="saveDraft">保存草稿</view>
+      <view class="primary-btn submit" @tap="submit">{{ submitLoading ? '提交中...' : (isResubmit ? '重新提交' : '提交填报') }}</view>
+    </view>
+    <view class="form-actions-placeholder"/>
+
+    <u-popup :show="showChainPicker" mode="bottom" round="24rpx" @close="closeChainPicker">
+      <view class="merchant-picker">
+        <view class="merchant-picker-head">
+          <view class="picker-action" @tap="closeChainPicker">取消</view>
+          <text class="picker-title">选择连锁</text>
+          <view class="picker-action primary" @tap="confirmChainPicker">确定</view>
+        </view>
+        <view v-if="merchantLoading" class="merchant-picker-loading">
+          <u-loading-icon mode="circle"></u-loading-icon>
+        </view>
+        <picker-view
+          v-else
+          class="merchant-picker-view"
+          :value="chainPickerValue"
+          :indicator-style="merchantIndicatorStyle"
+          @change="onChainPickerChange"
+        >
+          <picker-view-column>
+            <view v-for="(item, idx) in merchantChainOptions" :key="`chain-${idx}`" class="merchant-picker-item">
+              {{ item.text }}
+            </view>
+          </picker-view-column>
+        </picker-view>
+      </view>
+    </u-popup>
+
+    <u-popup :show="showMerchantPicker" mode="bottom" round="24rpx" @close="closeMerchantPicker">
+      <view class="merchant-picker">
+        <view class="merchant-picker-head">
+          <view class="picker-action" @tap="closeMerchantPicker">取消</view>
+          <text class="picker-title">选择门店</text>
+          <view class="picker-action primary" @tap="confirmMerchantPicker">确定</view>
+        </view>
+        <view class="merchant-picker-search">
+          <view class="merchant-search-item">
+            <u-input v-model="merchantStoreSearchKeyword" placeholder="搜索门店" shape="circle" :custom-style="{border:'3px solid #ff8a4c !important'}"/>
+          </view>
+        </view>
+        <view v-if="merchantLoading" class="merchant-picker-loading">
+          <u-loading-icon mode="circle"></u-loading-icon>
+        </view>
+        <picker-view
+          v-else
+          class="merchant-picker-view"
+          :value="merchantPickerValue"
+          :indicator-style="merchantIndicatorStyle"
+          @change="onMerchantPickerChange"
+        >
+          <picker-view-column>
+            <view v-for="(item, idx) in merchantStoreOptions" :key="`merchant-${idx}`" class="merchant-picker-item">
+              {{ item.text }}
+            </view>
+          </picker-view-column>
+        </picker-view>
+      </view>
+    </u-popup>
+
+    <Login ref="Login"/>
+  </view>
+</template>
+
+<script>
+import {Base64} from "js-base64";
+import Login from "@/components/Login.vue";
+import AppNavbar from "@/components/AppNavbar.vue";
+import {merchantGroupByChainReq} from "@/api/shop";
+import {
+  visitReportAddReq,
+  visitReportInfoReq,
+  visitReportResubmitReq
+} from "@/api/visit-report";
+import {getUserInfo} from "@/util/user";
+import {chooseImg, getLocationOnly} from "@/util";
+import {
+  unwrapList,
+  normalizeMerchantChain,
+  groupMerchantListByChain
+} from "@/util/store-picker";
+
+export default {
+  components: {Login, AppNavbar},
+  data() {
+    return {
+      isLoggedIn: false,
+      hasInitialized: false,
+      merchantLoading: false,
+      // 当前正在选连锁/门店的巡店下标（两个选择器各自独立打开，互不串联）
+      activePickerIndex: -1,
+      showChainPicker: false,
+      showMerchantPicker: false,
+      merchantStoreSearchKeyword: '',
+      chainPickerValue: [0],
+      merchantPickerValue: [0],
+      merchantChainList: [],
+      form: this.buildForm(),
+      storeList: [],
+      storePhotoLimit: 9,
+      draftPrompting: false,
+      submitLoading: false,
+      // 驳回后重新提交：记录 id 与驳回原因，提交时走 resubmit 接口
+      isResubmit: false,
+      resubmitId: '',
+      rejectReason: '',
+      resubmitLoading: false
+    }
+  },
+  computed: {
+    merchantChainOptions() {
+      const list = Array.isArray(this.merchantChainList) ? this.merchantChainList : []
+      return list.length ? list : [{id: '', text: '暂无连锁', merchantCount: 0}]
+    },
+    merchantStoreOptions() {
+      // 门店明细不放在页面 data 里（见 setMerchantChains），从实例上的 store 取。
+      // 这里读 merchantChainList 是为了建立响应式依赖：门店数据到达后需要重算。
+      const chainList = Array.isArray(this.merchantChainList) ? this.merchantChainList : []
+      const chainId = this.activePickerChainId()
+      const hasChain = chainList.some(chain => String(chain.id) === String(chainId))
+      const merchants = hasChain ? this.getMerchantsByChainId(chainId) : []
+      const keyword = (this.merchantStoreSearchKeyword || '').trim()
+      const filtered = this.filterMerchantStores(merchants, keyword)
+      return filtered.length ? filtered : [{id: '', text: keyword ? '无匹配门店' : '无门店'}]
+    },
+    merchantIndicatorStyle() {
+      return 'height: 64px;'
+    }
+  },
+  watch: {
+    merchantStoreSearchKeyword() {
+      this.merchantPickerValue = [0]
+    }
+  },
+  created() {
+    // 门店明细挂实例上而非 data：data 里的一切都会进页面 data 树并被 setData 序列化。
+    this.merchantStore = []
+  },
+  async onLoad(options = {}) {
+    const id = options && options.id !== undefined && options.id !== null ? String(options.id).trim() : ''
+    if (id && String(options.mode || '') === 'resubmit') {
+      this.isResubmit = true
+      this.resubmitId = id
+    }
+  },
+  async onShow() {
+    this.isLoggedIn = !!getUserInfo().token
+    if (!this.hasInitialized) {
+      await this.init()
+      this.hasInitialized = true
+      if (this.isResubmit) {
+        await this.loadResubmitRecord()
+      } else {
+        await this.checkDraftOnEntry()
+      }
+    }
+  },
+  methods: {
+    buildForm() {
+      return {
+        summary: ''
+      }
+    },
+    async init() {
+      this.form = this.buildForm()
+      this.storeList = []
+      this.showChainPicker = false
+      this.showMerchantPicker = false
+      this.activePickerIndex = -1
+      await this.getMerchantList()
+    },
+    parseStoredJson(value, fallback) {
+      if (value === null || value === undefined || value === '') return fallback
+      if (typeof value === 'string') {
+        try {
+          return JSON.parse(value)
+        } catch (error) {
+          return fallback
+        }
+      }
+      return value
+    },
+    // 记录里的图片字段可能是字符串/对象/数组混用，统一取 URL
+    pickMediaUrl(media) {
+      if (!media) return ''
+      if (typeof media === 'string') return media
+      return media.url || media.path || media.image || ''
+    },
+    cloneValue(value) {
+      if (value === undefined || value === null) {
+        return value
+      }
+      return JSON.parse(JSON.stringify(value))
+    },
+    formatCoordinate(value) {
+      const text = value === null || value === undefined ? '' : String(value).trim()
+      return text || '暂无'
+    },
+    formatTime(date) {
+      const hour = `${date.getHours()}`.padStart(2, '0')
+      const minute = `${date.getMinutes()}`.padStart(2, '0')
+      return `${hour}:${minute}`
+    },
+    formatDate(date) {
+      const year = date.getFullYear()
+      const month = `${date.getMonth() + 1}`.padStart(2, '0')
+      const day = `${date.getDate()}`.padStart(2, '0')
+      return `${year}.${month}.${day}`
+    },
+    formatDateTime(date) {
+      return `${this.formatDate(date)} ${this.formatTime(date)}`
+    },
+    makeTextBase64(text) {
+      const base64 = Base64.encode(text)
+      return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
+    },
+    buildWatermarkImageUrl(path, address, date, time) {
+      let url = `${path}?x-oss-process=image/watermark,text_${this.makeTextBase64(address)},g_sw,color_FFFFFF,x_10,y_120`
+      url += `/watermark,text_${this.makeTextBase64(date)},g_sw,color_FFFFFF,x_10,y_60`
+      url += `/watermark,text_${this.makeTextBase64(time)},g_sw,color_FFFFFF,x_10,y_10`
+      return url
+    },
+    async ensureLogin() {
+      if (this.isLoggedIn) return true
+      this.$refs.Login.open()
+      return false
+    },
+    previewImages(urls = [], current = '') {
+      const list = Array.isArray(urls) ? urls.filter(Boolean) : []
+      if (!list.length) return
+      uni.previewImage({
+        urls: list,
+        current: current || list[0]
+      })
+    },
+    toast(message, title = '提示') {
+      return new Promise(resolve => {
+        uni.showModal({
+          title,
+          content: String(message || ''),
+          showCancel: false,
+          success: resolve,
+          fail: resolve
+        })
+      })
+    },
+
+    // ---------- 连锁 / 门店两级选择（两个输入框各自独立弹窗）----------
+    normalizeMerchantChain,
+    unwrapList,
+    async getMerchantList() {
+      this.merchantLoading = true
+      try {
+        const {data} = await merchantGroupByChainReq({})
+        const list = this.unwrapList(data)
+        const groupedList = groupMerchantListByChain(list)
+        const chains = (groupedList.length
+          ? groupedList
+          : list.map((item, index) => normalizeMerchantChain(item, index)))
+          .filter(item => Array.isArray(item.merchants) && item.merchants.length > 0)
+        this.setMerchantChains(chains)
+      } catch (error) {
+        this.setMerchantChains([])
+        uni.showToast({title: '门店列表获取失败', icon: 'none'})
+      } finally {
+        this.merchantLoading = false
+      }
+    },
+    // 门店明细（全量可达 8000+ 条）只放在实例上，不进页面 data。
+    // 一旦放进 data，页面 data 树会膨胀到 1MB+，此后每次 setData 都要重新
+    // diff/序列化整棵树，连只含一个字段的 setData 也会从 ~490ms 涨到 ~1000ms。
+    setMerchantChains(chains) {
+      const list = Array.isArray(chains) ? chains : []
+      this.merchantStore = list.map(chain => ({
+        id: chain.id,
+        text: chain.text,
+        merchants: Array.isArray(chain.merchants) ? chain.merchants : []
+      }))
+      this.merchantChainList = this.merchantStore.map(chain => ({
+        id: chain.id,
+        text: chain.text,
+        merchantCount: chain.merchants.length
+      }))
+    },
+    getMerchantsByChainId(chainId) {
+      const store = Array.isArray(this.merchantStore) ? this.merchantStore : []
+      const chain = store.find(item => String(item.id) === String(chainId))
+      return chain && Array.isArray(chain.merchants) ? chain.merchants : []
+    },
+    filterMerchantStores(merchants, keyword) {
+      const list = Array.isArray(merchants) ? merchants : []
+      const text = String(keyword || '').trim()
+      if (!text) return list
+      return list.filter(merchant => (merchant.text || '').includes(text))
+    },
+    activePickerChainId() {
+      const item = this.storeList[this.activePickerIndex]
+      return item ? item.chainId : ''
+    },
+    chainText(item) {
+      if (!item || !item.chainId) return this.merchantLoading ? '连锁加载中...' : '请选择连锁'
+      return item.chainName || '请选择连锁'
+    },
+    merchantText(item) {
+      if (!item || !item.chainId) return '请先选择连锁'
+      if (!item.merchantId) return '请选择门店'
+      return item.merchantName || '请选择门店'
+    },
+    async ensureMerchantListLoaded() {
+      // 门店列表是异步拉的，必须先等它到位再开弹层，否则连锁列只会显示「暂无连锁」
+      if (!this.merchantChainList.length && !this.merchantLoading) {
+        uni.showLoading({title: '加载门店列表中...'})
+        try {
+          await this.getMerchantList()
+        } finally {
+          uni.hideLoading()
+        }
+      }
+    },
+    async openChainPicker(index) {
+      await this.ensureMerchantListLoaded()
+      this.activePickerIndex = index
+      const item = this.storeList[index] || {}
+      const chainIndex = this.merchantChainOptions.findIndex(chain => String(chain.id) === String(item.chainId || ''))
+      this.chainPickerValue = [chainIndex > -1 ? chainIndex : 0]
+      this.showChainPicker = true
+    },
+    closeChainPicker() {
+      this.showChainPicker = false
+      this.activePickerIndex = -1
+    },
+    onChainPickerChange(e) {
+      let chainIndex = Array.isArray(e.detail.value) ? Number(e.detail.value[0] || 0) : 0
+      if (!Number.isFinite(chainIndex) || chainIndex < 0 || chainIndex > this.merchantChainOptions.length - 1) {
+        chainIndex = 0
+      }
+      this.chainPickerValue = [chainIndex]
+    },
+    confirmChainPicker() {
+      const chain = this.merchantChainOptions[this.chainPickerValue[0]] || null
+      if (!chain || !chain.id) {
+        uni.showToast({title: '请选择连锁', icon: 'none'})
+        return
+      }
+      const index = this.activePickerIndex
+      const current = this.storeList[index]
+      if (!current) {
+        this.closeChainPicker()
+        return
+      }
+      const changed = String(current.chainId || '') !== String(chain.id)
+      const next = Object.assign({}, current, {
+        chainId: chain.id,
+        chainName: chain.text || ''
+      })
+      if (changed) {
+        // 换连锁后原门店已不属于该连锁，清掉让用户重新选
+        Object.assign(next, {
+          merchantId: '',
+          merchantName: '',
+          province: '',
+          city: '',
+          merchantLat: '',
+          merchantLng: '',
+          merchantAddress: '',
+          _autoSelected: false
+        })
+      }
+      this.$set(this.storeList, index, next)
+      this.closeChainPicker()
+    },
+    async openMerchantPicker(index) {
+      const item = this.storeList[index]
+      if (!item || !item.chainId) {
+        uni.showToast({title: '请先选择连锁', icon: 'none'})
+        return
+      }
+      await this.ensureMerchantListLoaded()
+      this.activePickerIndex = index
+      this.merchantStoreSearchKeyword = ''
+      const merchantIndex = this.merchantStoreOptions.findIndex(option => String(option.id) === String(item.merchantId))
+      this.merchantPickerValue = [merchantIndex > -1 ? merchantIndex : 0]
+      this.showMerchantPicker = true
+    },
+    closeMerchantPicker() {
+      this.showMerchantPicker = false
+      this.activePickerIndex = -1
+    },
+    onMerchantPickerChange(e) {
+      let merchantIndex = Array.isArray(e.detail.value) ? Number(e.detail.value[0] || 0) : 0
+      if (!Number.isFinite(merchantIndex) || merchantIndex < 0) merchantIndex = 0
+      const merchants = this.merchantStoreOptions
+      if (!merchants.length || !merchants[0].id) {
+        merchantIndex = 0
+      } else if (merchantIndex > merchants.length - 1) {
+        merchantIndex = 0
+      }
+      this.merchantPickerValue = [merchantIndex]
+    },
+    confirmMerchantPicker() {
+      const index = this.activePickerIndex
+      const current = this.storeList[index]
+      if (!current) {
+        this.closeMerchantPicker()
+        return
+      }
+      const selected = this.merchantStoreOptions[this.merchantPickerValue[0]] || null
+      if (!selected || !selected.id) {
+        uni.showToast({title: '请选择门店', icon: 'none'})
+        return
+      }
+      this.$set(this.storeList, index, Object.assign({}, current, {
+        merchantId: selected.id ?? '',
+        merchantName: selected.text || '',
+        chainId: selected.chainId || current.chainId || '',
+        chainName: selected.chainName || current.chainName || '',
+        province: selected.province || '',
+        city: selected.city || '',
+        merchantLat: Number.isFinite(selected.lat) ? selected.lat : '',
+        merchantLng: Number.isFinite(selected.lng) ? selected.lng : '',
+        merchantAddress: selected.address || '',
+        _autoSelected: false
+      }))
+      this.closeMerchantPicker()
+    },
+
+    // ---------- 巡店列表 ----------
+    createStoreItem() {
+      return {
+        visitTime: this.formatDateTime(new Date()),
+        merchantId: '',
+        merchantName: '',
+        chainId: '',
+        chainName: '',
+        province: '',
+        city: '',
+        merchantLat: '',
+        merchantLng: '',
+        merchantAddress: '',
+        lat: '',
+        lng: '',
+        location: '',
+        photos: [],
+        _autoSelected: false
+      }
+    },
+    normalizeStoreItem(item) {
+      const photos = Array.isArray(item && item.photos)
+        ? item.photos.map(photo => this.pickMediaUrl(photo)).filter(Boolean)
+        : []
+      return {
+        visitTime: item && (item.visitTime || item.time || item.createTime)
+          ? (item.visitTime || item.time || item.createTime)
+          : '',
+        merchantId: item && (item.merchantId ?? item.storeId) !== undefined ? (item.merchantId ?? item.storeId) : '',
+        merchantName: item && (item.merchantName || item.storeName) ? (item.merchantName || item.storeName) : '',
+        chainId: item && item.chainId !== undefined ? item.chainId : '',
+        chainName: item && item.chainName ? item.chainName : '',
+        province: item && item.province ? item.province : '',
+        city: item && item.city ? item.city : '',
+        merchantLat: item && item.merchantLat !== undefined ? item.merchantLat : '',
+        merchantLng: item && item.merchantLng !== undefined ? item.merchantLng : '',
+        merchantAddress: item && (item.merchantAddress || item.address) ? (item.merchantAddress || item.address) : '',
+        lat: item && item.lat !== undefined ? item.lat : '',
+        lng: item && item.lng !== undefined ? item.lng : '',
+        location: item && item.location ? item.location : '',
+        photos,
+        _autoSelected: false
+      }
+    },
+    addStoreItem() {
+      this.storeList.push(this.createStoreItem())
+    },
+    removeStoreItem(index) {
+      this.storeList.splice(index, 1)
+      if (this.activePickerIndex === index) {
+        this.activePickerIndex = -1
+      }
+    },
+    async fetchStoreLocation(index) {
+      const canContinue = await this.ensureLogin()
+      if (!canContinue) return
+      uni.showLoading({title: '定位中'})
+      try {
+        const location = await getLocationOnly()
+        if (!location) return
+        const current = this.storeList[index] || this.createStoreItem()
+        this.$set(this.storeList, index, Object.assign({}, current, {
+          lat: location.latitude,
+          lng: location.longitude,
+          location: location.full || [location.province_str, location.city_str, location.area_str].filter(Boolean).join(' ')
+        }))
+      } catch (error) {
+        uni.showToast({title: '定位失败', icon: 'none'})
+      } finally {
+        uni.hideLoading()
+      }
+    },
+    async uploadStorePhotos(index) {
+      const canContinue = await this.ensureLogin()
+      if (!canContinue) return
+      const current = this.storeList[index] || this.createStoreItem()
+      const photos = Array.isArray(current.photos) ? current.photos : []
+      const remain = this.storePhotoLimit - photos.length
+      if (remain <= 0) return
+      uni.showLoading({title: '上传中'})
+      try {
+        const res = await chooseImg(remain, ['camera']).catch(() => [])
+        if (!res || !res.length) return
+        const location = await getLocationOnly().catch(() => null)
+        const now = new Date()
+        const time = this.formatTime(now)
+        const date = this.formatDate(now)
+        const address = location
+          ? `${location.province_str}${location.city_str}${location.area_str}`
+          : (current.location || '当前地址')
+        const nextPhotos = photos.concat(
+          res
+            .map(item => item && item.path ? this.buildWatermarkImageUrl(item.path, address, date, time) : '')
+            .filter(Boolean)
+        )
+        const nextStore = Object.assign({}, current, {photos: nextPhotos})
+        // 拍照时顺带把定位补上，省得用户再点一次「获取定位」
+        if (location) {
+          nextStore.lat = location.latitude
+          nextStore.lng = location.longitude
+          nextStore.location = location.full || [location.province_str, location.city_str, location.area_str].filter(Boolean).join(' ')
+        }
+        this.$set(this.storeList, index, nextStore)
+      } finally {
+        uni.hideLoading()
+      }
+    },
+    removeStorePhoto(storeIndex, photoIndex) {
+      const current = this.storeList[storeIndex] || this.createStoreItem()
+      const photos = Array.isArray(current.photos) ? [...current.photos] : []
+      photos.splice(photoIndex, 1)
+      this.$set(this.storeList, storeIndex, Object.assign({}, current, {photos}))
+    },
+    previewStorePhotos(storeIndex, photoIndex = 0) {
+      const current = this.storeList[storeIndex] || {}
+      const photos = Array.isArray(current.photos) ? current.photos.filter(Boolean) : []
+      if (!photos.length) return
+      this.previewImages(photos, photos[photoIndex] || photos[0])
+    },
+
+    // ---------- 草稿（与驻店填报同一套交互）----------
+    getDraftStorageKey() {
+      const user = getUserInfo() || {}
+      const uid = user.uid || user.id || user.userId || 'guest'
+      return `yxe_visit_report_draft_${uid}`
+    },
+    hasDraftContent() {
+      const hasStore = (Array.isArray(this.storeList) ? this.storeList : []).some(item => {
+        if (!item) return false
+        const photos = Array.isArray(item.photos) ? item.photos : []
+        return !!(item.chainId || item.merchantId || item.location || photos.length)
+      })
+      const hasSummary = String(this.form && this.form.summary ? this.form.summary : '').trim().length > 0
+      return hasStore || hasSummary
+    },
+    buildDraftPayload() {
+      return {
+        version: 1,
+        savedAt: Date.now(),
+        form: this.cloneValue(this.form),
+        storeList: this.cloneValue(this.storeList)
+      }
+    },
+    async saveDraft() {
+      if (!this.hasDraftContent()) {
+        uni.removeStorageSync(this.getDraftStorageKey())
+        uni.showToast({
+          title: '请先填写内容',
+          icon: 'none'
+        })
+        return
+      }
+      uni.setStorageSync(this.getDraftStorageKey(), this.buildDraftPayload())
+      uni.showToast({
+        title: '已保存',
+        icon: 'success'
+      })
+    },
+    clearDraft() {
+      uni.removeStorageSync(this.getDraftStorageKey())
+    },
+    async checkDraftOnEntry() {
+      if (this.draftPrompting) return
+      const draft = uni.getStorageSync(this.getDraftStorageKey())
+      if (!draft || typeof draft !== 'object') return
+      if (!this.hasDraftPayloadContent(draft)) {
+        this.clearDraft()
+        return
+      }
+      this.draftPrompting = true
+      try {
+        const confirm = await new Promise(resolve => {
+          uni.showModal({
+            title: '提示',
+            content: '您有保存数据，是否立即加载',
+            confirmText: '是',
+            cancelText: '否',
+            success: res => resolve(!!(res && res.confirm)),
+            fail: () => resolve(false)
+          })
+        })
+        if (confirm) {
+          await this.restoreDraft(draft)
+        } else {
+          this.clearDraft()
+        }
+      } finally {
+        this.draftPrompting = false
+      }
+    },
+    hasDraftPayloadContent(draft) {
+      if (!draft || typeof draft !== 'object') {
+        return false
+      }
+      const form = draft.form || {}
+      const storeList = Array.isArray(draft.storeList) ? draft.storeList : []
+      const hasStore = storeList.some(item => {
+        if (!item) return false
+        const photos = Array.isArray(item.photos) ? item.photos : []
+        return !!(item.chainId || item.merchantId || item.location || photos.length)
+      })
+      return !!(hasStore || String(form.summary || '').trim())
+    },
+    async restoreDraft(draft) {
+      const nextForm = Object.assign(this.buildForm(), this.cloneValue(draft.form || {}))
+      this.form = nextForm
+      const storeList = Array.isArray(draft.storeList) ? draft.storeList : []
+      this.storeList = storeList.map(item => this.normalizeStoreItem(item))
+      this.showChainPicker = false
+      this.showMerchantPicker = false
+      this.activePickerIndex = -1
+    },
+
+    // ---------- 提交 ----------
+    async loadResubmitRecord() {
+      if (!this.resubmitId || this.resubmitLoading) return
+      this.resubmitLoading = true
+      try {
+        const res = await visitReportInfoReq(this.resubmitId)
+        // get 请求在业务失败时也会 resolve，需要显式看 code
+        if (res && res.code !== 0) {
+          await this.toast(res.message || '填报记录加载失败')
+          uni.navigateBack()
+          return
+        }
+        const record = res && res.data && typeof res.data === 'object' ? res.data : null
+        if (!record) {
+          await this.toast('填报记录不存在')
+          uni.navigateBack()
+          return
+        }
+        if (Number(record.status) !== 2) {
+          await this.toast('该记录不是已驳回状态，无法重新提交')
+          uni.navigateBack()
+          return
+        }
+        this.rejectReason = record.rejectReason || record.reject_reason || ''
+        const summary = this.parseStoredJson(record.summary, record.summary || '')
+        this.form.summary = typeof summary === 'string' ? summary : ''
+        const storeList = this.parseStoredJson(record.storeList, [])
+        this.storeList = (Array.isArray(storeList) ? storeList : []).map(item => this.normalizeStoreItem(item))
+      } catch (error) {
+        await this.toast(error && error.message ? error.message : '填报记录加载失败')
+      } finally {
+        this.resubmitLoading = false
+      }
+    },
+    buildSubmitStoreList() {
+      return (Array.isArray(this.storeList) ? this.storeList : []).map(item => ({
+        merchantId: item.merchantId ?? '',
+        merchantName: item.merchantName || '',
+        chainId: item.chainId || '',
+        chainName: item.chainName || '',
+        visitTime: item.visitTime || '',
+        province: item.province || '',
+        city: item.city || '',
+        merchantLat: item.merchantLat !== undefined ? item.merchantLat : '',
+        merchantLng: item.merchantLng !== undefined ? item.merchantLng : '',
+        merchantAddress: item.merchantAddress || '',
+        lat: item.lat !== undefined ? item.lat : '',
+        lng: item.lng !== undefined ? item.lng : '',
+        location: item.location || '',
+        photos: Array.isArray(item.photos) ? item.photos.filter(Boolean) : []
+      }))
+    },
+    validateSubmit() {
+      const list = Array.isArray(this.storeList) ? this.storeList : []
+      if (!list.length) {
+        this.toast('请至少新增一条巡店记录')
+        return false
+      }
+      for (let idx = 0; idx < list.length; idx += 1) {
+        const item = list[idx]
+        if (!item.chainId) {
+          this.toast(`请选择巡店${idx + 1}的连锁`)
+          return false
+        }
+        if (!item.merchantId) {
+          this.toast(`请选择巡店${idx + 1}的门店`)
+          return false
+        }
+        if (!item.photos || !item.photos.length) {
+          this.toast(`请上传巡店${idx + 1}照片`)
+          return false
+        }
+      }
+      const summaryText = (this.form.summary || '').trim()
+      if (!summaryText) {
+        this.toast('请填写活动小结')
+        return false
+      }
+      return true
+    },
+    buildPayload() {
+      const storeList = this.buildSubmitStoreList()
+      const imageList = []
+      storeList.forEach(item => {
+        ;(item.photos || []).forEach(photo => {
+          if (photo) imageList.push(photo)
+        })
+      })
+      const first = storeList.find(item => item.lat && item.lng && item.location) || storeList[0] || {}
+      return {
+        storeList: JSON.stringify(storeList),
+        storeCount: storeList.length,
+        image: imageList.length ? JSON.stringify(imageList) : null,
+        summary: JSON.stringify((this.form.summary || '').trim()),
+        lat: first.lat || '',
+        lng: first.lng || '',
+        location: first.location || '',
+        status: 0
+      }
+    },
+    async submit() {
+      const canContinue = await this.ensureLogin()
+      if (!canContinue || this.submitLoading) return
+      if (!this.validateSubmit()) return
+      this.submitLoading = true
+      try {
+        if (this.isResubmit) {
+          const payload = this.buildPayload()
+          // 状态与驳回原因由服务端决定，这里不传，避免被当成审核端改状态
+          delete payload.status
+          payload.id = this.resubmitId
+          await visitReportResubmitReq(payload)
+          await this.toast('重新提交成功，请等待审核')
+        } else {
+          await visitReportAddReq(this.buildPayload())
+          this.clearDraft()
+          await this.toast('提交成功，请等待审核')
+        }
+        uni.navigateBack({
+          fail: () => {
+            uni.switchTab({url: '/pages/mine/index'})
+          }
+        })
+      } catch (error) {
+        await this.toast(error && error.message ? error.message : '提交失败')
+      } finally {
+        this.submitLoading = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.visit-report-page {
+  --form-actions-height: calc(118rpx + env(safe-area-inset-bottom));
+  min-height: 100vh;
+  background: #f5f5f5;
+}
+
+.block {
+  margin: 20rpx 20rpx 0;
+}
+
+.section-title-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 16rpx;
+}
+
+.section-title-row .section-title {
+  margin-bottom: 0;
+}
+
+.section-extra {
+  font-size: 24rpx;
+  color: #8f9bb3;
+}
+
+.audit-empty-tip {
+  padding: 24rpx 0;
+  text-align: center;
+  color: #9aa3b2;
+  font-size: 24rpx;
+}
+
+/* 与驻店填报（create.vue）保持同一套视觉，选择器数值逐项对齐 */
+.sr-merchant-row {
+  margin-bottom: 20rpx;
+  padding: 16rpx 18rpx;
+  border: 3px solid #ff8a4c;
+  border-radius: 16rpx;
+  background: #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.sr-merchant-label {
+  color: grey;
+  font-size: 26rpx;
+  min-width: 140rpx;
+}
+
+.sr-merchant-right {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 8rpx;
+  min-height: 64rpx;
+}
+
+.sr-merchant-text {
+  display: block;
+  color: #111827;
+  font-size: 26rpx;
+  font-weight: bold;
+  line-height: 1.35;
+  text-align: right;
+  white-space: normal;
+  word-break: break-all;
+  max-width: 430rpx;
+}
+
+.sr-merchant-placeholder {
+  color: #9ca3af;
+  font-size: 26rpx;
+}
+
+.visit-store-card {
+  background: #f8fafc;
+  border: 1rpx solid #edf2f7;
+  border-radius: 20rpx;
+  padding: 20rpx;
+  margin-bottom: 18rpx;
+}
+
+.visit-store-card:last-of-type {
+  margin-bottom: 0;
+}
+
+.visit-store-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 18rpx;
+}
+
+.visit-store-title {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: #1f2937;
+}
+
+.visit-store-time {
+  margin-top: 6rpx;
+  font-size: 22rpx;
+  color: #6b7280;
+}
+
+.visit-store-remove,
+.visit-store-action {
+  font-size: 24rpx;
+  color: #2fc6a7;
+}
+
+.visit-store-field {
+  margin-bottom: 18rpx;
+}
+
+.visit-store-field:last-of-type {
+  margin-bottom: 0;
+}
+
+.visit-store-label-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.visit-store-label {
+  font-size: 26rpx;
+  font-weight: 600;
+  color: #374151;
+  margin-bottom: 12rpx;
+}
+
+.visit-store-label-row .visit-store-label {
+  margin-bottom: 0;
+}
+
+.visit-store-add {
+  margin-top: 18rpx;
+  height: 76rpx;
+  border-radius: 16rpx;
+  border: 2rpx dashed #2fc6a7;
+  color: #2fc6a7;
+  background: #f3fffb;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26rpx;
+  font-weight: 600;
+}
+
+.location-card {
+  margin-top: 12rpx;
+  background: #f8fafc;
+  border-radius: 18rpx;
+  padding: 18rpx 20rpx;
+  color: #4b5563;
+  font-size: 26rpx;
+  border: 1rpx solid #edf2f7;
+  display: flex;
+  flex-direction: column;
+  gap: 10rpx;
+}
+
+.location-row {
+  display: flex;
+  align-items: flex-start;
+  line-height: 1.6;
+}
+
+.location-label {
+  flex-shrink: 0;
+  color: #6b7280;
+}
+
+.location-value {
+  flex: 1;
+  word-break: break-all;
+}
+
+.photo-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+}
+
+.photo-item {
+  width: calc((100% - 40rpx) / 2);
+  height: 200rpx;
+  border-radius: 18rpx;
+  background: #f6f7fb;
+  position: relative;
+  overflow: hidden;
+  border: 1rpx solid #edf1f7;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.photo-item.add {
+  border: 2rpx dashed #cfd5e1;
+  background: #fbfcfe;
+}
+
+.photo-image {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+
+.photo-remove {
+  position: absolute;
+  top: 8rpx;
+  right: 8rpx;
+  width: 32rpx;
+  height: 32rpx;
+  background: rgba(0, 0, 0, 0.5);
+  color: #fff;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 22rpx;
+  line-height: 1;
+}
+
+.summary-input {
+  width: 100%;
+  min-height: 180rpx;
+  font-size: 26rpx;
+  color: #111827;
+  box-sizing: border-box;
+}
+
+.reject-reason-text {
+  font-size: 26rpx;
+  color: #ef4444;
+  line-height: 1.6;
+}
+
+.form-actions {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10;
+  height: var(--form-actions-height);
+  padding: 20rpx;
+  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+  box-sizing: border-box;
+  display: flex;
+  gap: 16rpx;
+  background: #ffffff;
+  box-shadow: 0 -4rpx 16rpx rgba(15, 23, 42, 0.08);
+}
+
+.form-actions-placeholder {
+  height: var(--form-actions-height);
+}
+
+.draft-btn {
+  flex: 1;
+  min-height: 78rpx;
+  border-radius: 999rpx;
+  border: 1rpx solid #ff8a4c;
+  background: #fff7f2;
+  color: #ff7a35;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  font-weight: 700;
+}
+
+.submit {
+  flex: 1;
+  margin: 0;
+  min-height: 78rpx;
+  padding: 0 24rpx;
+  font-size: 28rpx;
+  font-weight: 700;
+}
+
+.merchant-picker {
+  background: #ffffff;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 12rpx);
+}
+
+.merchant-picker-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 28rpx 32rpx 20rpx;
+}
+
+.picker-title {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #0f172a;
+}
+
+.picker-action {
+  font-size: 28rpx;
+  color: #7a8495;
+}
+
+.picker-action.primary {
+  color: #2563eb;
+  font-weight: 700;
+}
+
+.merchant-picker-search {
+  padding: 0 24rpx 20rpx;
+}
+
+.merchant-search-item {
+  flex: 1;
+  min-width: 0;
+}
+
+.merchant-picker-loading {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 40rpx 0;
+}
+
+.merchant-picker-view {
+  width: 100%;
+  height: 420rpx;
+}
+
+.merchant-picker-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 64px;
+  padding: 0 24rpx;
+  text-align: center;
+  font-size: 26rpx;
+  color: #1f2937;
+}
+</style>
diff --git a/pages.json b/pages.json
index 765af2c..a4c0aed 100644
--- a/pages.json
+++ b/pages.json
@@ -164,12 +164,26 @@
 			"root": "packageUser",
 			"pages": [
 				{
-					"path": "self-report/create",
+					"path": "self-report/select",
 					"style": {
 						"navigationBarTitleText": "自主填报",
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "self-report/create",
+					"style": {
+						"navigationBarTitleText": "驻店填报",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "self-report/visit",
+					"style": {
+						"navigationBarTitleText": "跑店填报",
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "self-report/sales",
 					"style": {
diff --git a/pages/audit/components/AuditVisitReportItem.vue b/pages/audit/components/AuditVisitReportItem.vue
new file mode 100644
index 0000000..d8cd946
--- /dev/null
+++ b/pages/audit/components/AuditVisitReportItem.vue
@@ -0,0 +1,185 @@
+<template>
+  <view>
+    <view class="record">
+      <view>
+        <view class="record-meta">门店数：{{ currentRecord.storeCount || storeRows.length || 0 }} 家</view>
+        <view class="record-meta">提交人：{{ currentRecord.owner || item.owner }}</view>
+        <view class="record-meta">小结：{{ currentRecord.summary || '-' }}</view>
+        <view class="record-meta text-red" v-if="currentRecord.rejectReason">驳回原因：{{ currentRecord.rejectReason }}</view>
+        <view class="record-toggle" @tap="toggleDetailExpanded">
+          <text>{{ detailExpanded ? '收起详情' : '展开详情' }}</text>
+          <u-icon :name="detailExpanded ? 'arrow-up' : 'arrow-down'" size="20" color="#2fc6a7"/>
+        </view>
+        <view v-if="detailExpanded" class="record-detail">
+          <view v-if="loadingDetail" class="detail-empty">加载中...</view>
+          <view v-else-if="!storeRows.length" class="detail-empty">暂无巡店记录</view>
+          <view v-for="(store, idx) in storeRows" :key="`store-${idx}`" class="visit-store-block">
+            <view class="visit-store-head">
+              <text class="visit-store-title">巡店{{ idx + 1 }}</text>
+              <text class="visit-store-time">{{ store.visitTime || '-' }}</text>
+            </view>
+            <view class="record-meta">连锁：{{ store.chainName || '-' }}</view>
+            <view class="record-meta">门店：{{ store.merchantName || '-' }}</view>
+            <view class="record-meta">
+              定位：{{ store.location || '-' }}
+              <text v-if="store.lat && store.lng">（{{ store.lat }}, {{ store.lng }}）</text>
+            </view>
+            <view v-if="store.photos.length" class="media-images">
+              <image
+                v-for="(img, imgIdx) in store.photos"
+                :key="`store-${idx}-photo-${imgIdx}`"
+                class="media-image"
+                :src="img"
+                mode="aspectFill"
+                @click="emitPreview(img, store.photos)"
+              />
+            </view>
+            <view v-else class="detail-empty">暂无巡店照片</view>
+          </view>
+        </view>
+      </view>
+      <view class="record-actions" v-if="item.status === 0">
+        <view class="flex-1 mx-15">
+          <view class="chip w-90p" @tap="handleApprove">通过</view>
+        </view>
+        <view class="flex-1 mx-15">
+          <view class="chip w-90p danger-chip" @tap="$emit('reject', item)">驳回</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import {visitReportInfoReq} from "@/api/visit-report";
+
+export default {
+  name: 'AuditVisitReportItem',
+  props: {
+    item: {
+      type: Object,
+      required: true
+    }
+  },
+  emits: ['preview', 'approve', 'reject'],
+  data() {
+    return {
+      detailExpanded: false,
+      loadingDetail: false,
+      detailLoaded: false,
+      detailData: null
+    }
+  },
+  computed: {
+    currentRecord() {
+      return this.detailData || this.item
+    },
+    // 列表接口不下发 storeList 大字段，展开时再拉详情；列表里已有则直接用
+    storeRows() {
+      const source = this.currentRecord
+      const list = this.parseMaybeJson(source.storeList, [])
+      return (Array.isArray(list) ? list : []).map(store => ({
+        merchantName: store && (store.merchantName || store.storeName) ? (store.merchantName || store.storeName) : '',
+        chainName: store && store.chainName ? store.chainName : '',
+        visitTime: store && (store.visitTime || store.time) ? (store.visitTime || store.time) : '',
+        location: store && store.location ? store.location : '',
+        lat: store && store.lat !== undefined ? store.lat : '',
+        lng: store && store.lng !== undefined ? store.lng : '',
+        photos: this.parseImageList(store && store.photos)
+      }))
+    }
+  },
+  methods: {
+    parseMaybeJson(value, fallback) {
+      if (value === null || value === undefined || value === '') return fallback
+      if (typeof value === 'string') {
+        try {
+          return JSON.parse(value)
+        } catch (error) {
+          return fallback
+        }
+      }
+      return value
+    },
+    parseImageList(value) {
+      const list = Array.isArray(value) ? value : []
+      return list
+        .map(item => (typeof item === 'string' ? item : (item && (item.url || item.path || item.image)) || ''))
+        .filter(Boolean)
+    },
+    emitPreview(url, list) {
+      this.$emit('preview', url, list)
+    },
+    handleApprove() {
+      this.$emit('approve', this.currentRecord)
+    },
+    async toggleDetailExpanded() {
+      this.detailExpanded = !this.detailExpanded
+      if (!this.detailExpanded || this.detailLoaded) return
+      const id = this.item && this.item.id
+      if (id === undefined || id === null) return
+      this.loadingDetail = true
+      try {
+        const res = await visitReportInfoReq(id)
+        if (res && res.code !== 0) {
+          uni.showToast({title: res.message || '详情加载失败', icon: 'none'})
+          return
+        }
+        this.detailData = res && res.data && typeof res.data === 'object' ? res.data : null
+        this.detailLoaded = true
+      } catch (error) {
+        uni.showToast({
+          title: error && error.message ? error.message : '详情加载失败',
+          icon: 'none'
+        })
+      } finally {
+        this.loadingDetail = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import './record.scss';
+
+.record-toggle {
+  margin-top: 12rpx;
+  display: inline-flex;
+  align-items: center;
+  gap: 8rpx;
+  color: #2fc6a7;
+  font-size: 24rpx;
+}
+
+.detail-empty {
+  color: #94a3b8;
+  font-size: 24rpx;
+}
+
+.visit-store-block {
+  margin-top: 16rpx;
+  padding: 16rpx;
+  border-radius: 16rpx;
+  background: #f9fafb;
+  border: 1rpx solid #eef2f7;
+}
+
+.visit-store-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10rpx;
+}
+
+.visit-store-title {
+  font-size: 26rpx;
+  font-weight: 700;
+  color: #1f2937;
+}
+
+.visit-store-time {
+  font-size: 22rpx;
+  color: #9ca3af;
+}
+</style>
diff --git a/pages/audit/index.vue b/pages/audit/index.vue
index 3acdee9..c7848bd 100644
--- a/pages/audit/index.vue
+++ b/pages/audit/index.vue
@@ -106,6 +106,16 @@
             @updated="handleSelfReportUpdated"
           />
         </template>
+        <template v-else-if="activeType === 'visitReport'">
+          <AuditVisitReportItem
+            v-for="item in currentTasks"
+            :key="item.id"
+            :item="item"
+            @preview="preview"
+            @approve="handleVisitReportApprove"
+            @reject="handleVisitReportReject"
+          />
+        </template>
         <template v-else>
           <AuditShareItem
             v-for="item in currentTasks"
@@ -127,21 +137,40 @@
     <view v-if="showRejectPopup" class="income-popup-mask" @tap="closeRejectPopup"></view>
     <view v-if="showRejectPopup" class="income-popup card" @tap.stop>
       <view class="income-popup-head">
-        <view class="section-title">{{ pendingRejectType === 'selfReport' ? '填写驳回原因（可选）' : '填写拒绝原因' }}</view>
+        <view class="section-title">{{ isSelfReportLikeRejectType(pendingRejectType) ? '填写驳回原因（可选）' : '填写拒绝原因' }}</view>
         <view class="close-btn" @tap="closeRejectPopup">关闭</view>
       </view>
       <view class="income-form">
-        <view class="income-label">{{ pendingRejectType === 'selfReport' ? '驳回原因' : '拒绝原因' }}</view>
+        <view class="income-label">{{ isSelfReportLikeRejectType(pendingRejectType) ? '驳回原因' : '拒绝原因' }}</view>
         <input
           v-model="rejectReason"
           class="income-input"
           type="text"
-          :placeholder="pendingRejectType === 'selfReport' ? '可不填写' : '请输入拒绝原因'"
+          :placeholder="isSelfReportLikeRejectType(pendingRejectType) ? '可不填写' : '请输入拒绝原因'"
         />
       </view>
       <view class="primary-btn income-submit" @tap="submitRejectReason">提交</view>
     </view>
 
+    <!-- 跑店填报没有销量小计，奖金只能审核时手填 -->
+    <view v-if="showRewardPopup" class="income-popup-mask" @tap="closeRewardPopup"></view>
+    <view v-if="showRewardPopup" class="income-popup card" @tap.stop>
+      <view class="income-popup-head">
+        <view class="section-title">输入奖金金额</view>
+        <view class="close-btn" @tap="closeRewardPopup">关闭</view>
+      </view>
+      <view class="income-form">
+        <view class="income-label">奖金金额</view>
+        <input
+          v-model="rewardAmount"
+          class="income-input"
+          type="digit"
+          placeholder="请输入奖金金额，可填0"
+        />
+      </view>
+      <view class="primary-btn income-submit" @tap="submitRewardAmount">提交</view>
+    </view>
+
     <u-picker
       :show="showChainPicker"
       :columns="[chainOptions]"
@@ -178,21 +207,24 @@ import {auditUserTaskPageReq, changeUserTaskReq, listUserTaskReq} from "@/api/ta
 import dayjs from 'dayjs'
 import {shareAuditPageReq, shareChangeReq, sharePageReq} from "@/api/share";
 import {selfReportAuditPageReq, selfReportChangeReq, selfReportPageReq} from "@/api/self-report";
+import {visitReportAuditPageReq, visitReportChangeReq, visitReportPageReq} from "@/api/visit-report";
 import AppNavbar from "@/components/AppNavbar.vue";
 import AuditMovementItem from "./components/AuditMovementItem.vue";
 import AuditStoreVisitItem from "./components/AuditStoreVisitItem.vue";
 import AuditShareItem from "./components/AuditShareItem.vue";
 import AuditSelfReportItem from "./components/AuditSelfReportItem.vue";
+import AuditVisitReportItem from "./components/AuditVisitReportItem.vue";
 import {dictDataListByDictReq} from "@/api/common";
 
 export default {
-  components: {AppNavbar, AuditMovementItem, AuditStoreVisitItem, AuditShareItem, AuditSelfReportItem},
+  components: {AppNavbar, AuditMovementItem, AuditStoreVisitItem, AuditShareItem, AuditSelfReportItem, AuditVisitReportItem},
   data() {
     return {
       typeTabs: [
         {label: '药动销', value: 'movement'},
         {label: '跑店/巡店', value: 'storeVisit'},
-        {label: '自主填报', value: 'selfReport'},
+        {label: '驻店填报', value: 'selfReport'},
+        {label: '跑店填报', value: 'visitReport'},
         {label: '药分享', value: 'exchange'}
       ],
       statusTabs: [
@@ -206,6 +238,7 @@ export default {
       movementTasks: [],
       storeVisitTasks: [],
       selfReportTasks: [],
+      visitReportTasks: [],
       exchangeTasks: [],
       loading: false,
       chainLoading: false,
@@ -225,6 +258,10 @@ export default {
       rejectReason: '',
       pendingReject: null,
       pendingRejectType: 'audit',
+      // 跑店填报审核通过时的奖金输入
+      showRewardPopup: false,
+      rewardAmount: '',
+      pendingRewardItem: null,
       pageNo: 1,
       pageSize: 5,
       hasMore: true,
@@ -236,10 +273,12 @@ export default {
       if (this.activeType === 'movement') return this.movementTasks
       if (this.activeType === 'storeVisit') return this.storeVisitTasks
       if (this.activeType === 'selfReport') return this.selfReportTasks
+      if (this.activeType === 'visitReport') return this.visitReportTasks
       return this.exchangeTasks
     },
     displayStatusTabs() {
-      if (this.activeType === 'selfReport') {
+      // 驻店/跑店填报都由审核端驳回，没有「抄送」态
+      if (this.isSelfReportLikeType) {
         return this.statusTabs.filter(item => item.value !== 3)
       }
       return this.statusTabs
@@ -247,6 +286,13 @@ export default {
     isStoreVisitType() {
       return this.activeType === 'storeVisit'
     },
+    // 跑店填报的连锁在 store_list JSON 里，没有 chain_id 可匹配，只能按连锁名模糊查
+    useChainNameFilter() {
+      return this.activeType === 'visitReport'
+    },
+    isSelfReportLikeType() {
+      return this.activeType === 'selfReport' || this.activeType === 'visitReport'
+    },
     chainLabel() {
       const selected = this.chainOptions.find(item => item.id === this.filterForm.chainId)
       return (selected && selected.text) || '连锁筛选'
@@ -274,12 +320,13 @@ export default {
       await this.fetchList()
     },
     getPageSize(type = this.activeType) {
-      return type === 'selfReport' ? 10 : this.pageSize
+      return this.isSelfReportLikeType || type === 'selfReport' || type === 'visitReport' ? 10 : this.pageSize
     },
     getTaskListByType(type = this.activeType) {
       if (type === 'movement') return this.movementTasks
       if (type === 'storeVisit') return this.storeVisitTasks
       if (type === 'selfReport') return this.selfReportTasks
+      if (type === 'visitReport') return this.visitReportTasks
       return this.exchangeTasks
     },
     setTaskListByType(type = this.activeType, list = []) {
@@ -295,6 +342,10 @@ export default {
         this.selfReportTasks = list
         return
       }
+      if (type === 'visitReport') {
+        this.visitReportTasks = list
+        return
+      }
       this.exchangeTasks = list
     },
     resetPagination() {
@@ -450,6 +501,28 @@ export default {
       }
       return params
     },
+    // 跑店填报表里没有 chain_id/merchant_id，只能按 store_list 文本模糊匹配
+    buildVisitReportFilterParams() {
+      const params = {}
+      const userGroup = (this.filterForm.userGroup || '').trim()
+      if (userGroup) params.userGroup = userGroup
+      const keyword = (this.filterForm.merchantKeyword || '').trim()
+      const chainText = this.selectedChainText()
+      const startDate = this.filterForm.startDate
+      const endDate = this.filterForm.endDate
+      if (chainText) params.chainName = chainText
+      if (keyword) params.merchantName = keyword
+      if (startDate) params.dateStart = startDate
+      if (endDate) params.dateEnd = endDate
+      return params
+    },
+    // 下拉里选的是连锁的 id，新表按名字查，需要回查成文本
+    selectedChainText() {
+      const selectedId = this.filterForm.chainId
+      if (selectedId === '' || selectedId === null || selectedId === undefined) return ''
+      const option = this.chainOptions.find(item => String(item.id) === String(selectedId))
+      return option ? (option.text || '') : ''
+    },
     filterExchangeList(list = []) {
       const keyword = (this.filterForm.merchantKeyword || '').trim().toLowerCase()
       const startTs = this.filterForm.startDate ? dayjs(`${this.filterForm.startDate} 00:00:00`).valueOf() : null
@@ -582,7 +655,15 @@ export default {
         this.filterForm.chainId = ''
         this.filterForm.merchantKeyword = ''
       }
-      if (value === 'selfReport' && this.activeStatus === 3) {
+      // 跑店填报没有 chain_id 列，连锁只能在已加载的选项里按名字查；
+      // 切到该类型时若选中的是虚拟连锁（chain_ 前缀），清掉避免查出空列表
+      if (value === 'visitReport') {
+        const chainIdText = String(this.getSelectedChainApiValue(this.filterForm.chainId) || '')
+        if (!chainIdText || chainIdText.startsWith('chain_')) {
+          this.filterForm.chainId = ''
+        }
+      }
+      if ((value === 'selfReport' || value === 'visitReport') && this.activeStatus === 3) {
         this.activeStatus = 0
       }
       this.activeType = value
@@ -672,6 +753,30 @@ export default {
             this.setTaskListByType('selfReport', merged)
             this.updatePagination(pageResult, requestPage, list.length, pageSize)
           }
+        } else if (this.activeType === 'visitReport') {
+          if (isCopyQuery) {
+            this.setTaskListByType('visitReport', [])
+            this.hasMore = false
+          } else {
+            const params = {
+              status: this.activeStatus,
+              page: requestPage,
+              limit: pageSize,
+              auditLite: 1
+            }
+            Object.assign(params, this.buildVisitReportFilterParams())
+            const {data} = await visitReportAuditPageReq(params)
+            const pageResult = this.extractPageResult(data)
+            const list = pageResult.list
+            const normalized = list.map(item => this.normalizeVisitReport(item))
+            const nextList = this.filterMovementList(normalized, {
+              enableChainFilter: false,
+              enableMerchantFilter: false
+            })
+            const merged = append ? this.getTaskListByType('visitReport').concat(nextList) : nextList
+            this.setTaskListByType('visitReport', merged)
+            this.updatePagination(pageResult, requestPage, list.length, pageSize)
+          }
         } else {
           const params = {
             status: isCopyQuery ? 2 : this.activeStatus,
@@ -798,6 +903,27 @@ export default {
         submitTimestamp: this.parseDateToTimestamp(activityDate)
       }
     },
+    // 跑店填报：卡片主体是巡店列表，列表接口不带 storeList（大字段），展开时再拉详情
+    normalizeVisitReport(item) {
+      const createRaw = item.createTime || item.createdAt || ''
+      const summaryRaw = this.parseJson(item.summary, '')
+      const summary = typeof summaryRaw === 'string' ? summaryRaw : JSON.stringify(summaryRaw)
+      const user = item && item.user ? item.user : {}
+      const owner = item.owner || `${user.realName || user.nickname || '-'},${user.phone || ''}`
+      return {
+        id: item.id,
+        userId: item.userId,
+        storeCount: Number(item.storeCount) || 0,
+        storeList: item.storeList || '',
+        owner,
+        status: item.status,
+        reward: item.reward,
+        location: item.location || '',
+        summary,
+        rejectReason: item.rejectReason || '',
+        submitTimestamp: this.parseDateToTimestamp(createRaw)
+      }
+    },
     formatAmount(value) {
       const num = Number(value || 0)
       return num.toFixed(2)
@@ -895,6 +1021,48 @@ export default {
     async handleSelfReportUpdated() {
       await this.reloadFromFirstPage()
     },
+    // 跑店填报与驻店填报共用同一套审核动作，仅接口不同。
+    // 跑店没有销量小计，奖金得审核端手填，所以先弹输入框。
+    async handleVisitReportApprove(item) {
+      this.pendingRewardItem = item
+      this.rewardAmount = item.reward === null || item.reward === undefined ? '' : `${item.reward}`
+      this.showRewardPopup = true
+    },
+    closeRewardPopup() {
+      this.showRewardPopup = false
+      this.rewardAmount = ''
+      this.pendingRewardItem = null
+    },
+    async submitRewardAmount() {
+      const item = this.pendingRewardItem
+      if (!item) {
+        this.closeRewardPopup()
+        return
+      }
+      const raw = String(this.rewardAmount === null || this.rewardAmount === undefined ? '' : this.rewardAmount).trim()
+      if (!raw) {
+        uni.showToast({title: '请输入奖金金额', icon: 'none'})
+        return
+      }
+      const reward = Number(raw)
+      if (!Number.isFinite(reward) || reward < 0) {
+        uni.showToast({title: '奖金金额不能小于0', icon: 'none'})
+        return
+      }
+      await visitReportChangeReq({
+        id: item.id,
+        status: 1,
+        reward
+      })
+      uni.showToast({
+        title: '操作成功'
+      })
+      this.closeRewardPopup()
+      await this.reloadFromFirstPage()
+    },
+    async handleVisitReportReject(item) {
+      this.openRejectPopup(item, 'visitReport')
+    },
     async handleShareUpdate({item, payload, localDetailList}) {
       const data = this.buildSharePayload(item, payload)
       await shareChangeReq(data)
@@ -928,7 +1096,7 @@ export default {
     },
     async submitRejectReason() {
       const reason = (this.rejectReason || '').trim()
-      if (this.pendingRejectType !== 'selfReport' && !reason) {
+      if (!this.isSelfReportLikeRejectType(this.pendingRejectType) && !reason) {
         uni.showToast({
           title: '请输入拒绝原因',
           icon: 'none'
@@ -939,8 +1107,9 @@ export default {
         this.closeRejectPopup()
         return
       }
-      if (this.pendingRejectType === 'selfReport') {
-        await selfReportChangeReq({
+      if (this.isSelfReportLikeRejectType(this.pendingRejectType)) {
+        const req = this.pendingRejectType === 'visitReport' ? visitReportChangeReq : selfReportChangeReq
+        await req({
           id: this.pendingReject.id,
           status: 2,
           rejectReason: reason
@@ -955,6 +1124,10 @@ export default {
       await this.submitAuditAction(3, this.pendingReject, reason)
       this.closeRejectPopup()
     },
+    // 驻店/跑店填报的驳回都是「驳回原因可不填」
+    isSelfReportLikeRejectType(type) {
+      return type === 'selfReport' || type === 'visitReport'
+    },
     preview(url, list) {
       uni.previewImage({
         current: url,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 61a2012..c3cd2c9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -582,7 +582,8 @@ export default {
       this.detailPopupVisible = true;
     },
     openSelfReportCreate() {
-      this.jumpWithLogin('/packageUser/self-report/create')
+      // 「自主填报」先选填报类型（驻店填报 / 跑店填报），再进对应表单页
+      this.jumpWithLogin('/packageUser/self-report/select')
     },
     openSelfReportRecord() {
       this.jumpWithLogin('/packageUser/self-report/records')
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 4b962b1..c181e75 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -489,7 +489,8 @@ export default {
       this.jumpWithLogin('/pages/bonus/index')
     },
     openSelfReport() {
-      this.jumpWithLogin('/packageUser/self-report/create')
+      // 「自主填报」先选填报类型（驻店填报 / 跑店填报），再进对应表单页
+      this.jumpWithLogin('/packageUser/self-report/select')
     },
     openWithdraw() {
       this.jumpWithLogin('/pages/bonus/withdraw')
diff --git a/util/store-picker.js b/util/store-picker.js
new file mode 100644
index 0000000..fd87b77
--- /dev/null
+++ b/util/store-picker.js
@@ -0,0 +1,142 @@
+/**
+ * 连锁 / 门店两级选择的公用逻辑。
+ *
+ * 抽出来的原因：驻店填报（packageUser/self-report/create.vue）与跑店填报
+ * （packageUser/self-report/visit.vue）都要「先选连锁、再选门店」，
+ * 且门店全量可达 8000+ 条 —— 明细必须挂在实例上而不是页面 data，
+ * 否则页面 data 树膨胀到 1MB+，每次 setData 的 diff/序列化都会从 ~490ms 涨到 ~1000ms。
+ *
+ * 用法：在页面 methods 里混入本文件的 methods（页面 data 仍需自己声明
+ * merchantChainList / merchantLoading / merchantStoreSearchKeyword / 各 picker 的开关与 value）。
+ */
+
+export function pickFirstText(source, keys = []) {
+  if (!source || typeof source !== 'object') return ''
+  for (let i = 0; i < keys.length; i += 1) {
+    const value = source[keys[i]]
+    if (value !== undefined && value !== null && String(value).trim()) {
+      return String(value).trim()
+    }
+  }
+  return ''
+}
+
+export function unwrapList(data) {
+  if (Array.isArray(data)) return data
+  if (!data || typeof data !== 'object') return []
+  const keys = ['list', 'records', 'rows', 'items', 'data', 'result', 'chainList']
+  for (let i = 0; i < keys.length; i += 1) {
+    const value = data[keys[i]]
+    if (Array.isArray(value)) return value
+    if (value && typeof value === 'object') {
+      const nested = unwrapList(value)
+      if (nested.length) return nested
+    }
+  }
+  return [data]
+}
+
+export function normalizeMerchant(item) {
+  const id = item.id ?? item.merchantId ?? item.merchant_id
+  const text = item.name || item.merchantName || item.merchant_name || item.title || '未命名门店'
+  const lat = Number(item.lat ?? item.latitude ?? item.merchantLat ?? item.merchant_lat)
+  const lng = Number(item.lng ?? item.longitude ?? item.merchantLng ?? item.merchant_lng)
+  const address = [item.province, item.city, item.region, item.area, item.address].filter(Boolean).join('')
+  return {
+    id,
+    text,
+    chainId: item.chainId ?? item.chain_id ?? '',
+    chainName: item.chainName || item.chain || item.chainAbb || '',
+    lat: Number.isFinite(lat) ? lat : null,
+    lng: Number.isFinite(lng) ? lng : null,
+    province: item.province || item.province_str || '',
+    city: item.city || item.city_str || '',
+    address
+  }
+}
+
+export function normalizeMerchantChain(item, index) {
+  const chainName = pickFirstText(item, ['chainName', 'chain', 'chainAbb', 'name', 'title']) || `连锁${index + 1}`
+  const rawChainId = item.chainId ?? item.chain_id ?? item.id ?? item.chainCode ?? item.chain_code ?? chainName
+  const chainId = rawChainId === undefined || rawChainId === null || String(rawChainId).trim() === ''
+    ? `chain_${index}`
+    : rawChainId
+  const childCandidates = ['children', 'merchantList', 'merchants', 'shopList', 'list', 'records']
+  let rawChildren = []
+  for (let i = 0; i < childCandidates.length; i += 1) {
+    const list = item[childCandidates[i]]
+    if (Array.isArray(list) && list.length) {
+      rawChildren = list
+      break
+    }
+  }
+  let merchants = rawChildren
+    .map(child => normalizeMerchant(child))
+    .filter(merchant => merchant.id !== undefined && merchant.id !== null && String(merchant.id).trim() !== '')
+    .map(merchant => Object.assign({}, merchant, {chainId, chainName}))
+  if (!merchants.length) {
+    const selfMerchant = normalizeMerchant(item)
+    if (selfMerchant.id !== undefined && selfMerchant.id !== null && String(selfMerchant.id).trim() !== '') {
+      merchants = [Object.assign({}, selfMerchant, {chainId, chainName})]
+    }
+  }
+  return {
+    id: chainId,
+    text: chainName,
+    merchants
+  }
+}
+
+// 接口可能返回「扁平门店列表（带 chainName）」，也可能返回「连锁嵌套门店」，两种都兼容
+export function groupMerchantListByChain(list) {
+  const chainMap = {}
+  ;(Array.isArray(list) ? list : []).forEach((item, index) => {
+    const merchant = normalizeMerchant(item)
+    if (merchant.id === undefined || merchant.id === null || String(merchant.id).trim() === '') return
+    const chainName = pickFirstText(item, ['chainName', 'chain', 'chainAbb', 'chain_name'])
+    if (!chainName) return
+    const rawChainId = item.chainId ?? item.chain_id ?? item.chainCode ?? item.chain_code ?? chainName
+    const chainId = rawChainId === undefined || rawChainId === null || String(rawChainId).trim() === ''
+      ? `chain_${index}`
+      : rawChainId
+    const key = String(chainId)
+    if (!chainMap[key]) {
+      chainMap[key] = {id: chainId, text: chainName, merchants: []}
+    }
+    chainMap[key].merchants.push(Object.assign({}, merchant, {chainId, chainName}))
+  })
+  return Object.keys(chainMap).map(key => chainMap[key])
+}
+
+export function flattenMerchantsFromChains(chainList) {
+  const list = []
+  ;(Array.isArray(chainList) ? chainList : []).forEach(chain => {
+    const merchants = Array.isArray(chain.merchants) ? chain.merchants : []
+    merchants.forEach(merchant => {
+      if (!merchant || merchant.id === '' || merchant.id === null || merchant.id === undefined) return
+      list.push(Object.assign({}, merchant, {
+        chainId: merchant.chainId || chain.id || '',
+        chainName: merchant.chainName || chain.text || ''
+      }))
+    })
+  })
+  return list
+}
+
+// 门店关键词过滤：连锁名命中由调用方另判，这里只按门店名匹配
+export function filterMerchantStores(merchants, keyword) {
+  const list = Array.isArray(merchants) ? merchants : []
+  const text = String(keyword || '').trim()
+  if (!text) return list
+  return list.filter(merchant => (merchant.text || '').includes(text))
+}
+
+export default {
+  pickFirstText,
+  unwrapList,
+  normalizeMerchant,
+  normalizeMerchantChain,
+  groupMerchantListByChain,
+  flattenMerchantsFromChains,
+  filterMerchantStores
+}