From bd867ce01af970dc9d715266cf9d47f2347f95f0 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 21 Oct 2025 14:50:01 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat(statistics):=20=E4=BC=9E=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E4=B8=BA=E5=89=8D=E4=B8=80?=
 =?UTF-8?q?=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/router/index.js                           |  12 +-
 src/utils/date.js                             |  24 ++
 src/views/statistics/underDirectAdd.vue       | 322 ++++++++---------
 src/views/statistics/underDirectAddNew.vue    | 324 ++++++++----------
 src/views/statistics/underPlacementPer.vue    | 210 +++++-------
 src/views/statistics/underPlacementPerNew.vue | 220 ++++++------
 7 files changed, 520 insertions(+), 593 deletions(-)
 create mode 100644 src/utils/date.js

diff --git a/package.json b/package.json
index 384a29f..2bb1325 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "axios": "0.18.1",
     "core-js": "3.6.5",
+    "dayjs": "^1.11.18",
     "echarts": "^5.4.2",
     "element-ui": "2.13.2",
     "file-saver": "^2.0.5",
diff --git a/src/router/index.js b/src/router/index.js
index aef5151..4fb308a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2755,12 +2755,12 @@ export const constantRoutes = [
         component: () => import('@/views/statistics/underBalance'),
         meta: { title: '伞下账户余额' }
       },
-      {
-        path: 'underDirectPushBox',
-        name: 'UnderDirectPushBox',
-        component: () => import('@/views/statistics/underDirectPushBox'),
-        meta: { title: '伞下直推新增盒数' }
-      },
+      // {
+      //   path: 'underDirectPushBox',
+      //   name: 'UnderDirectPushBox',
+      //   component: () => import('@/views/statistics/underDirectPushBox'),
+      //   meta: { title: '伞下直推新增盒数' }
+      // },
       {
         path: 'realPerAddAwards',
         name: 'RealPerAddAwards',
diff --git a/src/utils/date.js b/src/utils/date.js
new file mode 100644
index 0000000..8c0331e
--- /dev/null
+++ b/src/utils/date.js
@@ -0,0 +1,24 @@
+import dayjs from 'dayjs'
+
+export function getBeforeDays(n = 1) {
+  return dayjs().subtract(n, 'day').format('YYYY-MM-DD')
+}
+
+// 获取本月第一天
+export function getMonthFirstDay() {
+  return dayjs().startOf('month').format('YYYY-MM-DD')
+}
+
+// 获取本月最后一天
+export function getMonthLastDay() {
+  return dayjs().endOf('month').format('YYYY-MM-DD')
+}
+
+// 获取本月第一天和当前天前一天的日期，如果当天为本月第一天，则返回上月第一天和上月最后一天
+export function getMonthFirstDayAndBeforeDay() {
+  const isFirstDate = new Date().getDate() === 1
+  if (isFirstDate) {
+    return [dayjs().add(-1, 'month').startOf('month').format('YYYY-MM-DD'), dayjs().add(-1, 'month').endOf('month').format('YYYY-MM-DD')]
+  }
+  return [getMonthFirstDay(), getBeforeDays(1)]
+}
diff --git a/src/views/statistics/underDirectAdd.vue b/src/views/statistics/underDirectAdd.vue
index 8878fc2..b0938ac 100644
--- a/src/views/statistics/underDirectAdd.vue
+++ b/src/views/statistics/underDirectAdd.vue
@@ -1,28 +1,22 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-24 15:45:01
--->
 <template>
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="main">
       <div class="form_all">
         <el-form ref="select" :model="select" label-width="auto">
           <el-row :gutter="10">
             <el-col :span="4">
               <el-form-item :label="'会员编号'">
-                <el-input clearable v-model="select.memberCode"></el-input>
+                <el-input v-model="select.memberCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员姓名'">
-                <el-input clearable v-model="select.memberName"></el-input>
+                <el-input v-model="select.memberName" clearable />
               </el-form-item>
             </el-col>
             <!-- <el-col :span="4">
@@ -44,16 +38,16 @@
             <el-col :span="4">
               <el-form-item :label="'荣誉奖衔'">
                 <el-select
+                  v-model="select.pkAwards"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.pkAwards"
                 >
                   <el-option
                     v-for="item in awardsList"
                     :key="item.pkId"
                     :label="item.awardsName"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -61,32 +55,32 @@
             <el-col :span="4">
               <el-form-item :label="'隶属体系'">
                 <el-select
+                  v-model="select.pkVertex"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.pkVertex"
                 >
                   <el-option
                     v-for="item in vertexList"
                     :key="item.pkId"
                     :label="item.vertexName"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'隶属团队'">
                 <el-select
+                  v-model="select.pkTeamCode"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.pkTeamCode"
                 >
                   <el-option
                     v-for="item in teamList"
                     :key="item.pkId"
                     :label="item.teamName"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -103,8 +97,7 @@
                     :key="item.pkCountry"
                     :label="item.name"
                     :value="item.pkCountry"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -112,20 +105,18 @@
               <el-form-item label="订单日期">
                 <el-date-picker
                   v-model="creationTime"
-                  @change="changeTime"
                   value-format="yyyy-MM-dd"
                   type="daterange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
-                >
-                </el-date-picker>
+                  @change="changeTime"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-button type="primary" @click="getDataList">
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button type="" @click="reset"> {{ '重置' }}</el-button>
             </el-col>
           </el-row>
@@ -146,40 +137,38 @@
             {{ '导出' }}</el-button
           > -->
           <el-button
-            size="small"
             v-hasButtons="['memberDown']"
-            @click="importTemplate"
+            size="small"
             style="background-color: #009b58; color: #fff; margin-left: 15px"
             class="thebtn2"
+            @click="importTemplate"
           >
-            {{ '下载模板' }}</el-button
-          >
+            {{ '下载模板' }}</el-button>
           <el-button
+            v-hasButtons="['memberImport']"
             size="small"
             class="thebtn2"
-            v-hasButtons="['memberImport']"
             style="background-color: #ff6723; color: #fff"
             @click="handleImport"
           >
-            {{ '导入' }}</el-button
-          >
+            {{ '导入' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           style="width: 100%"
           height="700px"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column type="selection" width="55" />
           <el-table-column align="center" prop="picture" label="国旗">
             <template slot-scope="scope">
               <div class="tem">
-                <img :src="scope.row.nationalFlag1" alt="" />
+                <img :src="scope.row.nationalFlag1" alt="">
               </div>
             </template>
           </el-table-column>
@@ -187,23 +176,19 @@
             align="center"
             prop="shortName"
             :label="'国家'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberCode"
             :label="'会员编号'"
-          >
-          </el-table-column>
+          />
 
           <el-table-column
             align="center"
             prop="memberName"
             :label="'会员姓名'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="phone" :label="'联系方式'">
-          </el-table-column>
+          />
+          <el-table-column align="center" prop="phone" :label="'联系方式'" />
           <!-- <el-table-column
             align="center"
             prop="orderTypeVal"
@@ -214,48 +199,41 @@
             align="center"
             prop="awardsName"
             :label="'荣誉奖衔'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="vertexName"
             :label="'隶属体系'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="teamName"
             :label="'隶属团队'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="orderAmount"
             width="130"
             label="新增金额(￥)"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="orderAchieve"
             width="130"
             :label="'新增业绩' + '(PV)'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="bigArealPv"
             width="130"
             :label="$t('大区业绩') + '(PV)'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="smallAreaPv"
             width="130"
             :label="$t('小区业绩') + '(PV)'"
-          >
-          </el-table-column>
+          />
           <!-- <el-table-column align="center"
                            prop="payTime"
                            label="订单日期">
@@ -290,12 +268,12 @@
         :auto-upload="false"
         drag
       >
-        <i class="el-icon-upload"></i>
+        <i class="el-icon-upload" />
         <div class="el-upload__text">
           {{ '将文件拖到此处，或' }}
           <em>{{ '点击上传' }}</em>
         </div>
-        <div class="el-upload__tip" style="color: red" slot="tip">
+        <div slot="tip" class="el-upload__tip" style="color: red">
           {{ '提示：仅允许导入“xls”或“xlsx”格式文件！' }}
         </div>
       </el-upload>
@@ -312,28 +290,29 @@
 </template>
 
 <script>
-import topBar from "@/components/topBar";
-import * as api from "@/api/business.js";
-import * as log from "@/api/logistics";
-import { getToken } from "@/utils/auth";
-import { getAwardsListChiose } from "@/api/level";
-import { getvertexValue } from "@/api/financialCase";
-import { userCountryList } from "@/api/site.js";
+import topBar from '@/components/topBar'
+import * as api from '@/api/business.js'
+import * as log from '@/api/logistics'
+import { getToken } from '@/utils/auth'
+import { getAwardsListChiose } from '@/api/level'
+import { getvertexValue } from '@/api/financialCase'
+import { userCountryList } from '@/api/site.js'
+import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
 export default {
-  name: "Bzpz",
+  name: 'Bzpz',
   components: {
-    topBar,
+    topBar
   },
   data() {
     return {
       creationTime: [],
       select: {
-        orderType: 1,
+        orderType: 1
       },
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
       tableData: [],
@@ -343,178 +322,177 @@ export default {
       teamList: [],
       countryList: [],
       orderTypeList: [],
-      moren: "underDirectAdd",
+      moren: 'underDirectAdd',
       topList: [
         {
-          name: "伞下直推新增业绩",
-          path: "underDirectAdd",
-        },
+          name: '伞下直推新增业绩',
+          path: 'underDirectAdd'
+        }
       ],
       upload: {
         // 是否显示弹出层（物流导入）
         open: false,
         // 弹出层标题（物流导入）
-        title: "",
+        title: '',
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的物流数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { Authorization: 'Bearer ' + getToken() },
         // 上传的地址
         url:
           process.env.VUE_APP_BASE_API +
-          "/report/manager/member-report/batch-importData",
-      },
-    };
+          '/report/manager/member-report/batch-importData'
+      }
+    }
   },
   mounted() {
-    var s1 = this.getStartTime();
-    var s2 = this.getEndTime();
-    this.select.startPayTime = s1;
-    this.select.endPayTime = s2;
-    this.creationTime = [s1, s2];
+    const [s1, s2] = getMonthFirstDayAndBeforeDay()
+    this.select.startPayTime = s1
+    this.select.endPayTime = s2
+    this.creationTime = [s1, s2]
     // 获取列表
-    this.getDataList();
-    this.getData();
+    this.getDataList()
+    this.getData()
     // this.getEYesNoList()
   },
   methods: {
     details(row) {
       this.$router.push({
-        path: "UnderDirectAddNewDetil",
+        path: 'UnderDirectAddNewDetil',
         query: {
           data: JSON.stringify(row),
-          search: JSON.stringify(this.creationTime),
-        },
-      });
+          search: JSON.stringify(this.creationTime)
+        }
+      })
     },
     handleImport() {
-      this.upload.title = "导入";
-      this.upload.open = true;
+      this.upload.title = '导入'
+      this.upload.open = true
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
+      this.upload.isUploading = true
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
-      var fileName = response.fileName;
-      if (fileName != undefined && fileName != "") {
+      var fileName = response.fileName
+      if (fileName != undefined && fileName != '') {
       }
       if (response.code == 200) {
-        let queryString = `/report/manager/member-report/export-direct-push-new?memberCodeStr=${encodeURIComponent(
+        const queryString = `/report/manager/member-report/export-direct-push-new?memberCodeStr=${encodeURIComponent(
           response.data.memberCodeStr
         )}&startPayTime=${encodeURIComponent(
           response.data.startPayTime
-        )}&endPayTime=${encodeURIComponent(response.data.endPayTime)}`;
+        )}&endPayTime=${encodeURIComponent(response.data.endPayTime)}`
         this.download(
           queryString,
           {},
-          `${this.$t("伞下直推新增业绩")}${new Date().getTime()}.xlsx`
-        );
+          `${this.$t('伞下直推新增业绩')}${new Date().getTime()}.xlsx`
+        )
       }
 
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      let str = "";
-      this.$alert("", '上传成功', {
-        dangerouslyUseHTMLString: true,
-      });
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      const str = ''
+      this.$alert('', '上传成功', {
+        dangerouslyUseHTMLString: true
+      })
     },
     // 上传文件数量超出后的动作
     handleExceed() {
-      this.upload.isUploading = false;
-      this.msgInfo('仅可上传一个文件哦');
+      this.upload.isUploading = false
+      this.msgInfo('仅可上传一个文件哦')
     },
     // 提交上传文件
     submitFileForm() {
-      this.$refs.upload.submit();
+      this.$refs.upload.submit()
     },
     importTemplate() {
       this.download(
-        "/report/manager/member-report/download",
+        '/report/manager/member-report/download',
         {},
-        `${this.$t("伞下直推新增业绩")}${new Date().getTime()}.xlsx`
-      );
+        `${this.$t('伞下直推新增业绩')}${new Date().getTime()}.xlsx`
+      )
     },
     getStartTime() {
-      const date = new Date();
-      date.setDate(1); // 将当前时间的日期设置成第一天
-      const year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day;
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
     },
     getEndTime() {
-      let date = new Date();
-      let year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day + " ";
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
     },
-    //荣誉奖衔下拉选
+    // 荣誉奖衔下拉选
     getData() {
       getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows;
-      });
+        this.awardsList = res.rows
+      })
       getvertexValue().then((res) => {
-        this.vertexList = res.data;
-      });
+        this.vertexList = res.data
+      })
       api.teamList().then((res) => {
-        this.teamList = res.data;
-      });
+        this.teamList = res.data
+      })
       userCountryList().then((res) => {
-        this.countryList = res.data;
-      });
+        this.countryList = res.data
+      })
       log.getUnderAddOrderType().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
     },
     getStartTime() {
-      const date = new Date();
-      date.setDate(1); // 将当前时间的日期设置成第一天
-      const year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day;
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
     },
     getEndTime() {
-      let date = new Date();
-      let year = date.getFullYear(); // 得到当前年份
-      let month = date.getDate() === 1 ? date.getMonth() : date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day + " ";
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getDate() === 1 ? date.getMonth() : date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
     },
     reset() {
       this.select = {
-        orderType: 1,
-      };
-      this.creationTime = [];
-      this.getDataList();
+        orderType: 1
+      }
+      this.creationTime = []
+      this.getDataList()
     },
     changeTime(val) {
-      this.select.startPayTime = val ? val[0] : "";
-      this.select.endPayTime = val ? val[1] : "";
+      this.select.startPayTime = val ? val[0] : ''
+      this.select.endPayTime = val ? val[1] : ''
     },
     getDataList() {
-      this.loading = true;
+      this.loading = true
       api
         .directAddList(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.tableData = res.rows;
-          this.total = res.total;
-          this.loading = false;
-        });
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
     },
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
@@ -522,25 +500,25 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "report/manager/member-report/export-direct-push-new",
+          'report/manager/member-report/export-direct-push-new',
           Object.assign({}, this.queryParams, this.select),
           `伞下直推新增业绩${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return "warning-row";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
-    },
-  },
-};
+      return ''
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 ::v-deep .el-table .warning-row {
diff --git a/src/views/statistics/underDirectAddNew.vue b/src/views/statistics/underDirectAddNew.vue
index 9b1b039..114b21c 100644
--- a/src/views/statistics/underDirectAddNew.vue
+++ b/src/views/statistics/underDirectAddNew.vue
@@ -2,16 +2,16 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="main">
       <div class="form_all">
         <el-form ref="select" :model="select" label-width="auto">
           <el-row :gutter="10">
             <el-col :span="4">
               <el-form-item :label="'会员编号'">
-                <el-input clearable v-model="select.memberCode"></el-input>
+                <el-input v-model="select.memberCode" clearable />
               </el-form-item>
             </el-col>
             <!-- <el-col :span="4">
@@ -38,16 +38,16 @@
             <el-col :span="4">
               <el-form-item :label="'荣誉奖衔'">
                 <el-select
+                  v-model="select.pkAwards"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.pkAwards"
                 >
                   <el-option
                     v-for="item in awardsList"
                     :key="item.pkId"
                     :label="item.awardsName"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -55,32 +55,32 @@
             <el-col :span="4">
               <el-form-item :label="'隶属体系'">
                 <el-select
+                  v-model="select.pkVertex"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.pkVertex"
                 >
                   <el-option
                     v-for="item in vertexList"
                     :key="item.pkId"
                     :label="item.vertexName"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'隶属团队'">
                 <el-select
+                  v-model="select.pkTeamCode"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.pkTeamCode"
                 >
                   <el-option
                     v-for="item in teamList"
                     :key="item.pkId"
                     :label="item.teamName"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -97,8 +97,7 @@
                     :key="item.pkCountry"
                     :label="item.name"
                     :value="item.pkCountry"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -106,20 +105,18 @@
               <el-form-item label="订单日期">
                 <el-date-picker
                   v-model="creationTime"
-                  @change="changeTime"
                   value-format="yyyy-MM-dd"
                   type="daterange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
-                >
-                </el-date-picker>
+                  @change="changeTime"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-button type="primary" @click="getDataList">
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button type="" @click="reset"> {{ '重置' }}</el-button>
               <el-button type="primary" @click="getNewData">统计</el-button>
             </el-col>
@@ -137,40 +134,38 @@
             {{ '导出' }}</el-button
           > -->
           <el-button
-            size="small"
             v-hasButtons="['memberDown']"
-            @click="importTemplate"
+            size="small"
             style="background-color: #009b58; color: #fff; margin-left: 15px"
             class="thebtn2"
+            @click="importTemplate"
           >
-            {{ '下载模板' }}</el-button
-          >
+            {{ '下载模板' }}</el-button>
           <el-button
+            v-hasButtons="['memberImport']"
             size="small"
             class="thebtn2"
-            v-hasButtons="['memberImport']"
             style="background-color: #ff6723; color: #fff"
             @click="handleImport"
           >
-            {{ '导入' }}</el-button
-          >
+            {{ '导入' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           style="width: 100%"
           height="700px"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column type="selection" width="55" />
           <el-table-column align="center" prop="picture" label="国旗">
             <template slot-scope="scope">
               <div class="tem">
-                <img :src="scope.row.nationalFlag1" alt="" />
+                <img :src="scope.row.nationalFlag1" alt="">
               </div>
             </template>
           </el-table-column>
@@ -178,23 +173,19 @@
             align="center"
             prop="shortName"
             :label="'国家'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberCode"
             :label="'会员编号'"
-          >
-          </el-table-column>
+          />
 
           <el-table-column
             align="center"
             prop="memberName"
             :label="'会员姓名'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="phone" :label="'联系方式'">
-          </el-table-column>
+          />
+          <el-table-column align="center" prop="phone" :label="'联系方式'" />
           <!-- <el-table-column
             align="center"
             prop="orderTypeVal"
@@ -205,41 +196,36 @@
             align="center"
             prop="awardsName"
             :label="'荣誉奖衔'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="vertexName"
             :label="'隶属体系'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="pkTeamCode"
             :label="'隶属团队'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="orderAmount"
             width="130"
             label="新增金额(￥)"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="orderAchieve"
             width="130"
             :label="'新增业绩' + '(PV)'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="bigArealPv"
             :label="$t('大区业绩')"
           >
             <template slot-scope="scope">
-              <el-link @click="details(scope.row)" type="primary">{{
+              <el-link type="primary" @click="details(scope.row)">{{
                 scope.row.bigArealPv
               }}</el-link>
             </template>
@@ -250,7 +236,7 @@
             :label="$t('小区业绩')"
           >
             <template slot-scope="scope">
-              <el-link @click="details(scope.row)" type="primary">{{
+              <el-link type="primary" @click="details(scope.row)">{{
                 scope.row.smallAreaPv
               }}</el-link>
             </template>
@@ -261,7 +247,7 @@
             :label="$t('大区金额')"
           >
             <template slot-scope="scope">
-              <el-link @click="details(scope.row)" type="primary">{{
+              <el-link type="primary" @click="details(scope.row)">{{
                 scope.row.bigArealAm
               }}</el-link>
             </template>
@@ -272,7 +258,7 @@
             :label="$t('小区金额')"
           >
             <template slot-scope="scope">
-              <el-link @click="details(scope.row)" type="primary">{{
+              <el-link type="primary" @click="details(scope.row)">{{
                 scope.row.smallAreaAm
               }}</el-link>
             </template>
@@ -282,57 +268,49 @@
             prop="regAmount"
             width="130"
             label="注册金额(￥)"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="regAchieve"
             width="130"
             :label="$t('注册业绩') + '(PV)'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="upgAmount"
             width="130"
             label="升级金额(￥)"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="upgAchieve"
             width="130"
             :label="$t('升级业绩') + '(PV)'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="repAmount"
             width="130"
             label="复购金额(￥)"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="repAchieve"
             width="130"
             :label="$t('复购业绩') + '(PV)'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="conAmount"
             width="130"
             label="重消金额(￥)"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="conAchieve"
             width="130"
             :label="$t('重消业绩') + '(PV)'"
-          >
-          </el-table-column>
+          />
           <!-- <el-table-column align="center"
                              prop="payTime"
                              label="订单日期">
@@ -367,12 +345,12 @@
         :auto-upload="false"
         drag
       >
-        <i class="el-icon-upload"></i>
+        <i class="el-icon-upload" />
         <div class="el-upload__text">
           {{ '将文件拖到此处，或' }}
           <em>{{ '点击上传' }}</em>
         </div>
-        <div class="el-upload__tip" style="color: red" slot="tip">
+        <div slot="tip" class="el-upload__tip" style="color: red">
           {{ '提示：仅允许导入“xls”或“xlsx”格式文件！' }}
         </div>
       </el-upload>
@@ -389,28 +367,29 @@
 </template>
 
 <script>
-import topBar from "@/components/topBar";
-import * as api from "@/api/business.js";
-import * as log from "@/api/logistics";
-import { getToken } from "@/utils/auth";
-import { getAwardsListChiose } from "@/api/level";
-import { getvertexValue } from "@/api/financialCase";
-import { userCountryList } from "@/api/site.js";
+import topBar from '@/components/topBar'
+import * as api from '@/api/business.js'
+import * as log from '@/api/logistics'
+import { getToken } from '@/utils/auth'
+import { getAwardsListChiose } from '@/api/level'
+import { getvertexValue } from '@/api/financialCase'
+import { userCountryList } from '@/api/site.js'
+import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
 export default {
-  name: "UnderDirectAddNew",
+  name: 'UnderDirectAddNew',
   components: {
-    topBar,
+    topBar
   },
   data() {
     return {
       creationTime: [],
       select: {
-        orderType: 1,
+        orderType: 1
       },
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
       tableData: [],
@@ -420,171 +399,170 @@ export default {
       teamList: [],
       countryList: [],
       orderTypeList: [],
-      moren: "underDirectAddNew",
+      moren: 'underDirectAddNew',
       topList: [
         {
-          name: "伞下直推新增业绩（新）",
-          path: "underDirectAddNew",
-        },
+          name: '伞下直推新增业绩（新）',
+          path: 'underDirectAddNew'
+        }
       ],
-      monthFirstday: "",
-      monthLastday: "",
+      monthFirstday: '',
+      monthLastday: '',
       upload: {
         // 是否显示弹出层（物流导入）
         open: false,
         // 弹出层标题（物流导入）
-        title: "",
+        title: '',
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的物流数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { Authorization: 'Bearer ' + getToken() },
         // 上传的地址
         url:
           process.env.VUE_APP_BASE_API +
-          "/report/manager/member-report/batch-importData",
-      },
-    };
+          '/report/manager/member-report/batch-importData'
+      }
+    }
   },
   mounted() {
-    var s1 = this.getStartTime();
-    var s2 = this.getEndTime();
-    this.select.startPayTime = s1;
-    this.select.endPayTime = s2;
-    this.creationTime = [s1, s2];
+    const [s1, s2] = getMonthFirstDayAndBeforeDay()
+    this.select.startPayTime = s1
+    this.select.endPayTime = s2
+    this.creationTime = [s1, s2]
     // 获取列表
-    this.getDataList();
-    this.getData();
+    this.getDataList()
+    this.getData()
   },
   methods: {
     getNewData() {
-      this.loading = true;
-      this.select.staDate = this.select.startPayTime;
-      this.select.endDate = this.select.endPayTime;
+      this.loading = true
+      this.select.staDate = this.select.startPayTime
+      this.select.endDate = this.select.endPayTime
       api
         .getstaAmountBox(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.getDataList();
-        });
+          this.getDataList()
+        })
     },
     details(row) {
       this.$router.push({
-        path: "UnderDirectAddNewDetil",
+        path: 'UnderDirectAddNewDetil',
         query: {
           data: JSON.stringify(row),
-          search: JSON.stringify(this.creationTime),
-        },
-      });
+          search: JSON.stringify(this.creationTime)
+        }
+      })
     },
     handleImport() {
-      this.upload.title = "导入";
-      this.upload.open = true;
+      this.upload.title = '导入'
+      this.upload.open = true
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
+      this.upload.isUploading = true
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
-      var fileName = response.fileName;
-      if (fileName != undefined && fileName != "") {
+      var fileName = response.fileName
+      if (fileName != undefined && fileName != '') {
       }
       if (response.code == 200) {
-        let queryString = `/report/manager/member-report/export-direct-push-new-up?memberCodeStr=${encodeURIComponent(
+        const queryString = `/report/manager/member-report/export-direct-push-new-up?memberCodeStr=${encodeURIComponent(
           response.data.memberCodeStr
         )}&startPayTime=${encodeURIComponent(
           response.data.startPayTime
-        )}&endPayTime=${encodeURIComponent(response.data.endPayTime)}`;
+        )}&endPayTime=${encodeURIComponent(response.data.endPayTime)}`
         this.download(
           queryString,
           {},
-          `${this.$t("伞下直推新增业绩")}${new Date().getTime()}.xlsx`
-        );
+          `${this.$t('伞下直推新增业绩')}${new Date().getTime()}.xlsx`
+        )
       }
 
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      let str = "";
-      this.$alert("", '上传成功', {
-        dangerouslyUseHTMLString: true,
-      });
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      const str = ''
+      this.$alert('', '上传成功', {
+        dangerouslyUseHTMLString: true
+      })
     },
     // 上传文件数量超出后的动作
     handleExceed() {
-      this.upload.isUploading = false;
-      this.msgInfo('仅可上传一个文件哦');
+      this.upload.isUploading = false
+      this.msgInfo('仅可上传一个文件哦')
     },
     // 提交上传文件
     submitFileForm() {
-      this.$refs.upload.submit();
+      this.$refs.upload.submit()
     },
     importTemplate() {
       this.download(
-        "/report/manager/member-report/download",
+        '/report/manager/member-report/download',
         {},
-        `${this.$t("伞下直推新增业绩")}${new Date().getTime()}.xlsx`
-      );
+        `${this.$t('伞下直推新增业绩')}${new Date().getTime()}.xlsx`
+      )
     },
     getStartTime() {
-      const date = new Date();
-      date.setDate(1); // 将当前时间的日期设置成第一天
-      const year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day;
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
     },
     getEndTime() {
-      let date = new Date();
-      let year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day + " ";
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
     },
-    //荣誉奖衔下拉选
+    // 荣誉奖衔下拉选
     getData() {
       getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows;
-      });
+        this.awardsList = res.rows
+      })
       getvertexValue().then((res) => {
-        this.vertexList = res.data;
-      });
+        this.vertexList = res.data
+      })
       api.teamList().then((res) => {
-        this.teamList = res.data;
-      });
+        this.teamList = res.data
+      })
       userCountryList().then((res) => {
-        this.countryList = res.data;
-      });
+        this.countryList = res.data
+      })
       log.getUnderAddOrderTypeNew().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
     },
 
     reset() {
       this.select = {
-        orderType: 1,
-      };
-      this.creationTime = [];
-      this.getDataList();
+        orderType: 1
+      }
+      this.creationTime = []
+      this.getDataList()
     },
     changeTime(val) {
-      this.select.startPayTime = val ? val[0] : "";
-      this.select.endPayTime = val ? val[1] : "";
+      this.select.startPayTime = val ? val[0] : ''
+      this.select.endPayTime = val ? val[1] : ''
     },
     getDataList() {
-      this.loading = true;
+      this.loading = true
       api
         .directAddNewList(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.tableData = res.rows;
-          this.total = res.total;
-          this.loading = false;
-        });
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
     },
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
@@ -592,25 +570,25 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/report/manager/member-report/export-direct-push-new-up",
+          '/report/manager/member-report/export-direct-push-new-up',
           Object.assign({}, this.queryParams, this.select),
           `伞下直推新增业绩（新）${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return "warning-row";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
-    },
-  },
-};
+      return ''
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 ::v-deep .el-table .warning-row {
diff --git a/src/views/statistics/underPlacementPer.vue b/src/views/statistics/underPlacementPer.vue
index 7c1d2fa..e62b874 100644
--- a/src/views/statistics/underPlacementPer.vue
+++ b/src/views/statistics/underPlacementPer.vue
@@ -2,36 +2,36 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="thetopbox">
       <el-form label-width="100px">
         <el-row>
           <el-col :span="4">
             <el-form-item :label="'会员编号'" prop="memberCode">
-              <el-input clearable v-model="queryParams.memberCode"></el-input>
+              <el-input v-model="queryParams.memberCode" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'会员姓名'" prop="memberName">
-              <el-input clearable v-model="queryParams.memberName"></el-input>
+              <el-input v-model="queryParams.memberName" clearable />
             </el-form-item>
           </el-col>
 
           <el-col :span="4">
             <el-form-item :label="'订单类型'" prop="orderType">
               <el-select
+                v-model="queryParams.orderType"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.orderType"
               >
                 <el-option
                   v-for="item in orderTypeList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -39,48 +39,48 @@
           <el-col :span="4">
             <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
               <el-select
+                v-model="queryParams.pkAwards"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkAwards"
               >
                 <el-option
                   v-for="item in awardsList"
                   :key="item.pkId"
                   :label="item.awardsName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'隶属体系'" prop="pkVertex">
               <el-select
+                v-model="queryParams.pkVertex"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkVertex"
               >
                 <el-option
                   v-for="item in vertexList"
                   :key="item.pkId"
                   :label="item.vertexName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'隶属团队'" prop="pkTeamCode">
               <el-select
+                v-model="queryParams.pkTeamCode"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkTeamCode"
               >
                 <el-option
                   v-for="item in memberTeamList"
                   :key="item.pkId"
                   :label="item.teamName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -101,18 +101,17 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="8">
-            <el-form-item  :label="'订单日期'" prop="thetimes">
+            <el-form-item :label="'订单日期'" prop="thetimes">
               <el-date-picker
                 v-model="queryParams.thetimes"
-                @change="changeTime"
                 value-format="yyyy-MM-dd"
                 type="daterange"
                 :clearable="false"
                 :range-separator="'至'"
                 :start-placeholder="'开始日期'"
                 :end-placeholder="'结束日期'"
-              >
-              </el-date-picker>
+                @change="changeTime"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -126,11 +125,9 @@
                   }
                 "
               >
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button class="my_reset" @click="reChongzhi">
-                {{ '重置' }}</el-button
-              >
+                {{ '重置' }}</el-button>
             </div>
           </el-col>
         </el-row>
@@ -140,21 +137,19 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button size="small" class="thebtn1" @click="handleExport">
-            {{ '导出' }}</el-button
-          >
+            {{ '导出' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           height="680px"
           style="width: 100%"
           :header-cell-style="{ background: '#EEEEEE' }"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column prop="colsele" type="selection" width="55">
-          </el-table-column>
+          <el-table-column prop="colsele" type="selection" width="55" />
 
           <el-table-column
             align="center"
@@ -166,7 +161,7 @@
                 style="width: 44px; height: 44px; border-radius: 50%"
                 :src="scope.row.nationalFlag"
                 alt=""
-              />
+              >
             </template>
           </el-table-column>
 
@@ -175,74 +170,63 @@
             prop="shortName"
             :label="'国家'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberCode"
             :label="'会员编号'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberName"
             :label="'会员姓名'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
 
           <el-table-column
             align="center"
             prop="phone"
             :label="'联系方式'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="awardsName"
             :label="'荣誉奖衔'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="vertexName"
             :label="'隶属体系'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="teamCodeName"
             :label="'隶属团队'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="leftNewAddAmount"
             :label="'左区新增金额'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="rightNewAddAmount"
             :label="'右区新增金额'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="leftNewAddAchieve"
             min-width="100px"
             :label="'左区新增业绩' + `(PV)`"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="rightNewAddAchieve"
             min-width="100px"
             :label="'右区新增业绩' + `(PV)`"
-          >
-          </el-table-column>
+          />
           <!-- <el-table-column
             min-width="120px"
             align="center"
@@ -262,35 +246,36 @@
     />
   </div>
 </template>
-    
-        <script>
-import topBar from "@/components/topBar";
-import * as sta from "@/api/statistics";
-import * as log from "@/api/logistics";
-import { getAwardsListChiose } from "@/api/level";
-import { getcountryAllList } from "@/api/exchangerate";
-import { getvertexValue, getmemberTeamList } from "@/api/financialCase";
-import { isLocals, isLocalSymbol } from "@/utils/numberToCurrency";
+
+<script>
+import topBar from '@/components/topBar'
+import * as sta from '@/api/statistics'
+import * as log from '@/api/logistics'
+import { getAwardsListChiose } from '@/api/level'
+import { getcountryAllList } from '@/api/exchangerate'
+import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
+import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
+import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
 export default {
-  name: "UnderPlacementPer",
+  name: 'UnderPlacementPer',
   components: {
-    topBar,
+    topBar
   },
   data() {
     return {
-      moren: "underPlacementPer",
+      moren: 'underPlacementPer',
       topList: [
         {
           name: '伞下新增安置业绩',
-          path: "underPlacementPer",
-        },
+          path: 'underPlacementPer'
+        }
       ],
       tableData: [],
-      loading:false,
+      loading: false,
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
+        thetimes: []
       },
       total: 0,
       multipleSelection: [],
@@ -298,105 +283,85 @@ export default {
       memberTeamList: [],
       vertexList: [],
       countryList: [],
-      orderTypeList: [],
-    };
+      orderTypeList: []
+    }
   },
   created() {
-    this.getSearch();
-    this.getOthers();
-    var s1 = this.getStartTime();
-    var s2 = this.getEndTime();
-    this.queryParams.startPayTime = s1;
-    this.queryParams.endPayTime = s2;
-    this.queryParams.thetimes = [s1, s2];
+    this.getSearch()
+    this.getOthers()
+    const [s1, s2] = getMonthFirstDayAndBeforeDay()
+    this.queryParams.startPayTime = s1
+    this.queryParams.endPayTime = s2
+    this.queryParams.thetimes = [s1, s2]
   },
   methods: {
     isLocalSymbol,
     isLocals,
-    getStartTime() {
-      const date = new Date();
-      date.setDate(1); // 将当前时间的日期设置成第一天
-      const year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day;
-    },
-    getEndTime() {
-      let date = new Date();
-      let year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day + " ";
-    },
+
     changeTime(val) {
-      this.queryParams.startPayTime = val[0];
-      this.queryParams.endPayTime = val[1];
+      this.queryParams.startPayTime = val[0]
+      this.queryParams.endPayTime = val[1]
     },
     getOthers() {
       getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows;
-      });
+        this.awardsList = res.rows
+      })
       getmemberTeamList().then((res) => {
-        this.memberTeamList = res.rows;
-      });
+        this.memberTeamList = res.rows
+      })
       getvertexValue().then((res) => {
-        this.vertexList = res.data;
-      });
+        this.vertexList = res.data
+      })
       getcountryAllList().then((res) => {
-        this.countryList = res.data;
-      });
+        this.countryList = res.data
+      })
       // 获取订单类型
       log.getUnderAddOrderType().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
     },
-    //导出
+    // 导出
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/report/manager/member-report/member-resettle-achieve-export",
+          '/report/manager/member-report/member-resettle-achieve-export',
           { ...this.queryParams },
           `${'伞下新增安置业绩'}${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     reChongzhi() {
       this.queryParams = {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
-      };
-      this.getSearch();
+        thetimes: []
+      }
+      this.getSearch()
     },
     getSearch() {
       this.loading = true
       sta.getResettleAchieve(this.queryParams).then((res) => {
         this.loading = false
         if (res.code == 200) {
-          this.tableData = res.rows;
-          this.total = res.total;
-          
+          this.tableData = res.rows
+          this.total = res.total
         }
-      });
+      })
     },
     getCzNum() {
-      this.queryParams.pageNum = 1;
-    },
-  },
-};
+      this.queryParams.pageNum = 1
+    }
+  }
+}
 </script>
-    
+
     <style lang="scss" scoped>
 ::v-deep .el-image-viewer__close {
   right: 500px;
@@ -469,4 +434,3 @@ export default {
   }
 }
 </style>
-    
\ No newline at end of file
diff --git a/src/views/statistics/underPlacementPerNew.vue b/src/views/statistics/underPlacementPerNew.vue
index 2d22be4..753b4bb 100644
--- a/src/views/statistics/underPlacementPerNew.vue
+++ b/src/views/statistics/underPlacementPerNew.vue
@@ -2,36 +2,36 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="thetopbox">
       <el-form label-width="100px">
         <el-row>
           <el-col :span="4">
             <el-form-item :label="'会员编号'" prop="memberCode">
-              <el-input clearable v-model="queryParams.memberCode"></el-input>
+              <el-input v-model="queryParams.memberCode" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'会员姓名'" prop="memberName">
-              <el-input clearable v-model="queryParams.memberName"></el-input>
+              <el-input v-model="queryParams.memberName" clearable />
             </el-form-item>
           </el-col>
 
           <el-col :span="4">
             <el-form-item :label="'订单类型'" prop="orderType">
               <el-select
+                v-model="queryParams.orderType"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.orderType"
               >
                 <el-option
                   v-for="item in orderTypeList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -39,48 +39,48 @@
           <el-col :span="4">
             <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
               <el-select
+                v-model="queryParams.pkAwards"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkAwards"
               >
                 <el-option
                   v-for="item in awardsList"
                   :key="item.pkId"
                   :label="item.awardsName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'隶属体系'" prop="pkVertex">
               <el-select
+                v-model="queryParams.pkVertex"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkVertex"
               >
                 <el-option
                   v-for="item in vertexList"
                   :key="item.pkId"
                   :label="item.vertexName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'隶属团队'" prop="pkTeamCode">
               <el-select
+                v-model="queryParams.pkTeamCode"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkTeamCode"
               >
                 <el-option
                   v-for="item in memberTeamList"
                   :key="item.pkId"
                   :label="item.teamName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -104,15 +104,14 @@
             <el-form-item :label="'订单日期'" prop="thetimes">
               <el-date-picker
                 v-model="queryParams.thetimes"
-                @change="changeTime"
                 value-format="yyyy-MM-dd"
                 type="daterange"
                 :clearable="false"
                 :range-separator="'至'"
                 :start-placeholder="'开始日期'"
                 :end-placeholder="'结束日期'"
-              >
-              </el-date-picker>
+                @change="changeTime"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -126,11 +125,9 @@
                   }
                 "
               >
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button class="my_reset" @click="reChongzhi">
-                {{ '重置' }}</el-button
-              >
+                {{ '重置' }}</el-button>
             </div>
           </el-col>
         </el-row>
@@ -140,21 +137,19 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button size="small" class="thebtn1" @click="handleExport">
-            {{ '导出' }}</el-button
-          >
+            {{ '导出' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           height="680px"
           style="width: 100%"
           :header-cell-style="{ background: '#EEEEEE' }"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column prop="colsele" type="selection" width="55">
-          </el-table-column>
+          <el-table-column prop="colsele" type="selection" width="55" />
 
           <el-table-column
             align="center"
@@ -166,7 +161,7 @@
                 style="width: 44px; height: 44px; border-radius: 50%"
                 :src="scope.row.nationalFlag"
                 alt=""
-              />
+              >
             </template>
           </el-table-column>
 
@@ -175,74 +170,63 @@
             prop="shortName"
             :label="'国家'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberCode"
             :label="'会员编号'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberName"
             :label="'会员姓名'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
 
           <el-table-column
             align="center"
             prop="phone"
             :label="'联系方式'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="awardsName"
             :label="'荣誉奖衔'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="vertexName"
             :label="'隶属体系'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="teamCodeName"
             :label="'隶属团队'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="leftNewAddAmount"
             :label="'左区新增金额'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="rightNewAddAmount"
             :label="'右区新增金额'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="leftNewAddAchieve"
             min-width="100px"
             :label="'左区新增业绩' + `(PV)`"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="rightNewAddAchieve"
             min-width="100px"
             :label="'右区新增业绩' + `(PV)`"
-          >
-          </el-table-column>
+          />
           <!-- <el-table-column
               min-width="120px"
               align="center"
@@ -262,35 +246,36 @@
     />
   </div>
 </template>
-      
-          <script>
-import topBar from "@/components/topBar";
-import * as sta from "@/api/statistics";
-import * as log from "@/api/logistics";
-import { getAwardsListChiose } from "@/api/level";
-import { getcountryAllList } from "@/api/exchangerate";
-import { getvertexValue, getmemberTeamList } from "@/api/financialCase";
-import { isLocals, isLocalSymbol } from "@/utils/numberToCurrency";
+
+<script>
+import topBar from '@/components/topBar'
+import * as sta from '@/api/statistics'
+import * as log from '@/api/logistics'
+import { getAwardsListChiose } from '@/api/level'
+import { getcountryAllList } from '@/api/exchangerate'
+import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
+import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
+import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
 export default {
-  name: "UnderPlacementPerNew",
+  name: 'UnderPlacementPerNew',
   components: {
-    topBar,
+    topBar
   },
   data() {
     return {
-      moren: "underPlacementPerNew",
+      moren: 'underPlacementPerNew',
       topList: [
         {
-          name: "伞下新増安置业绩（新）",
-          path: "underPlacementPerNew",
-        },
+          name: '伞下新増安置业绩（新）',
+          path: 'underPlacementPerNew'
+        }
       ],
       tableData: [],
-      loading:false,
+      loading: false,
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
+        thetimes: []
       },
       total: 0,
       multipleSelection: [],
@@ -298,105 +283,103 @@ export default {
       memberTeamList: [],
       vertexList: [],
       countryList: [],
-      orderTypeList: [],
-    };
+      orderTypeList: []
+    }
   },
   created() {
-    this.getSearch();
-    this.getOthers();
-    var s1 = this.getStartTime();
-    var s2 = this.getEndTime();
-    this.queryParams.startPayTime = s1;
-    this.queryParams.endPayTime = s2;
-    this.queryParams.thetimes = [s1, s2];
+    this.getSearch()
+    this.getOthers()
+    const [s1, s2] = getMonthFirstDayAndBeforeDay()
+    this.queryParams.startPayTime = s1
+    this.queryParams.endPayTime = s2
+    this.queryParams.thetimes = [s1, s2]
   },
   methods: {
     isLocalSymbol,
     isLocals,
     getStartTime() {
-      const date = new Date();
-      date.setDate(1); // 将当前时间的日期设置成第一天
-      const year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day;
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
     },
     getEndTime() {
-      let date = new Date();
-      let year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day + " ";
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
     },
     changeTime(val) {
-      this.queryParams.startPayTime = val[0];
-      this.queryParams.endPayTime = val[1];
+      this.queryParams.startPayTime = val[0]
+      this.queryParams.endPayTime = val[1]
     },
     getOthers() {
       getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows;
-      });
+        this.awardsList = res.rows
+      })
       getmemberTeamList().then((res) => {
-        this.memberTeamList = res.rows;
-      });
+        this.memberTeamList = res.rows
+      })
       getvertexValue().then((res) => {
-        this.vertexList = res.data;
-      });
+        this.vertexList = res.data
+      })
       getcountryAllList().then((res) => {
-        this.countryList = res.data;
-      });
+        this.countryList = res.data
+      })
       // 获取订单类型
       log.getUnderAddOrderTypeNew().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
     },
-    //导出
+    // 导出
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/report/manager/member-report/member-resettle-achieve_up_export",
+          '/report/manager/member-report/member-resettle-achieve_up_export',
           { ...this.queryParams },
           `伞下新増安置业绩（新）${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     reChongzhi() {
       this.queryParams = {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
-      };
-      this.getSearch();
+        thetimes: []
+      }
+      this.getSearch()
     },
     getSearch() {
       this.loading = true
       sta.getResettleAchieveNew(this.queryParams).then((res) => {
         this.loading = false
         if (res.code == 200) {
-          this.tableData = res.rows;
-          this.total = res.total;
-          
+          this.tableData = res.rows
+          this.total = res.total
         }
-      });
+      })
     },
     getCzNum() {
-      this.queryParams.pageNum = 1;
-    },
-  },
-};
+      this.queryParams.pageNum = 1
+    }
+  }
+}
 </script>
-      
+
       <style lang="scss" scoped>
 ::v-deep .el-image-viewer__close {
   right: 500px;
@@ -469,4 +452,3 @@ export default {
   }
 }
 </style>
-      
\ No newline at end of file

From 8f6231461f1ad3044c404e04fd899365bf451c2e Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Fri, 24 Oct 2025 10:23:39 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat(arch):=20=E9=98=B6=E6=AE=B5=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84=E6=96=B9=E6=A1=88=E4=B8=80=E6=A0=B9=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=9A=E5=91=98=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/framework/architecture/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue
index 03404b4..c9a904b 100644
--- a/src/views/framework/architecture/index.vue
+++ b/src/views/framework/architecture/index.vue
@@ -318,8 +318,8 @@ export default {
                       <span class='value'>{data.memberCode}</span></div>
                     <div class='member-name info-row'><span class='label'>会员名称：</span>
                       <span class='value'>{data.memberName}</span></div>
-                    {data.parentId !== '0' && <div class='member-point info-row'><span class='label'>会员点位：</span>
-                      <span class='value'>{ data.pointMember }</span></div>}
+                    <div class='member-point info-row'><span class='label'>会员点位：</span>
+                      <span class='value'>{ data.pointMember }</span></div>
                   </div>
                 </div>
               ) : (

From fa33642e5b68570fd872a4d667d0f762d887a3be Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 27 Oct 2025 15:46:32 +0800
Subject: [PATCH 3/5] =?UTF-8?q?##=20=E5=A5=96=E9=87=91=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E3=80=81=E5=A5=96=E9=87=91=E6=B1=87=E6=80=BB=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B5=A0=E5=93=81=E7=A7=AF=E5=88=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlementCenter/bonusDetail/index.vue    | 22 +++++++++++++------
 .../settlementCenter/totalBonus/index.vue     | 22 +++++++++++++------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue
index c89d00d..309ec75 100644
--- a/src/views/settlementCenter/bonusDetail/index.vue
+++ b/src/views/settlementCenter/bonusDetail/index.vue
@@ -181,12 +181,12 @@
               width="130"
               :label="'结算日期'"
             />
-            <el-table-column
-              align="center"
-              prop="directIncome"
-              :label="$t('直推收益')"
-              :formatter="stateFormat"
-            />
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              prop="directIncome"-->
+<!--              :label="$t('直推收益')"-->
+<!--              :formatter="stateFormat"-->
+<!--            />-->
             <el-table-column
               align="center"
               prop="storeIncome"
@@ -215,10 +215,18 @@
             <el-table-column
               align="center"
               prop="realIncomeTotal"
-              width="130"
+              width="150"
               :formatter="stateFormat"
               :label="'实发收益总计'"
             />
+
+            <el-table-column
+              align="center"
+              prop="backPoints"
+              width="150"
+              :formatter="stateFormat"
+              :label="'赠品积分'"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/settlementCenter/totalBonus/index.vue b/src/views/settlementCenter/totalBonus/index.vue
index 191663c..34271bc 100644
--- a/src/views/settlementCenter/totalBonus/index.vue
+++ b/src/views/settlementCenter/totalBonus/index.vue
@@ -162,12 +162,12 @@
               width="200"
               :label="'结算时间'"
             />
-            <el-table-column
-              align="center"
-              prop="directIncome"
-              :label="$t('直推收益')"
-              :formatter="stateFormat"
-            />
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              prop="directIncome"-->
+<!--              :label="$t('直推收益')"-->
+<!--              :formatter="stateFormat"-->
+<!--            />-->
             <el-table-column
               align="center"
               prop="storeIncome"
@@ -196,10 +196,18 @@
               v-if="allTxt.realIncomeTotal"
               align="center"
               prop="realIncomeTotal"
-              width="130"
+              width="150"
               :label="'实发收益总计'"
               :formatter="stateFormat"
             />
+            <el-table-column
+              v-if="allTxt.backPoints"
+              align="center"
+              prop="backPoints"
+              width="150"
+              :label="'赠品积分'"
+              :formatter="stateFormat"
+            />
             <el-table-column
               align="center"
               prop="time"

From 0295fbb6a410a7bbfeb0c285ecb292a4a654e273 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 27 Oct 2025 17:00:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat(performaceTotal):=20=20=E5=A5=96?=
 =?UTF-8?q?=E9=87=91=E4=B8=93=E5=8C=BA=E5=88=97=E6=94=B9=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=A0=E5=93=81=E4=B8=93=E5=8C=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performanceTotal/index.vue                | 23 ++++++++++---
 .../settlementCenter/topPerformance/index.vue | 32 +++++++++----------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/views/settlementCenter/performanceTotal/index.vue b/src/views/settlementCenter/performanceTotal/index.vue
index f9074c6..943f965 100644
--- a/src/views/settlementCenter/performanceTotal/index.vue
+++ b/src/views/settlementCenter/performanceTotal/index.vue
@@ -172,14 +172,14 @@
               prop="upgradeAmount"
               :formatter="stateFormat"
               width="160"
-              :label="'甄选金额'"
+              :label="'复购金额'"
             />
             <el-table-column
               align="center"
               prop="upgradePv"
               :formatter="stateFormat"
               width="160"
-              :label="'甄选业绩'"
+              :label="'复购业绩'"
             />
 
             <el-table-column
@@ -187,7 +187,7 @@
               prop="repurchaseAmount"
               :formatter="stateFormat"
               width="160"
-              :label="'商城金额'"
+              :label="'甄选金额'"
             />
 
             <el-table-column
@@ -195,7 +195,7 @@
               prop="repurchasePv"
               :formatter="stateFormat"
               width="160"
-              :label="'商城业绩'"
+              :label="'甄选业绩'"
             />
 
             <el-table-column
@@ -213,6 +213,21 @@
               width="150"
               :label="'五折业绩'"
             />
+            <el-table-column
+              align="center"
+              prop="giftPointAmount"
+              :formatter="stateFormat"
+              width="160"
+              :label="'赠品金额'"
+            />
+
+            <el-table-column
+              align="center"
+              prop="giftPointPv"
+              :formatter="stateFormat"
+              width="150"
+              :label="'赠品业绩'"
+            />
 
             <el-table-column
               align="center"
diff --git a/src/views/settlementCenter/topPerformance/index.vue b/src/views/settlementCenter/topPerformance/index.vue
index 222706f..a1b1e01 100644
--- a/src/views/settlementCenter/topPerformance/index.vue
+++ b/src/views/settlementCenter/topPerformance/index.vue
@@ -243,14 +243,14 @@ export default {
         },
         {
           id: 5,
-          text: `${'商城专区'}`,
+          text: `${'甄选专区'}`,
           checked: true,
           prop: 'mainRepurAmount',
           total: 'mainRepurAmount'
         },
         {
           id: 6,
-          text: `${'五折专区'}`,
+          text: '五折专区',
           checked: true,
           prop: 'retailConsumeAmount',
           total: 'retailConsumeAmount'
@@ -262,20 +262,20 @@ export default {
           prop: 'totalAmount',
           total: 'totalAmount'
         },
-        {
-          id: 8,
-          text: `${'直推收益'}`,
-          checked: true,
-          prop: 'introduceBonus',
-          total: 'introduceBonus'
-        },
-        {
-          id: 9,
-          text: `${'直推收益拨比(%)'}`,
-          checked: true,
-          prop: 'introduceBonusRate',
-          total: 'introduceBonusRate'
-        },
+        // {
+        //   id: 8,
+        //   text: `${'直推收益'}`,
+        //   checked: true,
+        //   prop: 'introduceBonus',
+        //   total: 'introduceBonus'
+        // },
+        // {
+        //   id: 9,
+        //   text: `${'直推收益拨比(%)'}`,
+        //   checked: true,
+        //   prop: 'introduceBonusRate',
+        //   total: 'introduceBonusRate'
+        // },
         {
           id: 10,
           text: `${'阶段收益'}`,

From 7954610c6fbcc0c94b5a257202e21de56157e37b Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 27 Oct 2025 17:14:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat(member):=20=E4=BC=9A=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/member/index.vue | 32 ++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue
index cbffd16..099936c 100644
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@@ -45,6 +45,22 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="会员等级" prop="pkSettleGrade">
+              <el-select
+                v-model="queryParams.pkSettleGrade"
+                clearable
+                :placeholder="'请选择'"
+              >
+                <el-option
+                  v-for="item in gradeRangList"
+                  :key="item.pkId"
+                  :label="item.gradeName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="$t('荣誉奖衔')" prop="pkAwards">
               <el-select
@@ -319,6 +335,12 @@
             :label="'会员姓名'"
             width="180"
           />
+          <el-table-column
+            align="center"
+            prop="pkSettleGradeVal"
+            label="会员等级"
+            width="160"
+          />
           <el-table-column
             v-if="allTxt.pkAwardsVal"
             align="center"
@@ -565,7 +587,8 @@ import {
 } from '@/api/member'
 import {
   getAwardsListChiose,
-  getRegistration
+  getRegistration,
+  getgradeRanglist
 } from '@/api/level'
 import { teamList } from '@/api/business'
 import { getRoleMenu } from '@/api/notice'
@@ -744,7 +767,7 @@ export default {
   created() {
     // 查询会员信息
     this.getMemberList()
-
+    this.getgradeRanglist()
     this.getAwardsListChiose()
     this.getvertexValue()
     this.getmemberTeamList()
@@ -876,6 +899,11 @@ export default {
         })
       }
     },
+    getgradeRanglist() {
+      getgradeRanglist().then((res) => {
+        this.gradeRangList = res.data
+      })
+    },
 
     // 查询会员信息
     getMemberList() {