Merge pull request 'master' (#12) from master into deploy

Reviewed-on: lin/ApiServer-Web-admin_dashboard_pc#12

src/views/product/ProductList.vue

@@ -155,8 +155,8 @@
         <el-form-item label="封面ID" prop="cover_id">
           <el-input-number v-model="productForm.cover_id" :min="0" placeholder="请输入封面ID" style="width: 100%" />
         </el-form-item>
-        <el-form-item label="库存控制" prop="inventoryControl">
+        <el-form-item label="库存控制" prop="inventory_control">
-          <el-switch v-model="productForm.inventoryControl" active-text="启用" inactive-text="禁用" />
+          <el-switch v-model="productForm.inventory_control" active-text="启用" inactive-text="禁用" />
         </el-form-item>
         <el-form-item label="库存数量" prop="inventory">
           <el-input-number v-model="productForm.inventory" :min="0" placeholder="请输入库存" style="width: 100%" />
@@ -406,9 +406,12 @@ const fetchProductList = async () => {
   try {
     const res = await getProductList(queryParams)
     if (res.data.code === 200) {
-      productList.value = res.data.data.data || []
+      const allData = res.data.data.data || []
-      productList.value = productList.value.filter(item => item.delete == false)
+      // 过滤掉已删除的数据
-      total.value = res.data.data.total || 0
+      productList.value = allData.filter(item => item.delete == false)
+      // 计算未删除数据的总数（API返回的all_count包含已删除的，需要减去已删除的数量）
+      const deletedCount = allData.filter(item => item.delete == true).length
+      total.value = (res.data.data.data.length || 0) - deletedCount
       productList.value = productList.value.map(item => {
         item.image = item.coverId ? getFileDetail({ file_id: item.coverId }).then(res => res.data.data.url) : ''
         return item
@@ -608,8 +611,8 @@ const submitForm = () => {
           price: productForm.price/100 || 0,
           pay_num: productForm.pay_num || 1,
           expire_time: productForm.expire_time || 0,
-          recommend_rebate: productForm.recommend_rebate || 0,
+          recommend_rebate: productForm.recommend_rebate || 0
-          inventory_control:productForm.inventoryControl
+          
 
         }