diff --git a/src/api/archityecture.js b/src/api/archityecture.js
index e5f23c8..c04e11c 100644
--- a/src/api/archityecture.js
+++ b/src/api/archityecture.js
@@ -61,3 +61,20 @@ export function getChildList(params) {
     params
   })
 }
+
+// 查询推荐架构列表
+export function getAzFrameworkList(params) {
+  return request({
+    url: '/member/manage/member-structure/three-framework-list',
+    method: 'get',
+    params
+  })
+}
+
+export function getAzFramewrokNodeInfo(params) {
+  return request({
+    url: '/member/manage/member-structure/pointDetail',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/framework/architecture/azjg2.vue b/src/views/framework/architecture/azjg2.vue
index 4dab8c4..d7a4ae9 100644
--- a/src/views/framework/architecture/azjg2.vue
+++ b/src/views/framework/architecture/azjg2.vue
@@ -8,20 +8,10 @@
     <div class="thetopbox">
       <el-form ref="form" :model="queryParams" label-width="100px">
         <el-row>
-          <el-col :span="4">
-            <TopMemberSelect ref="topMemberSelect" @change="TopMemberHandleChange" />
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'会员编号'" prop="memberCode">
-              <el-input
-                v-model="queryParams.memberCode"
-                clearable
-              /></el-form-item></el-col>
           <el-col :span="4">
             <el-form-item :label="'结算期数'" prop="memberSettlePeriodId">
               <el-select
                 v-model="queryParams.memberSettlePeriodId"
-                clearable
                 :placeholder="'请选择'"
               >
                 <el-option
@@ -29,847 +19,548 @@
                   :key="item.pkId"
                   :label="item.settleDate"
                   :value="item.pkId"
-                /> </el-select></el-form-item></el-col>
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
-            <el-form-item :label="'展示层数'" prop="level">
+            <el-form-item :label="'会员编号'" prop="memberCode">
               <el-input
-                v-model="queryParams.level"
+                v-model="queryParams.memberCode"
                 clearable
-              /></el-form-item></el-col>
+              />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="4">
-            <el-form-item :label="'是否固定'" prop="cantz">
-              <el-select v-model="cantz" clearable :placeholder="'请选择'">
+            <el-form-item label="阶段" prop="stage">
+              <el-select
+                v-model="queryParams.stage"
+                placeholder="请选择"
+              >
                 <el-option
-                  v-for="(item, index) in tzList"
+                  v-for="(item, index) in levelList"
                   :key="index"
                   :label="item.label"
                   :value="item.value"
                 />
-              </el-select> </el-form-item></el-col>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="状态" prop="stageStatus">
+              <el-select
+                v-model="queryParams.stageStatus"
+                :placeholder="'请选择'"
+              >
+                <el-option
+                  v-for="(item, index) in statusEnum"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" style="margin-left: 30px">
             <div class="searchbox">
               <el-button
                 :loading="loading"
                 class="searchbtn"
                 @click="getSearch"
-              > 搜索</el-button>
-              <el-button @click="resetHandle"> 重置</el-button>
-              <el-button @click="goback"> 返回</el-button>
+              > {{ '搜索' }}</el-button>
+              <el-button @click="resetHandle"> {{ '重置' }}</el-button>
             </div>
           </el-col>
-        </el-row></el-form>
+        </el-row>
+      </el-form>
     </div>
-    <div class="theorgtree">
-      <div class="lefttop">
-        <div v-for="(item, index) in avaerInfoList" :key="index" class="single">
-          <img :src="item.value" alt="">
-          <div class="singletitle">{{ item.name }}</div>
-        </div>
-      </div>
-      <div class="tree">
-        <div class="tree-content" @mousedown.stop="move" @wheel="handleWheel">
-          <div :style="{ transform: `scale(${scale})` }">
-            <vue2-org-tree
-              ref="orgTree"
-              :data="data"
-              collapsable
-              :render-content="renderContent"
-              v-bind="$listeners"
-              @on-expand="onExpand"
-              @on-node-click="NodeClick"
-              @on-node-mouseover="onMouseover"
-              @on-node-mouseout="onMouseout"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-    <el-dialog
-      :visible.sync="ifShow"
-      :close-on-click-modal="false"
-      width="516px"
-    >
-      <div class="rendercontent">
-        <div ref="htmlContent">
-          <div class="toprender">
-            <div class="leftimg">
-              <img
-                class="img1"
-                :src="'data:image/png;base64,' + treeData.avatarUrlBase64"
-              >
-              <img
-                class="img2"
-                :src="'data:image/png;base64,' + treeData.countryUrl2Base64"
-              >
-            </div>
-            <div class="centerbox">
-              <div class="lineboex">
-                <div class="linetitle">{{ '会员编号' }}</div>
-                <div class="linecontent">{{ treeData.memberCode }}</div>
-              </div>
+    <div class="main">
+      <div class="maintable">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          :data="tableData"
+          :height="'630px'"
+          :header-cell-style="{ background: '#EEEEEE' }"
+          lass="content"
+          style="width: 100%;"
+          :row-class-name="tableRowClassName"
+        >
+          <el-table-column type="selection" />
 
-              <div class="lineboex">
-                <div class="linetitle">{{ '会员姓名' }}</div>
-                <div class="linecontent">{{ treeData.name }}</div>
+          <el-table-column
+            align="center"
+            prop="orderSourceVal"
+            label="子点位"
+            width="180"
+          >
+            <template slot-scope="scope">
+              {{ tempMemberCode + '-' + scope.row.childNode }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="pointTypeLabel"
+            label="点位类型"
+            width="100"
+          />
+          <el-table-column
+            align="center"
+            prop="stage"
+            label="阶段"
+            width="100"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.stage === 1 ? '一阶段' : scope.row.stage === 2 ? '二阶段' : '三阶段' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="stageStatus"
+            label="状态"
+            width="100"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.stageStatus === 1 ? '未完成' : '已完成' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="customer"
+            label="点位"
+          >
+            <template slot-scope="scope">
+              <div style="display: flex; justify-content: center;  column; gap: 20px;">
+                <div style="display: flex;  column; gap: 6px;">
+                  <div
+                    v-for="(item, idx) in level1"
+                    :key="idx"
+                    class="node-wrapper"
+                    :class="{ 'empty-node': !scope.row[item.memberName] }"
+                    @click="handleNodeClick(item, scope.row)"
+                  />
+                </div>
+                <div style="display: flex;  column; gap: 6px;">
+                  <div
+                    v-for="(item, idx) in level2"
+                    :key="idx"
+                    class="node-wrapper"
+                    :class="{ 'empty-node': !scope.row[item.memberName] }"
+                    @click="handleNodeClick(item, scope.row)"
+                  />
+                </div>
+                <div style="display: flex;  column; gap: 6px;">
+                  <div
+                    v-for="(item, idx) in level3"
+                    :key="idx"
+                    class="node-wrapper"
+                    :class="{ 'empty-node': !scope.row[item.memberName] }"
+                    @click="handleNodeClick(item, scope.row)"
+                  />
+                </div>
               </div>
-              <div class="lineboex">
-                <div class="linetitle">安置部门</div>
-                <div class="linecontent">{{ `第${treeData.placeDept}部门` }}</div>
-              </div>
-              <div class="lineboex">
-                <div class="linetitle">{{ '支付日期' }}</div>
-                <div class="linecontent">{{ treeData.payDate }}</div>
-              </div>
-            </div>
-            <div class="rightimg">
-              <img
-                :src="
-                  'data:image/png;base64,' + treeData.settleCountryUrl2Base64
-                "
-              >
-              <div>{{ '结算国家' }}</div>
-            </div>
-          </div>
-          <div class="bottomrender">
-            <div class="flexbox">
-              <div class="thetitle">{{ '业绩' }}({{ isLocals() }})</div>
-              <div class="linecontent">{{ '真实新增' }}</div>
-              <div class="linecontent">首购新增</div>
-              <div class="linecontent">复购新增</div>
-              <div class="linecontent">真实累计</div>
-              <div class="linecontent">首购累计</div>
-              <div class="linecontent">复购累计</div>
-              <div class="linecontent">首购结余</div>
-              <div class="linecontent">复购结余</div>
-              <!-- <div class="linecontent">新増套数</div>
-              <div class="linecontent">累计套数</div> -->
-            </div>
-            <div class="flexbox">
-              <div class="thetitle">左区</div>
-              <div class="linecontent">{{ treeData.leftRealNewPv }}</div>
-              <div class="linecontent">{{ treeData.leftFirstPurchaseAdd }}</div>
-              <div class="linecontent">
-                {{ treeData.leftRepeatPurchaseAdd }}
-              </div>
-              <div class="linecontent">{{ treeData.leftRealTotal }}</div>
-              <div class="linecontent">{{ treeData.leftFirstTotal }}</div>
-              <div class="linecontent">
-                {{ treeData.leftRepeatPurchaseTotal }}
-              </div>
-              <div class="linecontent">{{ treeData.leftFirstSurplus }}</div>
-              <div class="linecontent">
-                {{ treeData.leftRepeatPurchaseSurplus }}
-              </div>
-              <!-- <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div> -->
-            </div>
-            <div class="flexbox">
-              <div class="thetitle">右区</div>
-              <div class="linecontent">{{ treeData.rightRealNewPv }}</div>
-              <div class="linecontent">
-                {{ treeData.rightFirstPurchaseAdd }}
-              </div>
-              <div class="linecontent">
-                {{ treeData.rightRepeatPurchaseAdd }}
-              </div>
-              <div class="linecontent">{{ treeData.rightRealTotal }}</div>
-              <div class="linecontent">{{ treeData.rightFirstTotal }}</div>
-              <div class="linecontent">
-                {{ treeData.rightRepeatPurchaseTotal }}
-              </div>
-              <div class="linecontent">{{ treeData.rightFirstSurplus }}</div>
-              <div class="linecontent">
-                {{ treeData.rightRepeatPurchaseSurplus }}
-              </div>
-              <!-- <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div> -->
-            </div>
-          </div>
-        </div>
-        <div class="footerbox">
-          <div class="footerbtn btn1" @click="downloadImage">下载图片</div>
-          <div class="footerbtn btn2" @click="copyText">复制文字</div>
-          <!-- <div class="footerbtn btn3"  @click="goTop(treeData)">置顶</div> -->
-        </div>
-      </div>
-    </el-dialog>
-    <div v-show="false" ref="copyContent" class="copyContent">
-      <div>{{ '会员编号' }}：{{ treeData.memberCode }}</div>
-      <div>{{ '会员姓名' }}：{{ treeData.name }}</div>
-      <div>{{ '支付日期' }}：{{ treeData.payDate }}</div>
-      <div>{{ '业绩' }}({{ isLocals() }})&nbsp;&nbsp;左区&nbsp;&nbsp;右区</div>
-      <div>
-        真实新增&nbsp;&nbsp;{{ treeData.leftRealNewPv }}&nbsp;&nbsp;{{
-          treeData.rightRealNewPv
-        }}
-      </div>
-      <div>
-        首购新增&nbsp;&nbsp;{{ treeData.leftFirstPurchaseAdd }}&nbsp;&nbsp;{{
-          treeData.rightFirstPurchaseAdd
-        }}
-      </div>
-      <div>
-        复购新增{{ treeData.leftRepeatPurchaseAdd }}&nbsp;&nbsp;
-        {{ treeData.rightRepeatPurchaseAdd }}
-      </div>
-      <div>
-        真实累计{{ treeData.leftRealTotal }}&nbsp;&nbsp;{{
-          treeData.rightRealTotal
-        }}
-      </div>
-      <div>
-        首购累计{{ treeData.leftFirstTotal }}&nbsp;&nbsp;{{
-          treeData.rightFirstTotal
-        }}
-      </div>
-      <div>
-        复购累计 {{ treeData.leftRepeatPurchaseTotal }}&nbsp;&nbsp;{{
-          treeData.rightRepeatPurchaseTotal
-        }}
-      </div>
-      <div>
-        首购结余{{ treeData.leftFirstSurplus }}&nbsp;&nbsp;{{
-          treeData.rightFirstSurplus
-        }}
-      </div>
-      <div>
-        复购结余 {{ treeData.leftRepeatPurchaseSurplus }}&nbsp;&nbsp;{{
-          treeData.rightRepeatPurchaseSurplus
-        }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="creationTime"
+            :label="'激活日期'"
+            width="210"
+          />
+
+        </el-table>
       </div>
     </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    {{ nodeInfoDialogVisible }}
+    <el-dialog
+      :visible.sync="nodeInfoDialogVisible"
+      title="子节点信息"
+      width="50%"
+    >
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <div class="box">
+            <div class="title">
+              {{ queryParams.memberCode }}
+              <el-tag size="small">{{ nodeInfo.position }}</el-tab>
+              </el-tag></div>
+          </div>
+        </el-col>
+        <el-col style="margin-bottom: 10px;" :span="12">
+          <span
+            style="margin-right: 10px; font-weight: 500;"
+            @click="copyContent(nodeInfo.memberCode)"
+          >会员编号：</span>
+          <span>{{ nodeInfo.memberCode }}</span>
+        </el-col>
+        <el-col style="margin-bottom: 10px; " :span="12">
+          <span style="margin-right: 10px; font-weight: 500;">点位信息：</span>
+          <span>{{ nodeInfo.memberName }}</span>
+        </el-col>
+        <el-col style="margin-bottom: 10px;" :span="12">
+          <span style="margin-right: 10px; font-weight: 500;">荣誉奖衔：</span>
+          <span>{{ nodeInfo.awardsName }}</span>
+        </el-col>
+        <el-col style="margin-bottom: 10px;" :span="12">
+          <span style="margin-right: 10px; font-weight: 500;">隶属体系：</span>
+          <span>{{ nodeInfo.vertexName }}</span>
+        </el-col>
+        <el-col style="margin-bottom: 10px;" :span="12">
+          <span style="margin-right: 10px; font-weight: 500;">创建时间：</span>
+          <span>{{ nodeInfo.creationTime }}</span>
+        </el-col>
+        <!-- <el-col :span="12">
+          <span>隶属体系</span>
+          <span>{{ nodeInfo.vertexName }}</span>
+        </el-col> -->
+      </el-row>
+      <template #footer>
+        <el-button type="primary" @click="nodeInfoDialogVisible = false">关闭</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import html2canvas from 'html2canvas'
 import topBar from '@/components/topBar'
 import {
-  getAzFramework,
-  getAvarerInfo,
-  getMemberSettlePeriod,
-  getUrlBase
+  getAzFrameworkList,
+  getAzFramewrokNodeInfo,
+  getMemberSettlePeriod
 } from '@/api/archityecture'
-import TopMemberSelect from '@/components/top-member-select/index.vue'
 import { isLocals } from '../../../utils/numberToCurrency'
+import tabBarMixin from './mixins/tab-bar'
+
+const initParmas = {
+  pageNum: 1,
+  pageSize: 50,
+  memberSettlePeriodId: '',
+  memberCode: '',
+  stage: 1,
+  stageStatus: ''
+}
 export default {
-  name: 'Azjg2',
+  name: 'Azjg',
   components: {
-    topBar,
-    TopMemberSelect
+    topBar
   },
+  mixins: [tabBarMixin],
   data() {
     return {
       moren: 'azjg2',
-      topList: [
+      queryParams: {
+        ...initParmas
+      },
+      levelList: [
+        { value: 1, label: '一阶段' },
+        { value: 2, label: '二阶段' },
+        { value: 3, label: '三阶段' }
+      ],
+      statusEnum: [
+        { value: 0, label: '已完成' },
+        { value: 1, label: '未完成' }
+      ],
+      level1: [
         {
-          name: '方案一',
-          path: 'azjg'
+          memberName: 'pointMember11',
+          pointKey: 'point11'
         },
         {
-          name: '方案二',
-          path: 'azjg2'
-        },
-        {
-          name: '方案三',
-          path: 'azjg3'
-        },
-        {
-          name: '方案四',
-          path: 'azjg4'
-        },
-        {
-          name: '方案五',
-          path: 'azjg5'
+          memberName: 'pointMember12',
+          pointKey: 'point12'
         }
       ],
-      queryParams: {
-        memberSettlePeriodId: '', // 期数
-        memberCode: '', // 会员编号
-        level: 5,
-        type: 2
-      },
-      basicSwitch: false,
-      basicInfo: { id: null, label: null },
-      data: {},
-      treeData: {},
-      ifShow: false,
-      avaerInfoList: [],
-      memberSettlePeriodList: [], // 期数
-      tzList: [
-        { value: 0, label: '是' },
-        { value: 1, label: '否' }
+      level2: [
+        {
+          memberName: 'pointMember21',
+          pointKey: 'point21'
+        },
+        {
+          memberName: 'pointMember22',
+          pointKey: 'point22'
+        },
+        {
+          memberName: 'pointMember23',
+          pointKey: 'point23'
+        },
+        {
+          memberName: 'pointMember24',
+          pointKey: 'point24'
+        }
       ],
-      cantz: 1, // 0不可拖拽,1可拖拽
-      scale: 1,
-      loading: false
+      level3: [
+        {
+          memberName: 'pointMember31',
+          pointKey: 'point31'
+        },
+        {
+          memberName: 'pointMember33',
+          pointKey: 'point33'
+        },
+        {
+          memberName: 'pointMember34',
+          pointKey: 'point34'
+        },
+        {
+          memberName: 'pointMember35',
+          pointKey: 'point35'
+        },
+        {
+          memberName: 'pointMember36',
+          pointKey: 'point36'
+        },
+        {
+          memberName: 'pointMember37',
+          pointKey: 'point37'
+        },
+        {
+          memberName: 'pointMember38',
+          pointKey: 'point38'
+        }
+      ],
+      tableData: [],
+      memberSettlePeriodList: [], // 期数
+      loading: false,
+      total: 0,
+      nodeInfo: {},
+      nodeInfoDialogVisible: false,
+      tempMemberCode: ''
     }
   },
   created() {
-    // this.getSearch()
-    this.getAvarerInfo()
+    getMemberSettlePeriod().then((res) => {
+      if (res.code === 200) {
+        this.memberSettlePeriodList = (res.data || []).filter(item => item.isThisDay !== 0)
+        this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0].pkId
+      }
+    })
   },
   methods: {
-    TopMemberHandleChange(val) {
-      if (val) {
-        this.queryParams.memberCode = val
-        this.getSearch()
-      }
-    },
-    handleWheel(event) {
-      if (this.cantz == 1) {
-        event.preventDefault()
-        const delta = Math.sign(event.deltaY)
-        const newScale = this.scale - delta * 0.1
-        this.scale = Math.max(0.01, Math.min(newScale, 10))
-      }
-    },
     isLocals,
-    copyText() {
-      const copyContent = this.$refs.copyContent
-      const textLines = Array.from(copyContent.querySelectorAll('div')).map(
-        (div) => div.textContent.trim()
-      )
-      const text = textLines.join('\n')
-      const tempInput = document.createElement('textarea')
-      tempInput.value = text
-      document.body.appendChild(tempInput)
-      tempInput.select()
-      try {
-        document.execCommand('copy')
-        this.$message({
-          message: '复制成功',
-          type: 'success'
-        })
-      } catch (error) {
-        this.$message({
-          message: '复制失败',
-          type: 'warning'
-        })
-      }
-      tempInput.remove()
-      window.getSelection().removeAllRanges()
-    },
-    // 返回
-    goback() {
-      this.queryParams.memberCode = this.data.parentMemberCode
-      this.getSearch()
-    },
-    // 拖拽移动
-    move(e) {
-      if (this.cantz == 0) {
-        return
-      }
-      const odiv = e.currentTarget // 获取元素
-
-      // 算出鼠标相对元素的位置
-      const disX = e.clientX - odiv.offsetLeft
-      const disY = e.clientY - odiv.offsetTop
-      document.onmousemove = (e) => {
-        // 鼠标按下并移动的事件
-        // 用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
-        const left = e.clientX - disX
-        const top = e.clientY - disY
-
-        // 绑定元素位置到positionX和positionY上面
-        this.positionX = top
-        this.positionY = left
-
-        // 移动当前元素
-        odiv.style.left = left + 'px'
-        odiv.style.top = top + 'px'
-      }
-      document.onmouseup = () => {
-        document.onmousemove = null
-        document.onmouseup = null
-      }
-    },
-    async downloadImage() {
-      const element = this.$refs.htmlContent
-      // 使用html2canvas将节点生成为图片
-      const canvas = await html2canvas(element)
-      const image = canvas.toDataURL('image/png')
-      // 复制图片到剪贴板
-      try {
-        await navigator.clipboard.write([
-          new ClipboardItem({
-            'image/png': await new Promise((resolve) =>
-              canvas.toBlob(resolve, 'image/png')
-            )
-          })
-        ])
-        this.$message({
-          message: '复制成功',
-          type: 'success'
-        })
-      } catch (error) {
-        // this.$message({
-        //   message: "复制失败",
-        //   type: "warning",
-        // });
-      }
-      // 下载图片到本地
-      const link = document.createElement('a')
-      link.href = image
-      link.download = 'image.png'
-      link.click()
-    },
-    getAvarerInfo() {
-      getAvarerInfo().then((res) => {
-        this.avaerInfoList = res.data
-      })
-      getMemberSettlePeriod().then((res) => {
-        this.memberSettlePeriodList = res.data
-        this.memberSettlePeriodList.forEach((ele) => {
-          if (ele.isThisDay == 0) {
-            this.queryParams.memberSettlePeriodId = ele.pkId
-          }
-        })
-      })
-    },
-    // 鼠标移入
-    onMouseover(e, data) {
-      this.basicInfo = data
-      this.basicSwitch = true
-    },
-    // 鼠标移出
-    onMouseout(e, data) {
-      this.basicSwitch = false
-    },
-    // <div class="xrBox">
-    //     <div class="neibox" on-click={() => this.showPover(data)}>
-    //       <div class="topbox">
-    //         <img src={data.avatarUrl}></img>
-    //       </div>
-    //       <div class="centerbox">
-    //         <div class="cflexbox">
-    //           <img src={data.countryUrl}></img>
-    //           <div class="matitle">{data.memberCode}</div>
-    //         </div>
-    //         <div class="cflexbox">
-    //           <img src={data.settleCountryUrl}></img>
-    //           <div class="matitle">{data.name}</div>
-    //         </div>
-    //       </div>
-    //       <div class="footerbox">
-    //         {/* 阻止冒泡事件 */}
-    //         <div class="ftopbtn" on-click={() => {event.stopPropagation(),this.goTop(data)}}>置顶</div>
-    //       </div>
-    //     </div>
-    //   </div>
-    // 渲染节点
-    renderContent(h, data) {
-      if (!data || Object.keys(data).length === 0) {
-        return
-      }
-      return (
-        <div class='xrBox'>
-          {/* 判断data.codeName是否为空 */}
-          <div class='neibox'>
-            {data.memberCode ? (
-              <div on-click={() => this.showPover(data)}>
-                <div class='topbox'>
-                  <img src={data.settleCountryUrl2}></img>
-                </div>
-                <div class='footerbox'>
-                  {/* 阻止冒泡事件 */}
-                  <div
-                    class='ftopbtn'
-                    style={{ backgroundColor: data.color }}
-                    on-click={() => {
-                      event.stopPropagation(), this.goTop(data)
-                    }}
-                  >
-                    {'置顶'}
-                  </div>
-                </div>
-              </div>
-            ) : null}
-          </div>
-        </div>
-      )
-    },
-    // 置顶
-    goTop(row) {
-      this.queryParams.memberCode = row.memberCode
-      this.getSearch()
-    },
-    showPover(row) {
-      getUrlBase({
-        countryUrl2: row.countryUrl2,
-        settleCountryUrl2: row.settleCountryUrl2,
-        avatarUrl: row.avatarUrl
-      }).then((res) => {
-        this.treeData = row
-        this.treeData.countryUrl2Base64 = res.countryUrl2Base64
-        this.treeData.settleCountryUrl2Base64 = res.settleCountryUrl2Base64
-        this.treeData.avatarUrlBase64 = res.avatarUrlBase64
-
-        this.ifShow = true
-      })
-    },
-    // 点击节点
-    NodeClick(e, data) {},
-    // 默认展开
-    toggleExpand(data, val) {
-      if (Array.isArray(data)) {
-        data.forEach((item) => {
-          this.$set(item, 'expand', val)
-          if (item.children) {
-            this.toggleExpand(item.children, val)
-          }
-        })
-      } else {
-        this.$set(data, 'expand', val)
-        if (data.children) {
-          this.toggleExpand(data.children, val)
-        }
-      }
-    },
-    collapse(list) {
-      list.forEach((child) => {
-        if (child.expand) {
-          child.expand = false
-        }
-        child.children && this.collapse(child.children)
-      })
-    },
-    // 展开
-    onExpand(e, data) {
-      if ('expand' in data) {
-        data.expand = !data.expand
-        if (!data.expand && data.children) {
-          this.collapse(data.children)
-        }
-      } else {
-        this.$set(data, 'expand', true)
-      }
-    },
     getSearch() {
+      if (!this.queryParams.memberCode) {
+        this.$message.warning('会员编号不能为空')
+        return
+      }
+      this.tempMemberCode = this.queryParams.memberCode
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    getList() {
       this.loading = true
-      getAzFramework(this.queryParams).then((res) => {
-        this.data = res.data[0]
-        this.toggleExpand(this.data, true)
+      getAzFrameworkList(this.queryParams).then((res) => {
+        if (res.code === 200) {
+          this.tableData = res.data.rows
+          this.total = res.data.total
+        }
       }).finally(() => {
         this.loading = false
       })
     },
-    resetHandle() {
-      this.$refs.topMemberSelect.reset()
-      this.queryParams = {
-        memberSettlePeriodId: '', // 期数
-        memberCode: '', // 会员编号
-        level: 5,
-        type: 2
+    handleNodeClick(node, row) {
+      const memberId = row[node.memberName]
+      console.log(memberId, node, '...memberId')
+      this.nodeInfo = {}
+      if (memberId) {
+        this.nodeInfoDialogVisible = true
+        this.getMemberInfoById({
+          pkMember: row.pkMember,
+          point: row[node.pointKey],
+          stage: row.stage,
+          position: node.pointKey.replace('point', '').split('').join('-'),
+          pointMember: memberId
+        })
       }
-      this.getSearch()
+    },
+    getMemberInfoById({ pkMember, point, stage, position, pointMember }) {
+      this.nodeInfo = {}
+      getAzFramewrokNodeInfo({
+        point,
+        pkMember,
+        memberSettlePeriodId: this.queryParams.memberSettlePeriodId,
+        stage,
+        pointMember
+      }).then((res) => {
+        if (res.code === 200) {
+          this.nodeInfo = {
+            ...res.data,
+            position
+          }
+        }
+      })
+    },
+    resetHandle() {
+      this.queryParams = {
+        ...initParmas
+      }
+      this.tableData = []
+      this.childNodeList = []
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 === 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 === 0) {
+        return 'success-row'
+      }
+      return ''
+    },
+    copyContent(content) {
+      // this.$message.success('复制成功')
     }
+
   }
 }
 </script>
+<style scoped lang="scss">
 
-  <style lang="scss" scoped>
-  ::v-deep .el-dialog__headerbtn{
-  top: 5px;
-  right: 10px;
-  border: 1px solid #c8c3c3;
-  padding: 2px 3px;
-  border-radius: 50%;
+::v-deep .el-range-editor.el-input__inner{
+  width: 100%!important;
 }
-::v-deep .tree-content {
-  background: rgba(0, 0, 0, 0) !important;
+::v-deep .el-button{
+  padding: 8px 20px;
 }
-.tree {
-  background: #fff;
-  // min-height: 100vh;
-  min-height: calc(100vh - 110px);
-  position: relative;
-  text-align: center;
-  // overflow-x: scroll;
-  width: 100%;
-  height: 100%;
-  margin: auto;
-  // overflow-y: hidden;
-  // margin-left: -60px;
-  // margin-top: 20px;
-  // background: red;
-  &-content {
-    text-align: center;
-    width: 100%;
-    height: 100%;
-    background: #fff;
-    position: absolute;
-    top: 0;
-    left: 0;
-    // overflow: auto;
-  }
+::v-deep .el-date-editor .el-range__close-icon{
+  margin-top: -10px;
+}
+::v-deep .el-date-editor .el-range-separator{
+  margin-top: -10px;
+}
+::v-deep .el-date-editor .el-range__icon{
+  margin-top: -10px;
+}
+::v-deep .el-input__inner{
+  //height:28px;
+  //line-height: 28px;
+}
+::v-deep .el-form-item__label{
+  color: #333;
+  font-weight: inherit;
+}
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
 }
 
-::v-deep .org-tree-node-btn {
-  display: none;
-}
-::v-deep .org-tree-node-label-inner {
-  padding: 0;
-  background: rgba(0, 0, 0, 0);
-  padding: 0 !important;
-  border: none;
-  border-radius: 10px;
-}
-::v-deep .el-dialog__body {
-  padding: 0;
-}
-::v-deep .org-tree-container {
-  display: block;
-  background: rgba(1, 1, 1, 0) !important;
-  overflow-x: auto;
-}
-::v-deep .xrBox {
-  .neibox {
-    padding: 8px 15px;
-    margin: auto;
-    min-width: 50px;
-    min-height: 50px;
-    // z-index: 99;
-    .topbox {
-      margin: 0 auto;
-      img {
-        width: 52px;
-        height: 36px;
-        border-radius: 8px;
-        // border-radius: 50%;
-      }
-    }
-    .centerbox {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 10px;
-      text-align: center;
-      box-shadow: 0px 2px 20px 0px rgba(204, 204, 204, 0.5);
-      .cflexbox {
-        margin: 0 10px;
-        img {
-          width: 51px;
-          height: 34px;
-          border-radius: 10px;
-          margin-bottom: 8px;
-        }
-        .matitle {
-          font-size: 10px;
-        }
-      }
-    }
-    .footerbox {
-      // margin-top: 10px;
-      .ftopbtn {
-        margin: 0 auto;
-        // width: 35px;
-        // height: 16px;
-        background: #21c8f4;
-        border-radius: 4px;
-
-        display: flex;
-        padding: 4px 9px;
-        align-items: center;
-        justify-content: center;
-        color: #ffffff;
-        cursor: pointer;
-
-        margin-top: 10px;
-      }
-    }
-  }
-}
-.lefttop {
-  display: flex;
-  justify-items: center;
-  align-items: center;
-  padding-left: 20px;
+::v-deep .el-table .success-row {
   background: #ffffff;
-  .single {
-    margin: 0 5px;
-    img {
-      width: 40px;
-      height: 40px;
-      border-radius: 50%;
-      // box-shadow: 0px 2px 20px 0px rgba(204, 204, 204, 0.5);
-    }
-    .singletitle {
-      text-align: center;
-      font-size: 10px;
-      font-family: PingFang SC-Regular, PingFang SC;
-    }
-  }
 }
-::v-deep .org-tree-node-label .org-tree-node-label-inner {
-  padding: 0;
+::v-deep .el-table thead {
+  color: #000000;
 }
-::v-deep .el-dialog__body {
-  padding: 0;
+::v-deep .el-select {
+  width: 100%;
 }
-
-// ::v-deep .xrBox {
-
-// }
-::v-deep .rendercontent {
-  .toprender {
-    display: flex;
-    border-bottom: 1px solid #cccccc;
-    .leftimg {
-      border-right: 1px solid #cccccc;
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: 10px;
-      .img1 {
-        width: 75px;
-        height: 75px;
-        border-radius: 50%;
-      }
-      .img2 {
-        margin-top: 10px;
-        width: 50px;
-        height: 30px;
-        border-radius: 10px;
-      }
-    }
-    .centerbox {
-      padding: 10px;
-      .lineboex {
-        display: flex;
-        align-items: center;
-        margin: 10px 0;
-        .linetitle {
-          margin-right: 5px;
-          font-size: 10px;
-          font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
-          font-weight: bold;
-          color: #333333;
-        }
-        .linecontent {
-          font-size: 10px;
-          font-family: MicrosoftYaHei;
-          color: #333333;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          padding: 10px 0;
-          width: 166px;
-          height: 20px;
-          background: rgba(216, 216, 216, 0.3);
-          border-radius: 4px;
-          border: 1px solid #cccccc;
-        }
-      }
-    }
-    .rightimg {
-      flex: 1;
-      padding: 10px;
-      font-size: 10px;
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      justify-content: center;
-      font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
-      font-weight: bold;
-      color: #333333;
-      text-align: center;
-      img {
-        width: 75px;
-        height: 50px;
-        border-radius: 10px;
-        margin-bottom: 10px;
-      }
-    }
-  }
-  .bottomrender {
-    padding: 10px;
-    display: flex;
-    .flexbox {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      .thetitle {
-        font-size: 10px;
-        font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
-        font-weight: bold;
-        color: #333333;
-      }
-      .linecontent {
-        margin-top: 5px;
-        padding: 10px 0;
-        font-size: 10px;
-        font-family: MicrosoftYaHei;
-        color: #333333;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 110px;
-        height: 20px;
-        background: rgba(216, 216, 216, 0.3);
-        border-radius: 4px;
-        border: 1px solid #cccccc;
-      }
-    }
-  }
-  .footerbox {
-    display: flex;
-    padding: 10px;
-    justify-content: space-around;
-    .footerbtn {
-      width: 78px;
-      height: 28px;
-      border-radius: 5px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 14px;
-      font-family: MicrosoftYaHei;
-      color: #ffffff;
-      padding: 10px;
-      cursor: pointer;
-    }
-    .btn1 {
-      background: #ee1e26;
-    }
-    .btn2 {
-      background: #f37825;
-    }
-    .btn3 {
-      background: #21c8f4;
-    }
-  }
+.uploadIcon ::v-deep .el-upload--picture-card {
+  display: none !important; /* 上传按钮隐藏 */
 }
-
 .page {
-  padding: 10px 20px;
+  padding: 20px;
   background: #f9f9f9;
   font-size: 14px;
-  .thetopbox {
-    padding: 20px;
-    background: #ffffff;
-    border-radius: 8px;
-    .searchbox {
+  .main {
+    background: #f9f9f9;
+    //border-radius: 8px;
+    //box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    .maintop {
       display: flex;
+      padding: 0 0;
+      justify-content: space-between;
       align-items: center;
-      .searchtitle {
-        margin-right: 10px;
+      .mainbtn {
+        .thebtn1 {
+          background: #3181e5;
+          color: #ffffff;
+        }
+        .thebtn2 {
+          background: #F3A900;
+          color: #ffffff;
+        }
       }
-      .searchbtn {
-        background: #c8161d;
-        color: #ffffff;
+      .maintitle {
+        font-size: 10px;
+        font-family: MicrosoftYaHei;
+        color: #999999;
       }
     }
-
   }
-  .theorgtree {
-      overflow: auto;
-      // margin-top: 20px;
+  .tem {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    img {
+      width: 28px;
+      height: 20px;
+      margin-right: 3px;
     }
+  }
+  .isRed {
+    color: #ed1d25;
+  }
+  .isGreen {
+    color: #1ab62b;
+  }
+  .bgImg {
+    width: 48px;
+    height: 48px;
+  }
 }
-::v-deep .org-tree {
-  margin: 0 auto;
+.openClose {
+  margin-right: 10px;
+  color: #666666;
+  text-align: center;
+}
+.kuang {
+  padding: 5px 20px;
+  background: rgba(255, 255, 255, 0);
+  border-radius: 4px;
+  border: 1px solid #cccccc;
+  margin-right: 10px;
+}
+.heji {
+  margin-top: 10px;
+  .dis {
+    display: flex;
+    justify-content: right;
+    padding: 5px 10px;
+    font-size: 14px;
+    color: #333333;
+    :nth-child(1) {
+      font-size: 14px;
+      font-weight: bold;
+      color: #333333;
+      margin-right: 20px;
+    }
+  }
+
+}
+.searchbtn {
+  width: 68px;
+  background: #c8161d;
+  color: #ffffff;
+}
+.node-wrapper {
+  width: 20px;
+  height: 20px;
+  // 激活颜色
+  background-color: #007bff;
+  border-radius: 50%;
+  cursor: pointer;
+}
+.empty-node {
+  background-color: #fff;
+  border: 2px dashed #95a5a6;
+}
+.title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 18px;
 }
 </style>
diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue
index 6089223..00a9e17 100644
--- a/src/views/framework/architecture/index.vue
+++ b/src/views/framework/architecture/index.vue
@@ -184,7 +184,7 @@ export default {
       moren: 'azjg',
       queryParams: {
         memberSettlePeriodId: '', // 期数
-        memberCode: 'KG71227311', // 会员编号
+        memberCode: '', // 会员编号
         stage: 1,
         stageStatus: '',
         childNode: ''
@@ -326,11 +326,7 @@ export default {
                 </div>
               ) : (
                 <div class='empty-node'>
-                  <div class='empty-avatar'>
-                    <i class='el-icon-plus'></i>
-                  </div>
                   <div class='empty-text'>空点位</div>
-                  <div class='status-indicator inactive'></div>
                 </div>
               )}
             </div>
@@ -392,14 +388,14 @@ export default {
     },
 
     resetHandle() {
-      this.$refs.topMemberSelect.reset()
       this.queryParams = {
         memberSettlePeriodId: '', // 期数
         memberCode: '', // 会员编号
         stage: 7,
         type: 1
       }
-      this.getSearch()
+      this.data = {}
+      this.childNodeList = []
     },
     getChildNodeList() {
       if (!this.queryParams.memberCode) {
diff --git a/src/views/framework/architecture/mixins/tab-bar.js b/src/views/framework/architecture/mixins/tab-bar.js
index d2aa412..4cf16f3 100644
--- a/src/views/framework/architecture/mixins/tab-bar.js
+++ b/src/views/framework/architecture/mixins/tab-bar.js
@@ -5,11 +5,11 @@ export default {
         {
           name: '方案一',
           path: 'azjg'
+        },
+        {
+          name: '方案二',
+          path: 'azjg2'
         }
-        // {
-        //   name: '方案五',
-        //   path: 'azjg5'
-        // }
       ]
     }
   }
diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue
index b1fdc01..69d548d 100644
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@@ -398,9 +398,6 @@
           :data="tableData"
           :height="isActive ? '480px' : '630px'"
         >
-          v-loading="loading" style="width: 100%" :header-cell-style="{
-          background: '#EEEEEE' }" :row-class-name="tableRowClassName"
-          @selection-change="handleSelectionChange" >
           <el-table-column type="selection" />
           <el-table-column
             v-if="allTxt.memberCode"
diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue
index 2433a1e..553118a 100644
--- a/src/views/settlementCenter/bonusDetail/index.vue
+++ b/src/views/settlementCenter/bonusDetail/index.vue
@@ -183,91 +183,25 @@
             />
             <el-table-column
               align="center"
-              prop="retailRangeIncomeOri"
+              prop="directIncome"
               width="130"
               :label="$t('直推收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
-              prop="retailSameLevelIncomeOri"
+              prop="storeIncome"
               width="130"
-              :label="$t('平级收益') + `(${isLocalSymbol()})`"
+              :label="$t('阶段收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
-              prop="retailAreaIncomeOri"
+              prop="globalPoints"
               width="130"
-              :label="$t('区域分红') + `(${isLocalSymbol()})`"
+              :label="$t('见点收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
-            <el-table-column
-              align="center"
-              prop="retailBenefitRangeIncomeOri"
-              width="130"
-              :label="$t('福利级差收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="repurRangeIncome"
-              width="130"
-              :label="$t('复购级差收益') + '(￥)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="retailMonthRepurchaseIncomeOri"
-              width="160"
-              :label="$t('月复购级差收益') + '(￥)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="coachIncomeOri"
-              width="130"
-              :label="$t('培育津贴') + '(￥)'"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailBenefitAvgIncomeOri"
-              width="160"
-              :label="$t('福利分红平均收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="retailBenefitIncomeOri"
-              width="160"
-              :label="$t('福利分红加权收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="backPointsOri"
-              width="130"
-              :label="$t('重消收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <!-- <el-table-column
-              align="center"
-              prop="retailRealSubtotalOri"
-              width="130"
-              :label="$t('收益小计') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            /> -->
-
-            <!-- <el-table-column
-              align="center"
-              prop="globalPointsOri"
-              width="130"
-              :label="$t('直推极差') + '(￥)'"
-              :formatter="stateFormat"
-            /> -->
 
             <el-table-column
               align="center"
diff --git a/src/views/settlementCenter/totalBonus/index.vue b/src/views/settlementCenter/totalBonus/index.vue
index 9d2e040..ed835be 100644
--- a/src/views/settlementCenter/totalBonus/index.vue
+++ b/src/views/settlementCenter/totalBonus/index.vue
@@ -164,109 +164,22 @@
             />
             <el-table-column
               align="center"
-              prop="retailRangeIncome"
-              width="130"
+              prop="directIncome"
               :label="$t('直推收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
-              prop="retailSameLevelIncome"
-              width="130"
-              :label="$t('平级收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailAreaIncome"
-              width="130"
-              :label="$t('区域分红') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailBenefitRangeIncome"
-              width="130"
-              :label="$t('福利级差收益') + `(${isLocalSymbol()})`"
+              prop="storeIncome"
+              :label="$t('阶段收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
-              prop="repurRangeIncome"
-              width="130"
-              :label="$t('复购级差收益') + '(￥)'"
+              prop="globalPoints"
+              :label="$t('见点收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
-            <el-table-column
-              align="center"
-              prop="retailMonthRepurchaseIncome"
-              width="160"
-              :label="$t('月复购级差收益') + '(￥)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="coachIncome"
-              width="130"
-              :label="$t('培育津贴') + '(￥)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="retailBenefitAvgIncome"
-              width="160"
-              :label="$t('福利分红平均收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="retailBenefitIncome"
-              width="160"
-              :label="$t('福利分红加权收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="backPoints"
-              width="130"
-              :label="$t('重消收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <!-- <el-table-column
-              align="center"
-              prop="globalPointsOri"
-              width="130"
-              :label="$t('直推级差') + '(￥)'"
-              :formatter="stateFormat"
-            /> -->
-
-            <!-- <el-table-column
-              align="center"
-              prop="realIncomeTotalOri"
-              width="130"
-              v-if="allTxt.realIncomeTotalOri"
-              :label="'实发收益总计' + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="allTxt.realIncomeTotal"
-              align="center"
-              prop="realIncomeTotal"
-              width="130"
-              :label="'实发收益总计' + '($)'"
-              :formatter="stateFormat"
-            /> -->
-            <!-- <el-table-column
-              align="center"
-              prop="settleDate"
-              width="200"
-              :label="'开始日期'"
-              v-if="allTxt.settleDate"
-            /> -->
             <el-table-column
               v-if="allTxt.realIncomeTotal"
               align="center"