From 6e866cac0ec684c0725cbc6f1047d2cd520ceffa Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Mon, 7 Jul 2025 16:07:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B9=E4=BB=B7=E5=92=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js                              | 2 +-
 src/views/modules/datacenter/customer-analysis/index.vue  | 3 ++-
 .../operation-management/commodity/popup/add-price.vue    | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index ce219c1..c7fb203 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -46,7 +46,7 @@ export const mer_admin = {
   },
   //商品分页
   getProductPage: (data) => {
-    return $http.post(`/merchant-api/product/page`, data);
+    return $http.post(`/merchant-api/product/page?pageNumber=${data.p.pageNumber}&pageSize=${data.p.pageSize}`, data);
   },
   //商品概况
   getProductOverview: (data) => {
diff --git a/src/views/modules/datacenter/customer-analysis/index.vue b/src/views/modules/datacenter/customer-analysis/index.vue
index 0d9d0a8..1a7e9d2 100644
--- a/src/views/modules/datacenter/customer-analysis/index.vue
+++ b/src/views/modules/datacenter/customer-analysis/index.vue
@@ -266,6 +266,7 @@ export default {
           新客数量: row.newPeopleCount,
           支付订单人数: row.payCount,
           支付订单转化率: row.payConversion,
+          客户复购率: row.repurchaseRate
         },
       ];
       const workbook = XLSX.utils.book_new();
@@ -324,4 +325,4 @@ export default {
   color: #969696;
   margin-bottom: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/operation-management/commodity/popup/add-price.vue b/src/views/modules/operation-management/commodity/popup/add-price.vue
index 3fcafb6..0d31532 100644
--- a/src/views/modules/operation-management/commodity/popup/add-price.vue
+++ b/src/views/modules/operation-management/commodity/popup/add-price.vue
@@ -103,7 +103,7 @@ export default {
             render: () => {
               return (
                 <el-input-number
-                  v-model={this.modalData.productSpecificationList[0].salePrice}
+                  v-model={this.modalData.productSpecificationList[0].marketPrice}
                   min={0}
                   label="描述文字"
                 ></el-input-number>
@@ -128,7 +128,7 @@ export default {
         },
         {
           title: "价格",
-          field: "salePrice",
+          field: "marketPrice",
           align: "center",
           type: "jsx",
           render: ({ row }) => {
@@ -137,7 +137,7 @@ export default {
                 <el-input-number
                   min={0}
                   size="small"
-                  v-model={row.salePrice}
+                  v-model={row.marketPrice}
                   placeholder="请输入数量"
                 ></el-input-number>
               </div>
@@ -187,4 +187,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
\ No newline at end of file
+</style>