Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz

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();
     },
     // 获取销售额排行表格数据

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);

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">