From 5c10f30eaee79d97ca72bab1419d20ebcc50bc30 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 10 Oct 2024 16:33:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/home.vue        | 4 ++--
 src/views/product/add_shop.vue | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index f8046b8..4785e04 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -236,7 +236,7 @@
             <el-table-column label="金额" prop="salesAmount"></el-table-column>
           </el-table>
           <div class="head-container" style="padding-top: 20px;display: flex;justify-content: flex-end;">
-            <el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage"
+            <el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage + 1"
               @current-change="paginationChange" layout="total, prev, pager, next, jumper"></el-pagination>
           </div>
         </div>
@@ -767,7 +767,7 @@ export default {
       }
     },
     paginationChange(e) {
-      this.saleTablePage = e;
+      this.saleTablePage = e - 1;
       this.dateProduct();
     },
     // 获取销售额排行表格数据
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 8c460c2..c7e46e4 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -734,6 +734,11 @@ export default {
             specInfo[index].suit = item.suit;
             specInfo[index].stockNumber = item.stockNumber;
             specInfo[index].isGrounding = item.isGrounding;
+            specInfo[index].salePrice = item.salePrice;
+            specInfo[index].memberPrice = item.memberPrice;
+            specInfo[index].costPrice = item.costPrice;
+            specInfo[index].originPrice = item.originPrice;
+            specInfo[index].firstShared = item.firstShared;
             return specInfo[index];
           });
           console.log(this.form.skuList);

From 8d8def8e521f79d925e6f81c18a16d1526c37b94 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 11 Oct 2024 09:41:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/components/stockHistory.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/product/components/stockHistory.vue b/src/views/product/components/stockHistory.vue
index a07f500..190467c 100644
--- a/src/views/product/components/stockHistory.vue
+++ b/src/views/product/components/stockHistory.vue
@@ -14,6 +14,13 @@
                         {{ scope.row.leftNumber + scope.row.stockNumber }}
                     </template>
                 </el-table-column>
+                <el-table-column label="订单编号" prop="orderNo">
+                    <template v-slot="scope">
+                        <router-link :to="{ path: '/order_manage/order_list', query: { orderNo: scope.row.orderNo } }">
+                            <el-link type="primary">{{ scope.row.orderNo }}</el-link>
+                        </router-link>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作描述" prop="type"></el-table-column>
                 <el-table-column :label="`${keysList[key]}`" prop="">
                     <template v-slot="scope">