From e0f56bfa1ed15529231c41ca8effc2699cf5072b Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Sun, 28 Sep 2025 10:11:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(arch):=20=E5=AE=89=E7=BD=AE=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84=E6=96=B9=E6=A1=88=E4=BA=8C=E5=8A=9F=E8=83=BD=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=9A=E5=91=98=E7=82=B9=E4=BD=8D=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/architecture.js                        |    9 +
 config/mine.js                                |    4 +
 pages.json                                    |    2 +-
 pages/architecture/architecture.vue           |   14 +-
 pages/architecture/pointList/index.vue        |  896 ++++++++++
 .../resettleArchite/resettle2.vue             | 1452 +++++++++--------
 pages/mine/index.vue                          |   91 +-
 7 files changed, 1788 insertions(+), 680 deletions(-)
 create mode 100644 pages/architecture/pointList/index.vue

diff --git a/config/architecture.js b/config/architecture.js
index 5f69689..c330ea5 100644
--- a/config/architecture.js
+++ b/config/architecture.js
@@ -23,3 +23,12 @@ export const getTjFramework = params =>
 //转换为base64格式用于图片下载
 export const getUrlBase = data =>
   http.post('/member/manage/member-structure/get-url-base64', data)
+
+//安置架构列表
+export const getAzFrameworkList = params =>
+  http.get('/member/api/member-structure/three-framework-list', { params })
+
+// 会员点位列表查询
+// /member/api/member/member-point
+export const getMemberPointDetail = params =>
+  http.get('/member/api/member-structure/pointDetail', { params })
diff --git a/config/mine.js b/config/mine.js
index eef344c..91daf2d 100644
--- a/config/mine.js
+++ b/config/mine.js
@@ -43,3 +43,7 @@ export const getDirectPushList = params =>
 // 退款明细列表
 export const getRefundList = params =>
   http.get('/sale/api/my-order/refund-list', { params })
+
+// 获取个人点位信息
+export const getPersonalPointInfo = () =>
+  http.get('/member/api/member/member-point')
diff --git a/pages.json b/pages.json
index 4020f1f..6cf63b0 100644
--- a/pages.json
+++ b/pages.json
@@ -746,7 +746,7 @@
     {
       "path": "pages/architecture/resettleArchite/resettle2",
       "style": {
-        "navigationBarTitleText": "安置方案二",
+        "navigationBarTitleText": "方案二",
         "enablePullDownRefresh": false
       }
     },
diff --git a/pages/architecture/architecture.vue b/pages/architecture/architecture.vue
index ad7aca9..189116c 100644
--- a/pages/architecture/architecture.vue
+++ b/pages/architecture/architecture.vue
@@ -29,13 +29,13 @@ export default {
           value: 'marketDynamics',
           isShow: false,
         },
-        // {
-        //   name: '安置方案二',
-        //   url: '../../static/images/my_icon14.png',
-        //   path: '/pages/architecture/resettleArchite/resettle2',
-        //   value: 'incomeDetail',
-        //   isShow: false,
-        // },
+        {
+          name: '方案二',
+          url: '../../static/images/my_icon14.png',
+          path: '/pages/architecture/resettleArchite/resettle2',
+          value: 'incomeDetail',
+          isShow: false,
+        },
         // {
         //   name: '安置方案三',
         //   url: '../../static/images/my_icon14.png',
diff --git a/pages/architecture/pointList/index.vue b/pages/architecture/pointList/index.vue
new file mode 100644
index 0000000..513359a
--- /dev/null
+++ b/pages/architecture/pointList/index.vue
@@ -0,0 +1,896 @@
+<template>
+  <view class="point-list-container">
+    <!-- 搜索筛选栏 -->
+    <view class="search-bar">
+      <view class="search-item">
+        <text class="label">阶段</text>
+        <view class="select-box" @click="stageListVisible = true">
+          <text class="select-text">{{ stageName || '请选择阶段' }}</text>
+          <u-icon name="arrow-right" size="24rpx" color="#999"></u-icon>
+        </view>
+      </view>
+      <view class="filter-btn" @click="showFilter = true">
+        <u-icon name="list" size="28rpx" color="#005bac"></u-icon>
+        <text>筛选</text>
+      </view>
+    </view>
+
+    <!-- 点位列表 -->
+    <view class="point-list-content">
+      <view v-if="pointList.length > 0" class="list-wrapper">
+        <view
+          v-for="(item, index) in pointList"
+          :key="index"
+          class="point-item"
+        >
+          <!-- 基本信息 -->
+          <view class="item-header">
+            <view class="member-info">
+              <text class="member-code">{{
+                item.childNode
+                  ? `ZK${item.pkMember}-${item.childNode}`
+                  : `ZK${item.pkMember}`
+              }}</text>
+              <view
+                class="status-badge"
+                :class="item.stageStatus === 0 ? 'completed' : 'pending'"
+              >
+                {{ item.stageStatusLabel }}
+              </view>
+            </view>
+            <view class="stage-info">
+              <text class="stage">{{ item.stageLabel }}</text>
+              <text class="date">{{ formatDate(item.stageDate) }}</text>
+            </view>
+          </view>
+
+          <!-- 点位展示区域 -->
+          <view class="points-container">
+            <!-- 第一层 (1-1, 1-2) -->
+            <view class="layer-wrapper" v-if="hasLayerPoints(item, 1)">
+              <view class="layer-title">第一层</view>
+              <view class="points-row">
+                <view
+                  v-for="pos in 2"
+                  :key="`1-${pos}`"
+                  class="point-slot"
+                  :class="getPointClass(item[`pointMember1${pos}`])"
+                  @click="
+                    handlePointClick(item, 1, pos, item[`pointMember1${pos}`])
+                  "
+                >
+                  <view class="point-content">
+                    <text class="point-label">1-{{ pos }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 第二层 (2-1, 2-2, 2-3, 2-4) -->
+            <view class="layer-wrapper" v-if="hasLayerPoints(item, 2)">
+              <view class="layer-title">第二层</view>
+              <view class="points-row">
+                <view
+                  v-for="pos in 4"
+                  :key="`2-${pos}`"
+                  class="point-slot"
+                  :class="getPointClass(item[`pointMember2${pos}`])"
+                  @click="
+                    handlePointClick(item, 2, pos, item[`pointMember2${pos}`])
+                  "
+                >
+                  <view class="point-content">
+                    <text class="point-label">2-{{ pos }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 第三层 (3-1 到 3-8) -->
+            <view class="layer-wrapper" v-if="hasLayerPoints(item, 3)">
+              <view class="layer-title">第三层</view>
+              <view class="points-row multi-row">
+                <view
+                  v-for="pos in 8"
+                  :key="`3-${pos}`"
+                  class="point-slot small"
+                  :class="getPointClass(item[`pointMember3${pos}`])"
+                  @click="
+                    handlePointClick(item, 3, pos, item[`pointMember3${pos}`])
+                  "
+                >
+                  <view class="point-content">
+                    <text class="point-label">3-{{ pos }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+
+          <!-- 其他信息 -->
+          <view class="item-footer">
+            <text class="point-type">{{ item.pointTypeLabel }}</text>
+            <text class="creation-time">创建时间：{{ item.creationTime }}</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- 空状态 -->
+      <view v-else class="empty-state">
+        <u-empty mode="data" text="暂无点位数据"></u-empty>
+      </view>
+
+      <!-- 加载更多提示 -->
+      <view v-if="pointList.length > 0" class="load-more">
+        <view v-if="loading && currentPage > 1" class="loading-text">
+          <u-loading-icon mode="spinner"></u-loading-icon>
+          <text>加载中...</text>
+        </view>
+        <view v-else-if="!hasMore" class="no-more-text">
+          <text>没有更多数据了</text>
+        </view>
+        <view v-else class="pull-up-text">
+          <text>上拉加载更多</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 点位详情弹窗 -->
+    <u-popup
+      :show="showPointDetail"
+      mode="center"
+      @close="showPointDetail = false"
+      :closeOnClickOverlay="true"
+      borderRadius="20"
+    >
+      <view class="point-detail-popup">
+        <view class="popup-header">
+          <text class="popup-title">点位详情</text>
+          <u-icon
+            name="close"
+            @click="showPointDetail = false"
+            size="32rpx"
+          ></u-icon>
+        </view>
+        <view class="popup-content">
+          <view v-if="pointDetailLoading" class="loading-detail">
+            <u-loading-icon mode="spinner"></u-loading-icon>
+            <text>加载详情中...</text>
+          </view>
+          <view v-else>
+            <view class="detail-row">
+              <text class="detail-label">会员编号：</text>
+              <text class="detail-value">{{
+                currentUser.memberName || currentUser.memberCode || 'ZK23668383'
+              }}</text>
+            </view>
+            <view class="detail-row">
+              <text class="detail-label">点位信息：</text>
+              <text class="detail-value">{{
+                selectedPoint.position || ''
+              }}</text>
+            </view>
+            <view v-if="pointDetail" class="detail-row">
+              <text class="detail-label">隶属体系：</text>
+              <text class="detail-value">{{
+                pointDetail.system || pointDetail.parentSystem || 'BF30720213'
+              }}</text>
+            </view>
+            <view v-if="pointDetail" class="detail-row">
+              <text class="detail-label">荣誉奖衔：</text>
+              <text class="detail-value">{{
+                pointDetail.honorTitle || '无'
+              }}</text>
+            </view>
+            <view v-if="pointDetail" class="detail-row">
+              <text class="detail-label">创建时间：</text>
+              <text class="detail-value">{{
+                formatDate(pointDetail.creationTime || pointDetail.createTime)
+              }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </u-popup>
+
+    <!-- 筛选弹窗 -->
+    <u-popup
+      :show="showFilter"
+      mode="right"
+      @close="showFilter = false"
+      :closeOnClickOverlay="false"
+    >
+      <view class="filter-popup">
+        <view class="popup-header">
+          <text @click="applyFilter">筛选</text>
+          <text class="close-btn" @click="showFilter = false">返回</text>
+        </view>
+
+        <view class="filter-section">
+          <text class="section-title">状态</text>
+          <view class="select-box" @click="statusListVisible = true">
+            <text class="select-text">{{ statusName || '请选择状态' }}</text>
+            <u-icon name="arrow-right" size="24rpx" color="#999"></u-icon>
+          </view>
+        </view>
+
+        <view class="filter-actions">
+          <u-button type="info" @click="clearFilter">清空筛选条件</u-button>
+          <u-button type="primary" @click="confirmFilter">确定</u-button>
+        </view>
+      </view>
+    </u-popup>
+
+    <!-- 选择器 -->
+    <u-picker
+      :show="stageListVisible"
+      :columns="stageOptions"
+      @confirm="onStageConfirm"
+      @cancel="stageListVisible = false"
+      keyName="label"
+    ></u-picker>
+
+    <u-picker
+      :show="statusListVisible"
+      :columns="statusOptions"
+      @confirm="onStatusConfirm"
+      @cancel="statusListVisible = false"
+      keyName="label"
+    ></u-picker>
+  </view>
+</template>
+
+<script>
+import * as arc from '@/config/architecture.js'
+
+export default {
+  data() {
+    return {
+      // 列表数据
+      pointList: [],
+      total: 0,
+      currentPage: 1,
+      pageSize: 10,
+      hasMore: true,
+
+      // 筛选条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stage: 1,
+        stageStatus: null,
+        childNode: '',
+      },
+
+      // 选择器数据
+      stageOptions: [
+        [
+          { value: 1, label: '阶段一' },
+          { value: 2, label: '阶段二' },
+          { value: 3, label: '阶段三' },
+        ],
+      ],
+      statusOptions: [
+        [
+          { value: 0, label: '已完成' },
+          { value: 1, label: '未完成' },
+        ],
+      ],
+
+      // UI状态
+      showFilter: false,
+      showPointDetail: false,
+      stageListVisible: false,
+      statusListVisible: false,
+      loading: false,
+
+      // 选中的值
+      stageName: '阶段一',
+      statusName: '',
+
+      // 点位详情
+      selectedPoint: {},
+      pointDetail: null,
+      pointDetailLoading: false,
+      currentUser: {
+        memberCode: 'ZK23668383', // 这里应该从用户信息中获取
+        memberName: 'ZK23668383', // 用户姓名
+      },
+    }
+  },
+
+  onLoad() {
+    this.init()
+  },
+
+  onPullDownRefresh() {
+    this.refreshData()
+  },
+
+  onReachBottom() {
+    this.loadMore()
+  },
+
+  methods: {
+    init() {
+      this.stageName = this.stageOptions[0][0].label
+      this.queryParams.stage = this.stageOptions[0][0].value
+      this.loadPointList()
+    },
+
+    // 加载点位列表数据
+    async loadPointList() {
+      try {
+        this.loading = true
+        // 只在首次加载或刷新时显示全局loading
+        if (this.currentPage === 1) {
+          uni.showLoading({ title: '加载中...' })
+        }
+
+        const res = await arc.getAzFrameworkList(this.queryParams)
+
+        if (res.code === 200 && res.data) {
+          const newData = res.data.rows || []
+
+          if (this.currentPage === 1) {
+            this.pointList = newData
+          } else {
+            this.pointList = [...this.pointList, ...newData]
+          }
+          this.total = res.data.total || 0
+
+          // 优化hasMore判断逻辑
+          this.hasMore =
+            newData.length >= this.pageSize &&
+            this.pointList.length < this.total
+        } else {
+          uni.showToast({
+            title: res.msg || '加载失败',
+            icon: 'none',
+          })
+        }
+      } catch (error) {
+        console.error('加载点位列表失败:', error)
+        uni.showToast({
+          title: '网络异常，请稍后重试',
+          icon: 'none',
+        })
+      } finally {
+        this.loading = false
+        // 只在首次加载或刷新时隐藏全局loading
+        if (this.currentPage <= 1) {
+          uni.hideLoading()
+        }
+        uni.stopPullDownRefresh()
+      }
+    },
+
+    // 刷新数据
+    refreshData() {
+      this.currentPage = 1
+      this.queryParams.pageNum = 1
+      this.hasMore = true
+      this.loadPointList()
+    },
+
+    // 加载更多数据
+    async loadMore() {
+      if (this.loading || !this.hasMore) return
+
+      this.currentPage++
+      this.queryParams.pageNum = this.currentPage
+      await this.loadPointList()
+    },
+
+    // 检查某一层是否有点位
+    hasLayerPoints(item, layer) {
+      const layerPoints = {
+        1: ['pointMember11', 'pointMember12'],
+        2: ['pointMember21', 'pointMember22', 'pointMember23', 'pointMember24'],
+        3: [
+          'pointMember31',
+          'pointMember32',
+          'pointMember33',
+          'pointMember34',
+          'pointMember35',
+          'pointMember36',
+          'pointMember37',
+          'pointMember38',
+        ],
+      }
+
+      return layerPoints[layer].some(key => item.hasOwnProperty(key))
+    },
+
+    // 获取点位样式类
+    getPointClass(pointMember) {
+      return {
+        occupied: pointMember && pointMember !== '',
+        empty: !pointMember || pointMember === '',
+      }
+    },
+
+    // 点位点击处理
+    async handlePointClick(item, layer, position, pointMember) {
+      if (!pointMember || pointMember === '') {
+        // 空点位提示
+        uni.showToast({
+          title: '当前点位为空位',
+          icon: 'none',
+        })
+        return
+      }
+
+      // 设置选中的点位信息
+      this.selectedPoint = {
+        ...item,
+        position: `${layer}-${position}`,
+        pointMember: pointMember,
+      }
+
+      // 显示弹窗
+      this.showPointDetail = true
+
+      // 获取点位详情
+      await this.getPointDetail({
+        point: item[`point${layer}${position}`] || position,
+        pointMember: pointMember,
+      })
+    },
+
+    // 获取点位详情
+    async getPointDetail(params) {
+      try {
+        this.pointDetailLoading = true
+        this.pointDetail = null
+
+        const res = await arc.getMemberPointDetail(params)
+
+        if (res.code === 200 && res.data) {
+          this.pointDetail = res.data
+        } else {
+          uni.showToast({
+            title: res.msg || '获取详情失败',
+            icon: 'none',
+          })
+        }
+      } catch (error) {
+        console.error('获取点位详情失败:', error)
+        uni.showToast({
+          title: '网络异常，请稍后重试',
+          icon: 'none',
+        })
+      } finally {
+        this.pointDetailLoading = false
+      }
+    },
+
+    // 阶段选择确认
+    onStageConfirm(e) {
+      this.queryParams.stage = e.value[0].value
+      this.stageName = e.value[0].label
+      this.stageListVisible = false
+      this.refreshData()
+    },
+
+    // 状态选择确认
+    onStatusConfirm(e) {
+      this.queryParams.stageStatus = e.value[0].value
+      this.statusName = e.value[0].label
+      this.statusListVisible = false
+    },
+
+    // 应用筛选
+    applyFilter() {
+      this.refreshData()
+      this.showFilter = false
+    },
+
+    // 确认筛选
+    confirmFilter() {
+      this.refreshData()
+      this.showFilter = false
+    },
+
+    // 清空筛选
+    clearFilter() {
+      this.queryParams.stageStatus = null
+      this.statusName = ''
+      this.refreshData()
+      this.showFilter = false
+    },
+
+    // 日期格式化
+    formatDate(dateStr) {
+      if (!dateStr) return ''
+      const date = new Date(dateStr)
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.point-list-container {
+  min-height: 100vh;
+  background-color: #f5f6f8;
+}
+
+/* 搜索筛选栏 */
+.search-bar {
+  background: #fff;
+  padding: 20rpx 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 2rpx solid #eee;
+
+  .search-item {
+    flex: 1;
+    display: flex;
+    align-items: center;
+
+    .label {
+      font-size: 28rpx;
+      color: #333;
+      margin-right: 20rpx;
+    }
+
+    .select-box {
+      flex: 1;
+      background: #f5f6f8;
+      border-radius: 34rpx;
+      padding: 20rpx 24rpx;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .select-text {
+        font-size: 26rpx;
+        color: #333;
+      }
+
+      &:active {
+        background-color: #e8e9eb;
+      }
+    }
+  }
+
+  .filter-btn {
+    display: flex;
+    align-items: center;
+    margin-left: 20rpx;
+    padding: 12rpx 20rpx;
+
+    text {
+      font-size: 26rpx;
+      color: #005bac;
+      margin-left: 8rpx;
+    }
+  }
+}
+
+/* 点位列表内容 */
+.point-list-content {
+  padding: 20rpx 24rpx;
+}
+
+.list-wrapper {
+  .point-item {
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      margin-bottom: 30rpx;
+      padding-bottom: 20rpx;
+      border-bottom: 2rpx solid #f5f6f8;
+
+      .member-info {
+        display: flex;
+        align-items: center;
+
+        .member-code {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #333;
+          margin-right: 20rpx;
+        }
+
+        .status-badge {
+          padding: 8rpx 16rpx;
+          border-radius: 20rpx;
+          font-size: 22rpx;
+
+          &.completed {
+            background: #e8f5e8;
+            color: #52c41a;
+          }
+
+          &.pending {
+            background: #fff2e8;
+            color: #fa8c16;
+          }
+        }
+      }
+
+      .stage-info {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+
+        .stage {
+          font-size: 26rpx;
+          color: #005bac;
+          font-weight: bold;
+        }
+
+        .date {
+          font-size: 22rpx;
+          color: #999;
+          margin-top: 8rpx;
+        }
+      }
+    }
+
+    .item-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 30rpx;
+      padding-top: 20rpx;
+      border-top: 2rpx solid #f5f6f8;
+
+      .point-type {
+        font-size: 24rpx;
+        color: #666;
+      }
+
+      .creation-time {
+        font-size: 22rpx;
+        color: #999;
+      }
+    }
+  }
+}
+
+/* 点位展示区域 */
+.points-container {
+  .layer-wrapper {
+    margin-bottom: 30rpx;
+
+    .layer-title {
+      font-size: 28rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 20rpx;
+      padding-left: 20rpx;
+      position: relative;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 8rpx;
+        height: 28rpx;
+        background: #005bac;
+        border-radius: 4rpx;
+      }
+    }
+
+    .points-row {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 16rpx;
+
+      &.multi-row {
+        .point-slot {
+          width: calc((100% - 48rpx) / 4);
+        }
+      }
+
+      .point-slot {
+        flex: 1;
+        min-height: 120rpx;
+        border-radius: 16rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        transition: all 0.3s ease;
+
+        &.small {
+          min-height: 100rpx;
+        }
+
+        &.occupied {
+          background: linear-gradient(135deg, #005bac 0%, #0066cc 100%);
+          color: #fff;
+          box-shadow: 0 4rpx 12rpx rgba(0, 91, 172, 0.3);
+
+          &:active {
+            transform: scale(0.95);
+          }
+        }
+
+        &.empty {
+          background: #f5f6f8;
+          border: 2rpx dashed #ccc;
+          color: #999;
+
+          &:active {
+            background: #e8e9eb;
+          }
+        }
+
+        .point-content {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+
+          .point-label {
+            font-size: 24rpx;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+  }
+}
+
+/* 加载更多 */
+.load-more {
+  padding: 40rpx 0;
+  text-align: center;
+
+  .loading-text,
+  .no-more-text,
+  .pull-up-text {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 26rpx;
+    color: #999;
+
+    text {
+      margin-left: 12rpx;
+    }
+  }
+
+  .no-more-text {
+    color: #ccc;
+  }
+}
+
+/* 空状态 */
+.empty-state {
+  padding: 100rpx 0;
+  text-align: center;
+}
+
+/* 弹窗样式 */
+.point-detail-popup {
+  width: 600rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    background: #f5f6f8;
+
+    .popup-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+    }
+  }
+
+  .popup-content {
+    padding: 30rpx;
+
+    .loading-detail {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 60rpx 0;
+      font-size: 26rpx;
+      color: #999;
+
+      text {
+        margin-left: 12rpx;
+      }
+    }
+
+    .detail-row {
+      display: flex;
+      margin-bottom: 25rpx;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .detail-label {
+        width: 180rpx;
+        font-size: 26rpx;
+        color: #666;
+        flex-shrink: 0;
+      }
+
+      .detail-value {
+        flex: 1;
+        font-size: 26rpx;
+        color: #333;
+        word-break: break-all;
+      }
+    }
+  }
+}
+
+.filter-popup {
+  width: 600rpx;
+  height: 100vh;
+  background: #fff;
+
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    background: rgba(176, 196, 222, 0.45);
+
+    .close-btn {
+      color: #005bac;
+    }
+  }
+
+  .filter-section {
+    padding: 30rpx;
+
+    .section-title {
+      display: block;
+      font-size: 30rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 20rpx;
+    }
+
+    .select-box {
+      background: rgba(176, 196, 222, 0.45);
+      border-radius: 20rpx;
+      padding: 20rpx 30rpx;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .select-text {
+        font-size: 26rpx;
+        color: #333;
+      }
+    }
+  }
+
+  .filter-actions {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+
+    .u-button {
+      flex: 1;
+      border-radius: 0;
+    }
+  }
+}
+</style>
diff --git a/pages/architecture/resettleArchite/resettle2.vue b/pages/architecture/resettleArchite/resettle2.vue
index 57e25d6..9091f65 100644
--- a/pages/architecture/resettleArchite/resettle2.vue
+++ b/pages/architecture/resettleArchite/resettle2.vue
@@ -1,782 +1,898 @@
 <template>
-  <view>
-    <view class="seach">
-      <view class="neibox"> 会员编号 </view>
-      <view class="seach_i">
-        <u--input class="these" v-model="queryParams.memberCode">
-          <template slot="suffix">
-            <view class="seatch_r">
-              <u-icon
-                @click="getDataList"
-                name="search"
-                size="22"
-                color="#fff"
-              ></u-icon>
-            </view>
-          </template>
-        </u--input>
+  <view class="point-list-container">
+    <!-- 搜索筛选栏 -->
+    <view class="search-bar">
+      <view class="search-item">
+        <text class="label">阶段</text>
+        <view class="select-box" @click="stageListVisible = true">
+          <text class="select-text">{{ stageName || '请选择阶段' }}</text>
+          <u-icon name="arrow-right" size="24rpx" color="#999"></u-icon>
+        </view>
+      </view>
+      <view class="filter-btn" @click="showFilter = true">
+        <u-icon name="list" size="28rpx" color="#005bac"></u-icon>
+        <text>筛选</text>
       </view>
-      <view class="neibox" @click="popShow = true"> 筛选 </view>
     </view>
-    <view class="mainbox">
-      <view class="main_top">
+
+    <!-- 点位列表 -->
+    <view class="point-list-content">
+      <view v-if="pointList.length > 0" class="list-wrapper">
         <view
-          class="top_flex"
-          v-for="(item, index) in avaerInfoList"
+          v-for="(item, index) in pointList"
           :key="index"
+          class="point-item"
         >
-          <img class="theimg" :src="item.value" alt="" />
-          <view class="fle2">{{ item.name }}</view>
+          <!-- 基本信息 -->
+          <view class="item-header">
+            <view class="member-info">
+              <text class="member-code">{{
+                `${currentUser.memberCode}-${item.childNode}`
+              }}</text>
+              <view
+                class="status-badge"
+                :class="item.stageStatus === 0 ? 'completed' : 'pending'"
+              >
+                {{ item.stageStatusLabel }}
+              </view>
+            </view>
+            <view class="stage-info">
+              <text class="stage">{{ item.stageLabel }}</text>
+              <text class="date">{{ formatDate(item.stageDate) }}</text>
+            </view>
+          </view>
+
+          <!-- 点位展示区域 -->
+          <view class="points-container">
+            <!-- 第一层 (1-1, 1-2) -->
+            <view class="layer-wrapper" v-if="hasLayerPoints(item, 1)">
+              <view class="layer-title">第一层</view>
+              <view class="points-row">
+                <view
+                  v-for="pos in 2"
+                  :key="`1-${pos}`"
+                  class="point-slot"
+                  :class="getPointClass(item[`pointMember1${pos}`])"
+                  @click="
+                    handlePointClick(item, 1, pos, item[`pointMember1${pos}`])
+                  "
+                >
+                  <view class="point-content">
+                    <text class="point-label">1-{{ pos }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 第二层 (2-1, 2-2, 2-3, 2-4) -->
+            <view class="layer-wrapper" v-if="hasLayerPoints(item, 2)">
+              <view class="layer-title">第二层</view>
+              <view class="points-row">
+                <view
+                  v-for="pos in 4"
+                  :key="`2-${pos}`"
+                  class="point-slot"
+                  :class="getPointClass(item[`pointMember2${pos}`])"
+                  @click="
+                    handlePointClick(item, 2, pos, item[`pointMember2${pos}`])
+                  "
+                >
+                  <view class="point-content">
+                    <text class="point-label">2-{{ pos }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 第三层 (3-1 到 3-8) -->
+            <view class="layer-wrapper" v-if="hasLayerPoints(item, 3)">
+              <view class="layer-title">第三层</view>
+              <view class="points-row multi-row">
+                <view
+                  v-for="pos in 8"
+                  :key="`3-${pos}`"
+                  class="point-slot small"
+                  :class="getPointClass(item[`pointMember3${pos}`])"
+                  @click="
+                    handlePointClick(item, 3, pos, item[`pointMember3${pos}`])
+                  "
+                >
+                  <view class="point-content">
+                    <text class="point-label">3-{{ pos }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+
+          <!-- 其他信息 -->
+          <view class="item-footer">
+            <text class="point-type">{{ item.pointTypeLabel }}</text>
+            <text class="creation-time">创建时间：{{ item.creationTime }}</text>
+          </view>
         </view>
       </view>
 
-      <view class="main_bottom">
-        <view
-          class="scoll_main"
-          ref="scrollMain"
-          @touchstart="handleTouchStart"
-          @touchmove="handleTouchMove"
-          @touchend="handleTouchEnd"
-        >
-          <TreeChart2
-            :size="size"
-            :json="data"
-            :class="{ landscape: landscape.length }"
-            @click-node="clickNode"
-            @click-top="clickTop"
-          />
+      <!-- 空状态 -->
+      <view v-else class="empty-state">
+        <u-empty mode="data" text="暂无点位数据"></u-empty>
+      </view>
+
+      <!-- 加载更多提示 -->
+      <view v-if="pointList.length > 0" class="load-more">
+        <view v-if="loading && currentPage > 1" class="loading-text">
+          <u-loading-icon mode="spinner"></u-loading-icon>
+          <text>加载中...</text>
+        </view>
+        <view v-else-if="!hasMore" class="no-more-text">
+          <text>没有更多数据了</text>
+        </view>
+        <view v-else class="pull-up-text">
+          <text>上拉加载更多</text>
         </view>
       </view>
     </view>
+
+    <!-- 点位详情弹窗 -->
     <u-popup
-      :show="popShow"
+      :show="showPointDetail"
+      mode="center"
+      @close="showPointDetail = false"
+      :closeOnClickOverlay="true"
+      borderRadius="20"
+    >
+      <view class="point-detail-popup">
+        <view class="popup-header">
+          <text class="popup-title">点位详情</text>
+          <u-icon
+            name="close"
+            @click="showPointDetail = false"
+            size="32rpx"
+          ></u-icon>
+        </view>
+        <view class="popup-content">
+          <view v-if="pointDetailLoading" class="loading-detail">
+            <u-loading-icon mode="spinner"></u-loading-icon>
+            <text>加载详情中...</text>
+          </view>
+          <view v-else>
+            <view class="detail-row">
+              <text class="detail-label">点位信息：</text>
+              <text class="detail-value">{{
+                selectedPoint.position || ''
+              }}</text>
+            </view>
+            <view class="detail-row">
+              <text class="detail-label">会员编号：</text>
+              <text class="detail-value">{{ pointDetail.memberCode }}</text>
+            </view>
+            <view class="detail-row">
+              <text class="detail-label">会员姓名：</text>
+              <text class="detail-value">{{ pointDetail.memberName }}</text>
+            </view>
+
+            <view v-if="pointDetail" class="detail-row">
+              <text class="detail-label">隶属体系：</text>
+              <text class="detail-value">{{
+                pointDetail.system || pointDetail.parentSystem || 'BF30720213'
+              }}</text>
+            </view>
+            <view v-if="pointDetail" class="detail-row">
+              <text class="detail-label">荣誉奖衔：</text>
+              <text class="detail-value">{{
+                pointDetail.honorTitle || '无'
+              }}</text>
+            </view>
+            <view v-if="pointDetail" class="detail-row">
+              <text class="detail-label">创建时间：</text>
+              <text class="detail-value">{{
+                formatDate(pointDetail.creationTime || pointDetail.createTime)
+              }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </u-popup>
+
+    <!-- 筛选弹窗 -->
+    <u-popup
+      :show="showFilter"
       mode="right"
-      @close="popShow = false"
+      @close="showFilter = false"
       :closeOnClickOverlay="false"
     >
-      <view class="rightPopup">
-        <view class="popup_top">
-          <view
-            @click="
-              () => {
-                getDataList(), (popShow = false)
-              }
-            "
-            >筛选</view
-          >
-          <view class="top_red" @click="popShow = false">{{ '返回' }}</view>
+      <view class="filter-popup">
+        <view class="popup-header">
+          <text @click="applyFilter">筛选</text>
+          <text class="close-btn" @click="showFilter = false">返回</text>
         </view>
-        <view class="typesBox">
-          <view class="typeTitle" @click="listShow = true"> 结算期数 </view>
-          <view class="choiceBox">
-            <view class="inputbox" @click="listShow = true">
-              <view class="">
-                {{ settleName ? settleName : '请选择' }}
-              </view>
-              <u-icon name="arrow-right" size="24rpx" color="#090000"></u-icon>
-            </view>
-          </view>
-        </view>
-        <view class="typesBox">
-          <view class="typeTitle"> 代数 </view>
-          <view class="choiceBox">
-            <u--input
-              v-model="queryParams.level"
-              style="
-                background-color: rgba(176, 196, 222, 0.45);
-                border-color: rgba(176, 196, 222, 0.45) !important;
-              "
-              placeholder="请输入"
-              border="surround"
-              shape="circle"
-            ></u--input>
+
+        <view class="filter-section">
+          <text class="section-title">状态</text>
+          <view class="select-box" @click="statusListVisible = true">
+            <text class="select-text">{{ statusName || '请选择状态' }}</text>
+            <u-icon name="arrow-right" size="24rpx" color="#999"></u-icon>
           </view>
         </view>
 
-        <view class="popup_bottom">
-          <view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-          <view
-            class="bottom_btn thebtn2"
-            @click="
-              () => {
-                getDataList(), (popShow = false)
-              }
-            "
-            >{{ '确定' }}
-          </view>
-        </view>
-      </view>
-      <u-picker
-        @cancel="listShow = false"
-        :show="listShow"
-        ref="uPicker"
-        :columns="memberSettlePeriodList"
-        @confirm="confirm"
-        keyName="settleDate"
-      ></u-picker>
-    </u-popup>
-    <u-popup
-      :show="isPop"
-      closeable
-      mode="center"
-      round="10"
-      @close="isPop = false"
-    >
-      <view class="ispop_box">
-        <view class="Poster1">
-          <view class="pop_top">
-            <view class="pop_top">
-              <view>
-                <image
-                  crossorigin="anonymous"
-                  data-etype="image"
-                  :data-enode="popMould.avatarUrl"
-                  :src="'data:image/png;base64,' + popMould.avatarUrlBase64"
-                  mode="aspectFit"
-                  class="poster1"
-                ></image>
-              </view>
-              <view>
-                <image
-                  crossorigin="anonymous"
-                  data-etype="image"
-                  :data-enode="popMould.countryUrl2"
-                  :src="'data:image/png;base64,' + popMould.countryUrl2Base64"
-                  mode="aspectFit"
-                  class="poster2"
-                ></image>
-              </view>
-            </view>
-            <view class="top_right">
-              <image
-                crossorigin="anonymous"
-                data-etype="image"
-                :data-enode="popMould.settleCountryUrl2"
-                :src="
-                  'data:image/png;base64,' + popMould.settleCountryUrl2Base64
-                "
-                mode="aspectFit"
-                class="poster2"
-              ></image>
-              <view style="margin-top: 18rpx"> 结算国家 </view>
-            </view>
-          </view>
-          <view class="pop_center">
-            <view class="center_flex">
-              <view class="c1">会员编号</view>
-              <view class="c2">{{ popMould.memberCode }}</view>
-            </view>
-            <view class="center_flex">
-              <view class="c1">会员姓名</view>
-              <view class="c2">{{ popMould.name }}</view>
-            </view>
-            <view class="center_flex">
-              <view class="c1">支付时间</view>
-              <view class="c2">{{ popMould.payDate }}</view>
-            </view>
-          </view>
-          <view class="pop_bottom">
-            <view class="b_flex">
-              <view class="bt1">业绩</view>
-              <view class="bt1">左区</view>
-              <view class="bt1">右区</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">真实新增</view>
-              <view class="bt2">{{ popMould.leftRealNewPv }}</view>
-              <view class="bt2">{{ popMould.rightRealNewPv }}</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">首购新增</view>
-              <view class="bt2">{{ popMould.leftFirstPurchaseAdd }}</view>
-              <view class="bt2">{{ popMould.rightFirstPurchaseAdd }}</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">复购新增</view>
-              <view class="bt2">{{ popMould.leftRepeatPurchaseSurplus }}</view>
-              <view class="bt2">{{ popMould.rightRepeatPurchaseSurplus }}</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">真实累计</view>
-              <view class="bt2">{{ popMould.leftRealTotal }}</view>
-              <view class="bt2">{{ popMould.rightRealTotal }}</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">首购累计</view>
-              <view class="bt2">{{ popMould.leftFirstTotal }}</view>
-              <view class="bt2">{{ popMould.rightFirstTotal }}</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">复购累计</view>
-              <view class="bt2">{{ popMould.leftRepeatPurchaseTotal }}</view>
-              <view class="bt2">{{ popMould.rightRepeatPurchaseTotal }}</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">首购结余</view>
-              <view class="bt2">{{ popMould.leftFirstSurplus }}</view>
-              <view class="bt2">{{ popMould.rightFirstSurplus }}</view>
-            </view>
-            <view class="b_flex">
-              <view class="bt2">复购结余</view>
-              <view class="bt2">{{ popMould.leftRepeatPurchaseSurplus }}</view>
-              <view class="bt2">{{ popMould.rightRepeatPurchaseSurplus }}</view>
-            </view>
-          </view>
-        </view>
-        <view class="btn_box">
-          <view class="small-btn" @click="downImage('Poster1')">下载图片</view>
-          <view class="small-text-btn" @click="copyText()">复制文字</view>
+        <view class="filter-actions">
+          <u-button type="info" @click="clearFilter">清空筛选条件</u-button>
+          <u-button type="primary" @click="confirmFilter">确定</u-button>
         </view>
       </view>
     </u-popup>
-    <Eposter
-      width="750"
-      height="1334"
-      :list="list"
-      backgroundColor="rgb(255, 255, 255)"
-      @on-success="onSuccess"
-      ref="Eposter"
-    >
-    </Eposter>
+
+    <!-- 选择器 -->
+    <u-picker
+      :show="stageListVisible"
+      :columns="stageOptions"
+      @confirm="onStageConfirm"
+      @cancel="stageListVisible = false"
+      keyName="label"
+    ></u-picker>
+
+    <u-picker
+      :show="statusListVisible"
+      :columns="statusOptions"
+      @confirm="onStatusConfirm"
+      @cancel="statusListVisible = false"
+      keyName="label"
+    ></u-picker>
   </view>
 </template>
 
 <script>
-import html2canvas from 'html2canvas'
-import TreeChart2 from '@/components/architectures/resettleSO2.vue'
-import Eposter from '@/components/architectures/Poster.vue'
-
 import * as arc from '@/config/architecture.js'
+
 export default {
-  components: {
-    TreeChart2,
-    Eposter,
-  },
   data() {
     return {
-      avaerInfoList: [],
-      treeData: [],
+      // 列表数据
+      pointList: [],
+      total: 0,
+      currentPage: 1,
+      pageSize: 10,
+      hasMore: true,
+
+      // 筛选条件
       queryParams: {
-        memberSettlePeriodId: '', //期数
-        memberCode: '', //会员编号
-        level: 3, //代数
-        type: 2,
+        pageNum: 1,
+        pageSize: 10,
+        stage: 1,
+        stageStatus: null,
+        childNode: '',
       },
-      memberSettlePeriodList: [], //期数
-      popShow: false,
-      listShow: false,
-      settleName: '',
-      data: {},
-      size: 1,
-      landscape: [],
-      popMould: {},
-      isPop: false,
-      touchStartPosition1: {
-        x: 0,
-        y: 0,
-      },
-      touchStartPosition2: {
-        x: 0,
-        y: 0,
-      },
-      initialDistance: 0,
-      list: [],
+
+      // 选择器数据
+      stageOptions: [
+        [
+          { value: 1, label: '阶段一' },
+          { value: 2, label: '阶段二' },
+          { value: 3, label: '阶段三' },
+        ],
+      ],
+      statusOptions: [
+        [
+          { value: 0, label: '已完成' },
+          { value: 1, label: '未完成' },
+        ],
+      ],
+
+      // UI状态
+      showFilter: false,
+      showPointDetail: false,
+      stageListVisible: false,
+      statusListVisible: false,
+      loading: false,
+
+      // 选中的值
+      stageName: '阶段一',
+      statusName: '',
+
+      // 点位详情
+      selectedPoint: {},
+      pointDetail: {},
+      pointDetailLoading: false,
+      currentUser: {},
     }
   },
+
   onLoad() {
-    this.getAvarerInfo()
-    this.getDataList()
+    this.init()
+    this.$store.dispatch('GetInfo').then(res => {
+      this.currentUser = res.data
+    })
   },
+  onShow() {},
+
+  onPullDownRefresh() {
+    this.refreshData()
+  },
+
+  onReachBottom() {
+    this.loadMore()
+  },
+
   methods: {
-    //复制文字
-    copyText() {
-      let self = this
-      let md = self.popMould
-      let text = `会员编号：${md.memberCode} \n会员姓名：${md.name}支付时间：${md.payDate} \n业绩  左区  右区 \n真实新增  ${md.leftRealNewPv}  ${md.rightRealNewPv} \n首购新增  ${md.leftFirstPurchaseAdd}  ${md.rightFirstPurchaseAdd} \n复购新增  ${md.leftRepeatPurchaseSurplus}  ${md.rightRepeatPurchaseSurplus} \n真实累计  ${md.leftRealTotal}  ${md.rightRealTotal} \n首购累计  ${md.leftFirstTotal}  ${md.rightFirstTotal} \n复购累计  ${md.leftRepeatPurchaseTotal}  ${md.rightRepeatPurchaseTotal} \n首购结余  ${md.leftFirstSurplus}  ${md.rightFirstSurplus} \n复购结余  ${md.leftRepeatPurchaseSurplus}  ${md.rightRepeatPurchaseSurplus} \n`
-      uni.setClipboardData({
-        data: text,
-        success: function (res) {
-          uni.getClipboardData({
-            success: function (res) {
-              uni.showToast({
-                title: '复制成功',
-              })
-            },
-          })
-        },
-      })
-    },
-    //下载图片
-    downImage(elClass) {
-      this.$refs.Eposter.createForElRect(elClass, false)
-    },
-    downloadImg() {
-      let self = this
-      let element = document.querySelector('.Poster1')
-      uni.showLoading({
-        title: '图片保存中',
-      })
-      html2canvas(element)
-        .then(function (canvas) {
-          let dataURL = canvas.toDataURL('image/jpeg')
-          let link = document.createElement('a')
-          link.style.display = 'none'
-          link.href = dataURL
-          link.download = 'image.jpg'
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link)
-          uni.showToast({
-            icon: 'none',
-            title: '保存成功',
-            duration: 2000,
-          })
-          uni.hideLoading()
-        })
-        .catch(function (error) {
-          uni.hideLoading()
-          uni.showModal({
-            title: '保存失败',
-          })
-        })
-    },
-    onSuccess(val) {
-      this.posterImg = val
-      this.downloadImg(this.posterImg)
+    init() {
+      this.stageName = this.stageOptions[0][0].label
+      this.queryParams.stage = this.stageOptions[0][0].value
+      this.loadPointList()
     },
 
-    handleTouchStart(event) {
-      const touch1 = event.touches[0]
-      const touch2 = event.touches[1]
-      if (touch2) {
-        this.touchStartPosition1 = {
-          x: touch1.pageX,
-          y: touch1.pageY,
+    // 加载点位列表数据
+    async loadPointList() {
+      try {
+        this.loading = true
+        // 只在首次加载或刷新时显示全局loading
+        if (this.currentPage === 1) {
+          uni.showLoading({ title: '加载中...' })
         }
-        this.touchStartPosition2 = {
-          x: touch2.pageX,
-          y: touch2.pageY,
+
+        const res = await arc.getAzFrameworkList(this.queryParams)
+
+        if (res.code === 200 && res.data) {
+          const newData = res.data.rows || []
+
+          if (this.currentPage === 1) {
+            this.pointList = newData
+          } else {
+            this.pointList = [...this.pointList, ...newData]
+          }
+          this.total = res.data.total || 0
+
+          // 优化hasMore判断逻辑
+          this.hasMore =
+            newData.length >= this.pageSize &&
+            this.pointList.length < this.total
+        } else {
+          uni.showToast({
+            title: res.msg || '加载失败',
+            icon: 'none',
+          })
         }
-        this.initialDistance = Math.hypot(
-          touch2.pageX - touch1.pageX,
-          touch2.pageY - touch1.pageY
-        )
+      } catch (error) {
+        console.error('加载点位列表失败:', error)
+        uni.showToast({
+          title: '网络异常，请稍后重试',
+          icon: 'none',
+        })
+      } finally {
+        this.loading = false
+        // 只在首次加载或刷新时隐藏全局loading
+        if (this.currentPage <= 1) {
+          uni.hideLoading()
+        }
+        uni.stopPullDownRefresh()
       }
     },
-    handleTouchMove(event) {
-      const touch1 = event.touches[0]
-      const touch2 = event.touches[1]
-      if (touch2) {
-        const currentDistance = Math.hypot(
-          touch2.pageX - touch1.pageX,
-          touch2.pageY - touch1.pageY
-        )
-        const scale = currentDistance / this.initialDistance
-        this.size = this.size * scale
+
+    // 刷新数据
+    refreshData() {
+      this.currentPage = 1
+      this.queryParams.pageNum = 1
+      this.hasMore = true
+      this.loadPointList()
+    },
+
+    // 加载更多数据
+    async loadMore() {
+      if (this.loading || !this.hasMore) return
+
+      this.currentPage++
+      this.queryParams.pageNum = this.currentPage
+      await this.loadPointList()
+    },
+
+    // 检查某一层是否有点位
+    hasLayerPoints(item, layer) {
+      const layerPoints = {
+        1: ['pointMember11', 'pointMember12'],
+        2: ['pointMember21', 'pointMember22', 'pointMember23', 'pointMember24'],
+        3: [
+          'pointMember31',
+          'pointMember32',
+          'pointMember33',
+          'pointMember34',
+          'pointMember35',
+          'pointMember36',
+          'pointMember37',
+          'pointMember38',
+        ],
+      }
+
+      return layerPoints[layer].some(key => item.hasOwnProperty(key))
+    },
+
+    // 获取点位样式类
+    getPointClass(pointMember) {
+      return {
+        occupied: pointMember && pointMember !== '',
+        empty: !pointMember || pointMember === '',
       }
     },
-    handleTouchEnd() {
-      this.touchStartPosition1 = {
-        x: 0,
-        y: 0,
+
+    // 点位点击处理
+    async handlePointClick(item, layer, position, pointMember) {
+      if (!pointMember || pointMember === '') {
+        // 空点位提示
+        uni.showToast({
+          title: '当前点位为空位',
+          icon: 'none',
+        })
+        return
       }
-      this.touchStartPosition2 = {
-        x: 0,
-        y: 0,
+
+      // 设置选中的点位信息
+      this.selectedPoint = {
+        ...item,
+        position: `${layer}-${position}`,
+        pointMember: pointMember,
       }
-      this.initialDistance = 0
+
+      // 获取点位详情
+      await this.getPointDetail({
+        point: item[`point${layer}${position}`] || position,
+        pointMember: pointMember,
+        stage: item.stage,
+      })
+      // 显示弹窗
+      this.showPointDetail = true
     },
-    clickNode(e) {
-      let self = this
-      if (e) {
-        arc
-          .getUrlBase({
-            countryUrl2: e.countryUrl2,
-            settleCountryUrl2: e.settleCountryUrl2,
-            avatarUrl: e.avatarUrl,
-          })
-          .then(res => {
-            self.popMould = e
-            self.popMould.countryUrl2Base64 = res.countryUrl2Base64
-            self.popMould.settleCountryUrl2Base64 = res.settleCountryUrl2Base64
-            self.popMould.avatarUrlBase64 = res.avatarUrlBase64
-            self.isPop = true
+
+    // 获取点位详情
+    async getPointDetail(params) {
+      try {
+        this.pointDetailLoading = true
+        this.pointDetail = {}
+
+        const res = await arc.getMemberPointDetail(params)
+
+        if (res.code === 200 && res.data) {
+          this.pointDetail = res.data
+        } else {
+          uni.showToast({
+            title: res.msg || '获取详情失败',
+            icon: 'none',
           })
+        }
+      } catch (error) {
+        console.error('获取点位详情失败:', error)
+        uni.showToast({
+          title: '网络异常，请稍后重试',
+          icon: 'none',
+        })
+      } finally {
+        this.pointDetailLoading = false
       }
     },
-    clickTop(e) {
-      let that = this
-      if (e) {
-        that.queryParams.memberCode = e.memberCode
-        that.getDataList()
-      }
+
+    // 阶段选择确认
+    onStageConfirm(e) {
+      this.queryParams.stage = e.value[0].value
+      this.stageName = e.value[0].label
+      this.stageListVisible = false
+      this.refreshData()
     },
-    confirm(e) {
-      this.queryParams.memberSettlePeriodId = e.value[0].pkId
-      this.settleName = e.value[0].settleDate
-      this.listShow = false
+
+    // 状态选择确认
+    onStatusConfirm(e) {
+      this.queryParams.stageStatus = e.value[0].value
+      this.statusName = e.value[0].label
+      this.statusListVisible = false
     },
-    getAvarerInfo() {
-      arc.getAvarerInfo().then(res => {
-        this.avaerInfoList = res.data
-      })
-      arc.getMemberSettlePeriod().then(res => {
-        this.memberSettlePeriodList = [res.data]
-      })
+
+    // 应用筛选
+    applyFilter() {
+      this.refreshData()
+      this.showFilter = false
     },
-    getDataList() {
-      arc.getAzFramework(this.queryParams).then(res => {
-        this.data = res.data[0]
-      })
+
+    // 确认筛选
+    confirmFilter() {
+      this.refreshData()
+      this.showFilter = false
     },
-    clearAll() {
-      this.popShow = false
-      this.settleName = ''
-      this.queryParams = {
-        memberSettlePeriodId: '', //期数
-        memberCode: '', //会员编号
-        level: 3, //代数
-        type: 2,
-      }
-      this.getDataList()
+
+    // 清空筛选
+    clearFilter() {
+      this.queryParams.stageStatus = null
+      this.statusName = ''
+      this.refreshData()
+      this.showFilter = false
+    },
+
+    // 日期格式化
+    formatDate(dateStr) {
+      if (!dateStr) return ''
+      const date = new Date(dateStr)
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
     },
   },
 }
 </script>
+
 <style lang="scss" scoped>
-.ispop_box {
-  padding: 27rpx;
-  padding-top: 60rpx;
-  width: 670rpx;
-  font-size: 24rpx;
-  color: #333333;
+.point-list-container {
+  min-height: 100vh;
+  background-color: #f5f6f8;
+}
 
-  .pop_top {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+/* 搜索筛选栏 */
+.search-bar {
+  background: #fff;
+  padding: 20rpx 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 2rpx solid #eee;
 
-    .poster1 {
-      height: 88rpx;
-      width: 88rpx;
-    }
-
-    .poster2 {
-      width: 88rpx;
-      height: 54rpx;
-      border-radius: 10rpx;
-      margin-left: 20rpx;
-    }
-
-    .top_right {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-    }
-  }
-
-  .pop_center {
-    .center_flex {
-      display: flex;
-      align-items: center;
-      margin-top: 20rpx;
-
-      .c1 {
-        width: 20%;
-      }
-
-      .c2 {
-        width: 80%;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        background: #f3f3f3;
-        border: 2rpx solid #eeeeee;
-        border-radius: 8rpx;
-        padding: 10rpx 0;
-      }
-    }
-  }
-
-  .pop_bottom {
-    margin: 20rpx 0;
-    border-top: 2rpx solid #eeeeee;
-    border-top: 2rpx solid #eeeeee;
-
-    .b_flex {
-      display: flex;
-
-      .bt1 {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-top: 22rpx;
-        flex: 1;
-      }
-
-      .bt2 {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-top: 22rpx;
-        flex: 1;
-        background: #f3f3f3;
-        border: 2rpx solid #eeeeee;
-        border-radius: 8rpx;
-        padding: 12rpx 0;
-        margin: 11rpx 18rpx;
-      }
-    }
-  }
-
-  .btn_box {
+  .search-item {
+    flex: 1;
     display: flex;
     align-items: center;
-    justify-content: space-between;
 
-    .small-btn {
-      width: 312rpx;
-      height: 72rpx;
-      background: #005bac;
-      border-radius: 34rpx;
+    .label {
       font-size: 28rpx;
-      font-weight: 400;
-      color: #ffffff;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+      color: #333;
+      margin-right: 20rpx;
     }
 
-    .small-text-btn {
-      width: 312rpx;
-      height: 72rpx;
-      border: 1px solid #005bac;
+    .select-box {
+      flex: 1;
+      background: #f5f6f8;
       border-radius: 34rpx;
+      padding: 20rpx 24rpx;
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       align-items: center;
-      font-size: 28rpx;
+
+      .select-text {
+        font-size: 26rpx;
+        color: #333;
+      }
+
+      &:active {
+        background-color: #e8e9eb;
+      }
+    }
+  }
+
+  .filter-btn {
+    display: flex;
+    align-items: center;
+    margin-left: 20rpx;
+    padding: 12rpx 20rpx;
+
+    text {
+      font-size: 26rpx;
       color: #005bac;
+      margin-left: 8rpx;
     }
   }
 }
 
-.operate-btnboxs {
-  padding: 29rpx 26rpx;
-  background-color: #ffffff;
+/* 点位列表内容 */
+.point-list-content {
+  padding: 20rpx 24rpx;
+}
 
-  .d-c-c {
+.list-wrapper {
+  .point-item {
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      margin-bottom: 30rpx;
+      padding-bottom: 20rpx;
+      border-bottom: 2rpx solid #f5f6f8;
+
+      .member-info {
+        display: flex;
+        align-items: center;
+
+        .member-code {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #333;
+          margin-right: 20rpx;
+        }
+
+        .status-badge {
+          padding: 8rpx 16rpx;
+          border-radius: 20rpx;
+          font-size: 22rpx;
+
+          &.completed {
+            background: #e8f5e8;
+            color: #52c41a;
+          }
+
+          &.pending {
+            background: #fff2e8;
+            color: #fa8c16;
+          }
+        }
+      }
+
+      .stage-info {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+
+        .stage {
+          font-size: 26rpx;
+          color: #005bac;
+          font-weight: bold;
+        }
+
+        .date {
+          font-size: 22rpx;
+          color: #999;
+          margin-top: 8rpx;
+        }
+      }
+    }
+
+    .item-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 30rpx;
+      padding-top: 20rpx;
+      border-top: 2rpx solid #f5f6f8;
+
+      .point-type {
+        font-size: 24rpx;
+        color: #666;
+      }
+
+      .creation-time {
+        font-size: 22rpx;
+        color: #999;
+      }
+    }
+  }
+}
+
+/* 点位展示区域 */
+.points-container {
+  .layer-wrapper {
+    margin-bottom: 30rpx;
+
+    .layer-title {
+      font-size: 28rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 20rpx;
+      padding-left: 20rpx;
+      position: relative;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 8rpx;
+        height: 28rpx;
+        background: #005bac;
+        border-radius: 4rpx;
+      }
+    }
+
+    .points-row {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 16rpx;
+
+      &.multi-row {
+        .point-slot {
+          width: calc((100% - 48rpx) / 4);
+        }
+      }
+
+      .point-slot {
+        flex: 1;
+        min-height: 120rpx;
+        border-radius: 16rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        transition: all 0.3s ease;
+
+        &.small {
+          min-height: 100rpx;
+        }
+
+        &.occupied {
+          background: linear-gradient(135deg, #005bac 0%, #0066cc 100%);
+          color: #fff;
+          box-shadow: 0 4rpx 12rpx rgba(0, 91, 172, 0.3);
+
+          &:active {
+            transform: scale(0.95);
+          }
+        }
+
+        &.empty {
+          background: #f5f6f8;
+          border: 2rpx dashed #ccc;
+          color: #999;
+
+          &:active {
+            background: #e8e9eb;
+          }
+        }
+
+        .point-content {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+
+          .point-label {
+            font-size: 24rpx;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+  }
+}
+
+/* 加载更多 */
+.load-more {
+  padding: 40rpx 0;
+  text-align: center;
+
+  .loading-text,
+  .no-more-text,
+  .pull-up-text {
     display: flex;
     align-items: center;
     justify-content: center;
+    font-size: 26rpx;
+    color: #999;
 
-    .operate-btn {
-      width: 64rpx;
-      height: 64rpx;
-      margin: 5rpx;
-      // background: #F2F2F2;
-      border-radius: 5rpx;
-      padding: 0;
-      box-sizing: border-box;
+    text {
+      margin-left: 12rpx;
+    }
+  }
+
+  .no-more-text {
+    color: #ccc;
+  }
+}
+
+/* 空状态 */
+.empty-state {
+  padding: 100rpx 0;
+  text-align: center;
+}
+
+/* 弹窗样式 */
+.point-detail-popup {
+  width: 600rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    background: #f5f6f8;
+
+    .popup-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+    }
+  }
+
+  .popup-content {
+    padding: 30rpx;
+
+    .loading-detail {
       display: flex;
-      justify-content: center;
       align-items: center;
+      justify-content: center;
+      padding: 60rpx 0;
+      font-size: 26rpx;
+      color: #999;
+
+      text {
+        margin-left: 12rpx;
+      }
+    }
+
+    .detail-row {
+      display: flex;
+      margin-bottom: 25rpx;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .detail-label {
+        width: 180rpx;
+        font-size: 26rpx;
+        color: #666;
+        flex-shrink: 0;
+      }
+
+      .detail-value {
+        flex: 1;
+        font-size: 26rpx;
+        color: #333;
+        word-break: break-all;
+      }
     }
   }
 }
 
-.rightPopup {
-  width: 645rpx;
-  height: 100%;
-  overflow: auto;
+.filter-popup {
+  width: 600rpx;
+  height: 100vh;
+  background: #fff;
 
-  .popup_top {
-    padding: 25rpx;
-    background-color: rgba(176, 196, 222, 0.45);
+  .popup-header {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    font-size: 28rpx;
-    font-family: Source Han Sans CN;
-    font-weight: 400;
-    color: #333333;
+    padding: 30rpx;
+    background: rgba(176, 196, 222, 0.45);
 
-    .top_red {
+    .close-btn {
       color: #005bac;
     }
   }
 
-  .popup_bottom {
-    display: flex;
-    align-items: center;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
+  .filter-section {
+    padding: 30rpx;
 
-    .bottom_btn {
-      flex: 1;
-      padding: 20rpx 0;
-      text-align: center;
-      font-size: 28rpx;
-    }
-
-    .thebtn1 {
-      background-color: rgba(176, 196, 222, 0.45);
-      color: #333333;
-    }
-
-    .thebtn2 {
-      background-color: #005bac;
-      color: #ffffff;
-    }
-  }
-
-  .typesBox {
-    margin-top: 40rpx;
-
-    .typeTitle {
-      padding: 0 24rpx;
+    .section-title {
+      display: block;
       font-size: 30rpx;
-      font-family: Source Han Sans CN;
       font-weight: bold;
-      color: #333333;
+      color: #333;
+      margin-bottom: 20rpx;
     }
 
-    .choiceBox {
-      padding: 0 12rpx;
+    .select-box {
+      background: rgba(176, 196, 222, 0.45);
+      border-radius: 20rpx;
+      padding: 20rpx 30rpx;
       display: flex;
-      margin-top: 17rpx;
+      justify-content: space-between;
       align-items: center;
-      flex-wrap: wrap;
 
-      .inputbox {
+      .select-text {
         font-size: 26rpx;
-        width: 100%;
-        padding: 20rpx 32rpx;
-        border-radius: 20rpx;
-        background-color: rgba(176, 196, 222, 0.45);
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-
-      .flex_btn {
-        background-color: rgba(176, 196, 222, 0.45);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 14rpx 48rpx;
-        border-radius: 26rpx;
-        font-size: 24rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #333333;
-        margin: 17rpx 5rpx;
-      }
-
-      .timesbtn {
-        flex: 1;
-      }
-
-      .selectbtn {
-        background-color: #005bac;
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.seach {
-  background: #fff;
-  overflow: hidden;
-  padding: 20rpx 23rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  border-bottom: 2rpx solid #eee;
-
-  .these {
-    border: none;
-    padding: 10rpx 0 !important;
-  }
-
-  .seach_i {
-    padding: 0 20rpx;
-    border-radius: 34rpx;
-    background: #fff;
-    flex: 1;
-    background: #f5f6f8;
-    margin: 0 20rpx;
-  }
-
-  .neibox {
-    display: flex;
-    align-items: center;
-    font-size: 26rpx;
-    font-family: PingFang SC;
-    font-weight: 400;
-    color: #999999;
-  }
-
-  .seatch_r {
-    background: #005bac;
-    border-radius: 50%;
-    padding: 8rpx;
-  }
-}
-
-.mainbox {
-  padding: 26rpx 22rpx;
-
-  .main_top {
-    background: #ffffff;
-    border-radius: 20rpx;
-    padding: 20rpx 4rpx;
-    display: flex;
-    flex-wrap: wrap;
-
-    .top_flex {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      margin: 15rpx 20rpx;
-      // justify-content: center;
-      width: 98rpx;
-
-      .theimg {
-        width: 92rpx;
-        height: 92rpx;
-        border-radius: 50%;
-      }
-
-      .flex2 {
-        font-size: 26rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #666666;
+        color: #333;
       }
     }
   }
 
-  .main_bottom {
-    width: 100%;
-    height: calc(100vh - 600rpx);
-    margin-top: 25rpx;
-    background-color: #ffffff;
-    padding: 38rpx 0;
+  .filter-actions {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
 
-    border-radius: 20rpx;
-  }
-
-  .scoll_main {
-    width: 700rpx;
-    height: calc(100vh - 600rpx);
-    overflow: auto;
-
-    // overflow: scroll;
-    // overflow-x: auto;
+    .u-button {
+      flex: 1;
+      border-radius: 0;
+    }
   }
 }
 </style>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index ce7a00a..1fce880 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -88,6 +88,32 @@
       </view>
     </view>
 
+    <!-- 会员点位信息展示区域 -->
+    <view class="member-point-info">
+      <view class="point-info-grid">
+        <view class="point-info-item">
+          <view class="point-info-label">子点位总数</view>
+          <view class="point-info-value">{{
+            personalPointInfo.pointCount || 0
+          }}</view>
+        </view>
+        <view class="point-info-divider"></view>
+        <view class="point-info-item">
+          <view class="point-info-label">待激活点位</view>
+          <view class="point-info-value">{{
+            personalPointInfo.waitPointCount || 0
+          }}</view>
+        </view>
+        <view class="point-info-divider"></view>
+        <view class="point-info-item">
+          <view class="point-info-label">复购业绩余额</view>
+          <view class="point-info-value">{{
+            personalPointInfo.repPvBalance || 0
+          }}</view>
+        </view>
+      </view>
+    </view>
+
     <view class="my_order">
       <view class="order_flex">
         <template v-for="(item, index) in otherMenuList">
@@ -147,9 +173,8 @@ import clTabbar from '@/components/cl-tabbar.vue'
 import * as min from '@/config/balance.js'
 import * as api from '@/config/login.js'
 import { MEMBER_SIGN } from '@/util/common.js'
-import { getMarketDynamicBoxCount } from '@/config/mine.js'
 import RegionSelect from '@/components/region-select/index.vue'
-import { getRegionSelect } from '@/config/mine.js'
+import { getRegionSelect, getPersonalPointInfo } from '@/config/mine.js'
 // import talentList from "@/components/talentList.vue";
 export default {
   components: {
@@ -248,20 +273,20 @@ export default {
       totalSumPv: 0,
       smallAreaPv: 0,
       isNormal: false,
+      personalPointInfo: {},
     }
   },
   onShow() {
     this.getInfo().then(isNormal => {
       this.orderNum()
+      this.getPersonalPointInfo()
       if (!isNormal) {
         return
       }
       this.isNormal = isNormal
-      // this.getMarketDynamicBoxCount()
       // this.getUserAwardss()
     })
   },
-
   computed: {
     sprintProgress() {
       const targetPvStr = this.awards.targetPv
@@ -343,6 +368,13 @@ export default {
   },
 
   methods: {
+    getPersonalPointInfo() {
+      getPersonalPointInfo().then(res => {
+        if (res.code == 200) {
+          this.personalPointInfo = res.data
+        }
+      })
+    },
     openRegionSelect() {
       uni.showLoading({
         title: '加载中...',
@@ -1192,4 +1224,55 @@ export default {
 .region-select-action {
   padding: 30rpx 20rpx;
 }
+
+/* 会员点位信息样式 */
+.member-point-info {
+  background-color: #ffffff;
+  box-shadow: 0px 4px 20px 0px rgba(204, 204, 204, 0.4);
+  border-radius: 20rpx;
+  padding: 0 20rpx;
+  margin-top: 20rpx;
+}
+
+.point-info-grid {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  padding: 30rpx 0;
+}
+
+.point-info-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  flex: 1;
+  text-align: center;
+}
+
+.point-info-value {
+  font-size: 40rpx;
+  font-weight: 600;
+  color: #005bac;
+  line-height: 1.2;
+}
+
+.point-info-label {
+  font-size: 24rpx;
+  color: #666666;
+  font-weight: 500;
+  margin-bottom: 8rpx;
+}
+
+.point-info-divider {
+  width: 2rpx;
+  height: 60rpx;
+  background: linear-gradient(
+    to bottom,
+    rgba(0, 91, 172, 0.1),
+    rgba(0, 91, 172, 0.3),
+    rgba(0, 91, 172, 0.1)
+  );
+  margin: 0 20rpx;
+}
 </style>