From a67bc0f9f3f581643efb9a3d35d4dbfe8f37fc2a Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 6 Jun 2025 10:42:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E6=97=A7=E6=B1=87?=
 =?UTF-8?q?=E4=BB=98=E3=80=81=E5=AE=9D=E4=BB=98=E6=94=AF=E4=BB=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/configManage/paySet/index.vue | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/configManage/paySet/index.vue b/src/views/configManage/paySet/index.vue
index 7300e84..a3e7b49 100644
--- a/src/views/configManage/paySet/index.vue
+++ b/src/views/configManage/paySet/index.vue
@@ -27,14 +27,14 @@
                        border>京东收银台（H5）</el-checkbox>
           <el-checkbox v-model="formData.pay6"
                        border>京东收银台（PC）</el-checkbox>
-          <el-checkbox v-model="formData.pay11"
-                       border>宝付微信</el-checkbox>
-          <el-checkbox v-model="formData.pay12"
-                       border>宝付微信扫码</el-checkbox>
-          <el-checkbox v-model="formData.pay13"
-                       border>汇付微信</el-checkbox>
-          <el-checkbox v-model="formData.pay15"
-                       border>汇付银行卡</el-checkbox>
+<!--          <el-checkbox v-model="formData.pay11"-->
+<!--                       border>宝付微信</el-checkbox>-->
+<!--          <el-checkbox v-model="formData.pay12"-->
+<!--                       border>宝付微信扫码</el-checkbox>-->
+<!--          <el-checkbox v-model="formData.pay13"-->
+<!--                       border>汇付微信</el-checkbox>-->
+<!--          <el-checkbox v-model="formData.pay15"-->
+<!--                       border>汇付银行卡</el-checkbox>-->
 <!--          <el-checkbox v-model="formData.pay20"-->
 <!--                       border>微信APP</el-checkbox>-->
           <el-checkbox v-model="formData.pay32"
@@ -78,10 +78,10 @@ export default {
         // pay4: false,
         pay5: false,
         pay6: false,
-        pay11: false,
-        pay12: false,
-        pay13: false,
-        pay15: false,
+        // pay11: false,
+        // pay12: false,
+        // pay13: false,
+        // pay15: false,
         pay20: false,
         pay32: false,
         pay33: false,
@@ -112,10 +112,10 @@ export default {
           // pay4: res.data.pay4,
           pay5: res.data.pay5,
           pay6: res.data.pay6,
-          pay11: res.data.pay11,
-          pay12: res.data.pay12,
-          pay13: res.data.pay13,
-          pay15: res.data.pay15,
+          // pay11: res.data.pay11,
+          // pay12: res.data.pay12,
+          // pay13: res.data.pay13,
+          // pay15: res.data.pay15,
           pay20: res.data.pay20,
           pay32: res.data.pay32,
           pay33: res.data.pay33,

From 35abf971105ce12ca449ff4bd2cb6a0e1532b669 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 17 Jun 2025 13:27:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(commodity):=20=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=9A=B6=E5=B1=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logistics/commodity/ckspdd.vue | 32 ++++++++++++--
 src/views/logistics/commodity/index.vue  | 54 ++++++++++++++++++------
 2 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/src/views/logistics/commodity/ckspdd.vue b/src/views/logistics/commodity/ckspdd.vue
index a2b368e..90c1d8d 100644
--- a/src/views/logistics/commodity/ckspdd.vue
+++ b/src/views/logistics/commodity/ckspdd.vue
@@ -54,6 +54,21 @@
               <el-input v-model="queryParams.memberName" clearable />
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'隶属体系'" prop="vertexId">
+              <el-select
+                v-model="queryParams.vertexId"
+                clearable
+              >
+                <el-option
+                  v-for="item in vertexList"
+                  :key="item.pkId"
+                  :label="item.vertexName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="'联系方式'" prop="phone">
               <el-input v-model="queryParams.phone" clearable />
@@ -321,6 +336,12 @@
             prop="memberName"
             :label="'会员姓名'"
           />
+          <el-table-column
+            align="center"
+            prop="vertexName"
+            :label="'隶属体系'"
+            min-width="120"
+          />
           <el-table-column
             align="center"
             min-width="120px"
@@ -475,7 +496,7 @@ import topBar from '@/components/topBar'
 import * as log from '@/api/logistics'
 import * as del from '@/api/delivery'
 import { getStatus } from '@/api/notice'
-
+import { getVartexList } from '@/api/affiliatedteam'
 export default {
   name: 'Ckspdd',
   components: {
@@ -507,14 +528,16 @@ export default {
         pageNum: 1,
         pageSize: 50,
         orderCode: '',
-        orderStatus: ''
+        orderStatus: '',
+        vertexId: ''
       },
       orderStatusList: [],
       tableData: [],
       orderTypeList: [],
       shippingTypeList: [],
       payTypeList: [],
-      total: 0
+      total: 0,
+      vertexList: []
     }
   },
   created() {
@@ -522,6 +545,9 @@ export default {
     this.getOthers()
     this.getSearch()
     this.getOrderStatus()
+    getVartexList().then((res) => {
+      this.vertexList = res.data
+    })
   },
   methods: {
     getOrderStatus() {
diff --git a/src/views/logistics/commodity/index.vue b/src/views/logistics/commodity/index.vue
index ef8f1ab..bd64976 100644
--- a/src/views/logistics/commodity/index.vue
+++ b/src/views/logistics/commodity/index.vue
@@ -19,7 +19,21 @@
               <el-input v-model="queryParams.memberName" clearable />
             </el-form-item>
           </el-col>
-
+          <el-col :span="4">
+            <el-form-item :label="'隶属体系'" prop="vertexId">
+              <el-select
+                v-model="queryParams.vertexId"
+                clearable
+              >
+                <el-option
+                  v-for="item in vertexList"
+                  :key="item.pkId"
+                  :label="item.vertexName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="'联系方式'" prop="phone">
               <el-input v-model="queryParams.phone" clearable />
@@ -58,8 +72,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+
           <el-col :span="4">
             <el-form-item :label="'收货人'" prop="recName">
               <el-input v-model="queryParams.recName" clearable />
@@ -97,20 +110,21 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item
-              :label="`${'购买人' + '姓名'}`"
-              prop="buyMemberName"
-            >
-              <el-input
-                v-model="queryParams.buyMemberName"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
+
         </el-row>
         <el-collapse-transition>
           <el-row v-show="isActive">
+            <el-col :span="4">
+              <el-form-item
+                :label="`${'购买人' + '姓名'}`"
+                prop="buyMemberName"
+              >
+                <el-input
+                  v-model="queryParams.buyMemberName"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item :label="'支付方式'" prop="payType">
                 <el-select
@@ -236,6 +250,12 @@
             prop="memberCode"
             :label="'会员编号'"
           />
+          <el-table-column
+            align="center"
+            prop="vertexName"
+            :label="'隶属体系'"
+            min-width="120"
+          />
           <el-table-column
             v-if="dataList[3].key"
             align="center"
@@ -410,6 +430,7 @@
 import topBar from '@/components/topBar'
 import * as log from '@/api/logistics'
 import * as api from '@/api/site.js'
+import { getVartexList } from '@/api/affiliatedteam'
 import { getRoleMenu, roleDetails, getStatus } from '@/api/notice'
 export default {
   name: 'Spdd',
@@ -419,6 +440,7 @@ export default {
   data() {
     return {
       moren: 'spdd',
+      vertexList: [],
       dataList: [
         {
           name: 'orderCode',
@@ -523,6 +545,7 @@ export default {
 
       multipleSelection: [],
       queryParams: {
+        vertexId: '',
         pageNum: 1,
         pageSize: 50,
         shoppingAddress: [],
@@ -623,6 +646,9 @@ export default {
       log.getOrderPayType().then((res) => {
         this.paywayList = res.data
       })
+      getVartexList().then((res) => {
+        this.vertexList = res.data
+      })
     },
     // 展开折叠
     changeActive() {

From b3a378f3b7e3629a4891685d18c34b8db7df29aa Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 17 Jun 2025 13:42:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(topPerformance):=20=E9=A1=B6=E7=82=B9?=
 =?UTF-8?q?=E5=A5=96=E9=87=91=E6=8B=A8=E6=AF=94=E5=88=97=E8=A1=A8=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=94=B9=E5=90=8D=E5=8F=8A=E5=88=97=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlementCenter/topPerformance/index.vue | 12 +++++-----
 vue.config.js                                 | 22 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/settlementCenter/topPerformance/index.vue b/src/views/settlementCenter/topPerformance/index.vue
index 881db92..df4a776 100644
--- a/src/views/settlementCenter/topPerformance/index.vue
+++ b/src/views/settlementCenter/topPerformance/index.vue
@@ -46,7 +46,7 @@
           </el-col> -->
 
           <el-col :span="8">
-            <el-form-item :label="'业绩时间'">
+            <el-form-item :label="'统计时间'">
               <el-date-picker
                 v-model="creationTime"
                 value-format="yyyy-MM-dd"
@@ -59,7 +59,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="顶点">
+            <el-form-item label="系统编号">
               <el-select v-model="select.pkVertex">
                 <el-option
                   v-for="item in verList"
@@ -192,13 +192,13 @@ export default {
         },
         {
           id: 31,
-          text: '顶点名称',
+          text: '系统名称',
           checked: true,
           prop: 'memberName'
         },
         {
           id: 27,
-          text: '业绩时间',
+          text: '统计时间',
           checked: false,
           prop: 'creationTime'
         },
@@ -374,7 +374,7 @@ export default {
       moren: '/settlementCenter/topPerformance',
       topList: [
         {
-          name: '顶点奖金拨比列表统计',
+          name: '零线系统拨比统计',
           path: '/settlementCenter/topPerformance',
           url: 'topPerformance',
           changed: false
@@ -515,7 +515,7 @@ export default {
         this.download(
           '/member/manage/bonus-vertex-statis/export',
           Object.assign({}, this.queryParams, this.select),
-          `顶点奖金拨比列表统计-${new Date().getTime()}.xlsx`
+          `零线系统拨比统计-${new Date().getTime()}.xlsx`
         )
       })
     },
diff --git a/vue.config.js b/vue.config.js
index 7308d63..788cbd7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,21 +42,21 @@ module.exports = {
       warnings: false,
       errors: true
     },
-    // proxy: {
-    //   '/prod-api': {
-    //     target: 'http://localhost:8080/',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       '^/prod-api': ''
-    //     }
-    //   }
-    // }
     proxy: {
       '/prod-api': {
-        target: 'http://t-mana.beida413.com/',
-        changeOrigin: true
+        target: 'http://localhost:8080/',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/prod-api': ''
+        }
       }
     }
+    // proxy: {
+    //   '/prod-api': {
+    //     target: 'http://t-mana.beida413.com/',
+    //     changeOrigin: true
+    //   }
+    // }
     // before: require('./mock/mock-server.js')
   },
   configureWebpack: {