From c50758dcb88779ffac1446ce74b1901b0969c2d1 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Sat, 28 Jun 2025 00:40:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation-management/commodity/index.vue  | 288 +++++++++---------
 .../commodity/popup/add-or-update.vue         | 263 +++++++++-------
 2 files changed, 296 insertions(+), 255 deletions(-)

diff --git a/src/views/modules/operation-management/commodity/index.vue b/src/views/modules/operation-management/commodity/index.vue
index af7abed..854d9f6 100644
--- a/src/views/modules/operation-management/commodity/index.vue
+++ b/src/views/modules/operation-management/commodity/index.vue
@@ -158,45 +158,45 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
-import AddDiscount from './popup/add-discount.vue'
-import AddPrice from './popup/add-price.vue'
-import AddOrUpdate from './popup/add-or-update.vue'
-import addStock from './popup/add-stock.vue'
+import { mapState } from "vuex";
+import AddDiscount from "./popup/add-discount.vue";
+import AddPrice from "./popup/add-price.vue";
+import AddOrUpdate from "./popup/add-or-update.vue";
+import addStock from "./popup/add-stock.vue";
 export default {
   components: { AddOrUpdate, AddPrice, addStock, AddDiscount },
   data() {
     return {
-      activeName: '在售',
+      activeName: "在售",
       dataList: [],
       formInline: {
-        name: '',
-        marketId: '',
-        shopId: '',
+        name: "",
+        marketId: "",
+        shopId: "",
         isAdvanceSell: 0
       },
       tableProp: {
-        'auto-resize': true,
+        "auto-resize": true,
         border: true,
-        height: 'auto',
-        'row-id': 'id',
-        'show-overflow': false
+        height: "auto",
+        "row-id": "id",
+        "show-overflow": false
       },
-      productFilterType: 'SALE',
+      productFilterType: "SALE",
       selectList: [],
       overview: {}
-    }
+    };
   },
   created() {
     this.formInline = {
-      name: '',
+      name: "",
       marketId: this.marketId,
       shopId: this.shopId,
       isAdvanceSell: 0
-    }
+    };
     this.$nextTick(() => {
-      this.$refs.oTable.reload()
-    })
+      this.$refs.oTable.reload();
+    });
   },
   methods: {
     //如果有多个菜市场调用
@@ -211,33 +211,33 @@ export default {
       //   });
     },
     addProduct() {
-      this.$refs.addOrUpdate.toggle().add(this.formInline.shopId)
+      this.$refs.addOrUpdate.toggle().add(this.formInline.shopId);
     },
     deleteProduct() {
-      console.log(this.selectList)
+      console.log(this.selectList);
       let integers = this.selectList.map(item => {
-        return item.id
-      })
-      this.$confirm('此操作将删除该商品, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+        return item.id;
+      });
+      this.$confirm("此操作将删除该商品, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       })
         .then(() => {
-          console.log('111')
+          console.log("111");
           this.$api.mer_admin.BatchDeleteProducts(integers).then(res => {
-            this.$refs.oTable.reload()
-          })
+            this.$refs.oTable.reload();
+          });
         })
         .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
+            type: "info",
+            message: "已取消删除"
+          });
+        });
     },
     queryList(pageNo, pageSize) {
-      console.log(this.formInline)
+      console.log(this.formInline);
       this.$api.mer_admin
         .getProductPage({
           p: {
@@ -246,160 +246,160 @@ export default {
           },
           ...this.formInline,
           productFilterType: this.productFilterType,
-          merchantId: JSON.parse(sessionStorage.getItem('userInfo')).merchantId,
+          merchantId: JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
           productQuerySortParam: []
         })
         .then(res => {
-          console.log(res)
+          console.log(res);
           this.$refs.oTable.complete(
             res.data.data.data,
             Number(res.data.data.total)
-          )
+          );
         })
         .catch(err => {
-          this.$refs.oTable.complete(false)
-        })
+          this.$refs.oTable.complete(false);
+        });
       this.$api.mer_admin.getProductOverview(this.formInline).then(res => {
-        console.log(res, '概况')
-        this.overview = res.data.data
-      })
+        console.log(res, "概况");
+        this.overview = res.data.data;
+      });
     },
     Reset() {
       this.formInline = {
-        name: '',
+        name: "",
         marketId: this.marketId,
         shopId: this.shopId,
         isAdvanceSell: 0
-      }
-      this.$refs.oTable.reload()
+      };
+      this.$refs.oTable.reload();
     },
     handleClick() {
       switch (this.activeName) {
-        case '在售':
-          this.productFilterType = 'SALE'
-          break
-        case '仓库中':
-          this.productFilterType = 'WAREHOUSE'
-          break
-        case '折扣':
-          this.productFilterType = 'DISCOUNT'
-          break
+        case "在售":
+          this.productFilterType = "SALE";
+          break;
+        case "仓库中":
+          this.productFilterType = "WAREHOUSE";
+          break;
+        case "折扣":
+          this.productFilterType = "DISCOUNT";
+          break;
       }
-      this.$refs.oTable.reload()
+      this.$refs.oTable.reload();
     }
   },
   computed: {
     tableCols() {
       return [
-        { type: 'checkbox', width: '60px', fixed: 'left' },
+        { type: "checkbox", width: "60px", fixed: "left" },
         // { type: "seq", width: "60px", align: "center", title: "序号" },
         {
-          title: '商品图',
-          field: 'productPhotoList',
-          align: 'center',
-          width: '80px',
-          type: 'jsx',
+          title: "商品图",
+          field: "productPhotoList",
+          align: "center",
+          width: "80px",
+          type: "jsx",
           render: ({ row }) => {
             if (row.productPhotoList.length > 0) {
               return (
                 <el-image
                   preview-src-list={row.productPhotoList.map(item => {
-                    return item.url
+                    return item.url;
                   })}
                   src={row.productPhotoList[0].url}
                 ></el-image>
-              )
+              );
             } else {
-              return <span>暂无商品图</span>
+              return <span>暂无商品图</span>;
             }
           }
         },
         {
-          title: '商品名称',
-          align: 'center',
-          field: 'name'
+          title: "商品名称",
+          align: "center",
+          field: "name"
         },
         {
-          title: '商品售价',
-          align: 'center',
-          field: 'minSalePrice',
-          type: 'jsx',
+          title: "商品售价",
+          align: "center",
+          field: "minSalePrice",
+          type: "jsx",
           render: ({ row }) => {
             if (row.minSalePrice == row.maxSalePrice) {
-              return <span>￥{row.minSalePrice}</span>
+              return <span>￥{row.minSalePrice}</span>;
             } else {
               return (
                 <span>
                   ￥{row.minSalePrice}~￥{row.maxSalePrice}
                 </span>
-              )
+              );
             }
           }
         },
         {
-          title: '折扣',
-          align: 'center',
-          field: 'discountActivity',
-          type: 'jsx',
+          title: "折扣",
+          align: "center",
+          field: "discountActivity",
+          type: "jsx",
           render: ({ row }) => {
             if (row.discountActivity) {
-              return <span>{row.discountActivity.ruleObject.discount}折</span>
+              return <span>{row.discountActivity.ruleObject.discount}折</span>;
             }
           }
         },
         {
-          title: '销量',
-          align: 'center',
-          field: 'saleNum'
+          title: "销量",
+          align: "center",
+          field: "saleNum"
         },
         {
-          title: '库存',
-          align: 'center',
-          field: 'stockNum'
+          title: "库存",
+          align: "center",
+          field: "stockNum"
         },
         {
-          title: '是否为预售商品',
-          align: 'center',
-          field: 'isAdvanceSell',
-          type: 'jsx',
+          title: "是否为预售商品",
+          align: "center",
+          field: "isAdvanceSell",
+          type: "jsx",
           render: ({ row }) => {
-            return <span>{row.isAdvanceSell == 1 ? '是' : '否'}</span>
+            return <span>{row.isAdvanceSell == 1 ? "是" : "否"}</span>;
           }
         },
         {
-          title: '状态',
+          title: "状态",
           // fixed: "right",
-          type: 'jsx',
-          align: 'center',
-          'title-suffix': {
-            message: '点击上架/下架切换责任书状态',
-            icon: 'vxe-icon-question-circle-fill'
+          type: "jsx",
+          align: "center",
+          "title-suffix": {
+            message: "点击上架/下架切换责任书状态",
+            icon: "vxe-icon-question-circle-fill"
           },
           render: ({ row }) => {
             let Enable = () => {
               let data = {
                 ids: [row.id],
-                status: 'UP'
-              }
-              if (row.status == 'UP') {
-                data.status = 'DOWN'
+                status: "UP"
+              };
+              if (row.status == "UP") {
+                data.status = "DOWN";
               } else {
-                data.status = 'UP'
+                data.status = "UP";
               }
               this.$api.mer_admin.putOnShelvesProducts(data).then(res => {
-                console.log(res)
-                this.$refs.oTable.reload()
-              })
-            }
+                console.log(res);
+                this.$refs.oTable.reload();
+              });
+            };
             return (
               <el-popconfirm
                 title={
-                  row.status == 'DOWN'
-                    ? '当前为下架状态，是否更改为上架状态？'
-                    : '当前为上架状态，是否更改为下架状态？'
+                  row.status == "DOWN"
+                    ? "当前为下架状态，是否更改为上架状态？"
+                    : "当前为上架状态，是否更改为下架状态？"
                 }
                 confirmButtonText={
-                  row.status == 'DOWN' ? '确认上架' : '确认下架'
+                  row.status == "DOWN" ? "确认上架" : "确认下架"
                 }
                 onConfirm={Enable}
               >
@@ -407,39 +407,39 @@ export default {
                   slot="reference"
                   size="mini"
                   plain
-                  type={row.status == 'DOWN' ? 'info' : 'success'}
+                  type={row.status == "DOWN" ? "info" : "success"}
                 >
-                  {row.status == 'DOWN' ? '已下架' : '上架中'}
+                  {row.status == "DOWN" ? "已下架" : "上架中"}
                 </el-button>
               </el-popconfirm>
-            )
+            );
           }
         },
         {
-          title: '操作 (提示：下架后可进行操作)',
-          fixed: 'right',
-          type: 'jsx',
-          align: 'center',
-          width: '340px',
+          title: "操作 (提示：下架后可进行操作)",
+          fixed: "right",
+          type: "jsx",
+          align: "center",
+          width: "340px",
           render: ({ row }) => {
             let edit = () => {
-              this.$refs.addOrUpdate.toggle(row).update()
-            }
+              this.$refs.addOrUpdate.toggle(row).update();
+            };
             let priceAdjustment = () => {
-              console.log(row)
-              this.$refs.AddPrice.toggle(row).update()
-            }
+              console.log(row);
+              this.$refs.AddPrice.toggle(row).update();
+            };
             let changeInventory = () => {
-              this.$refs.addStock.toggle(row).update()
-            }
+              this.$refs.addStock.toggle(row).update();
+            };
             let setDiscounts = () => {
-              this.$refs.AddDiscount.toggle(row).update()
-            }
+              this.$refs.AddDiscount.toggle(row).update();
+            };
             return (
               <div>
                 <el-button
                   size="mini"
-                  disabled={row.status != 'DOWN'}
+                  disabled={row.status != "DOWN"}
                   type="primary"
                   onClick={edit}
                 >
@@ -447,7 +447,7 @@ export default {
                 </el-button>
                 <el-button
                   size="mini"
-                  disabled={row.status != 'DOWN'}
+                  disabled={row.status != "DOWN"}
                   type="primary"
                   onClick={priceAdjustment}
                 >
@@ -455,7 +455,7 @@ export default {
                 </el-button>
                 <el-button
                   size="mini"
-                  disabled={row.status != 'DOWN'}
+                  disabled={row.status != "DOWN"}
                   type="primary"
                   onClick={changeInventory}
                 >
@@ -463,37 +463,37 @@ export default {
                 </el-button>
                 <el-button
                   size="mini"
-                  disabled={row.status != 'DOWN'}
+                  disabled={row.status != "DOWN"}
                   type="primary"
                   onClick={setDiscounts}
                 >
                   设置折扣
                 </el-button>
               </div>
-            )
+            );
           }
         }
-      ]
+      ];
     },
     tableEvent() {
       return {
-        'checkbox-all': ({ records, reserves }) => {
-          this.selectList = [...records, ...reserves]
+        "checkbox-all": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
         },
-        'checkbox-change': ({ records, reserves }) => {
-          this.selectList = [...records, ...reserves]
+        "checkbox-change": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
         }
-      }
+      };
     },
-    ...mapState('userData', [
-      'isMerchant',
-      'marketList',
-      'storeList',
-      'marketId',
-      'shopId'
+    ...mapState("userData", [
+      "isMerchant",
+      "marketList",
+      "storeList",
+      "marketId",
+      "shopId"
     ])
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/operation-management/commodity/popup/add-or-update.vue b/src/views/modules/operation-management/commodity/popup/add-or-update.vue
index ff2d49b..312a799 100644
--- a/src/views/modules/operation-management/commodity/popup/add-or-update.vue
+++ b/src/views/modules/operation-management/commodity/popup/add-or-update.vue
@@ -137,13 +137,13 @@ export default {
           //     "_id": "重量2斤",
           //     "value": "售价￥17.5 成本￥15 库存100"
           // }
-        ],
+        ]
       },
       modalConfig: {
         title: "编辑商品",
         show: false,
         width: "1300px",
-        fullscreen: true,
+        fullscreen: true
       },
       fileList: [], //回显图片
       fileListOne: [], //介绍图
@@ -152,7 +152,7 @@ export default {
       passCheck: [], //通行证
       shopId: "",
       getProductCategory: [],
-      getSaleUnit: [],
+      getSaleUnit: []
     };
   },
   mounted() {},
@@ -163,7 +163,7 @@ export default {
         this.fileList = [];
         (this.fileListOne = []), (this.fileListTwo = []);
       }
-    },
+    }
   },
   methods: {
     toggle(e) {
@@ -177,7 +177,7 @@ export default {
         this.init(cloneDeep(e));
       }
       return {
-        add: (shopId) => {
+        add: shopId => {
           this.shopId = shopId;
           this.getData();
           console.log(this.shopId);
@@ -202,7 +202,7 @@ export default {
               specType: 0,
               minCostPrice: "",
               status: "UP",
-              isAdvanceSell: '0',
+              isAdvanceSell: "0"
             };
             this.modalData.merchantId = JSON.parse(
               sessionStorage.getItem("userInfo")
@@ -218,26 +218,26 @@ export default {
         update: () => {
           this.modalConfig.title = "编辑商品";
           this.isAdd = false;
-        },
+        }
       };
     },
     init(row) {
       console.log(row);
       this.shopId = row.shopId;
       this.getData();
-      this.fileList = row.productPhotoList.map((item) => {
+      this.fileList = row.productPhotoList.map(item => {
         return {
           name: "",
-          url: item.url,
+          url: item.url
         };
       });
       if (row.productIntroducePhoto) {
-        this.fileListOne = [
-          {
-            name: "",
-            url: row.productIntroducePhoto,
-          },
-        ];
+        // 处理多张介绍图(逗号分隔的URL)
+        const urls = row.productIntroducePhoto.split(",");
+        this.fileListOne = urls.map(url => ({
+          name: "",
+          url: url.trim()
+        }));
       } else {
         this.fileListOne = [];
       }
@@ -245,8 +245,8 @@ export default {
         this.fileListTwo = [
           {
             name: "",
-            url: row.productVideo,
-          },
+            url: row.productVideo
+          }
         ];
       } else {
         this.fileListTwo = [];
@@ -307,10 +307,10 @@ export default {
     getSpecs(tableData, AttributeData) {
       console.log(tableData);
       this.modalData.specType = 1;
-      let AttributeList = AttributeData.map((item) => {
+      let AttributeList = AttributeData.map(item => {
         return {
           attributeName: item.attributeName,
-          attributeValue: item.attributeValue.join(","),
+          attributeValue: item.attributeValue.join(",")
         };
       });
       this.$set(this.modalData, "productSpecificationList", tableData);
@@ -328,8 +328,8 @@ export default {
       this.modalData.otherAttribute = [
         {
           name: data.name,
-          value: data.value.join(","),
-        },
+          value: data.value.join(",")
+        }
       ];
       console.log(this.modalData);
     },
@@ -338,7 +338,7 @@ export default {
         return true;
       }
       let state = "";
-      this.$refs.modal.validate((valid) => {
+      this.$refs.modal.validate(valid => {
         if (valid) {
           if (!this.passCheck.includes(oldActiveName)) {
             this.passCheck.push(oldActiveName);
@@ -351,15 +351,15 @@ export default {
     getData() {
       this.$api.mer_admin
         .getProductCategory({ shopId: this.shopId })
-        .then((res) => {
+        .then(res => {
           this.getProductCategory = res.data.data;
           console.log(res);
         });
-      this.$api.mer_admin.getSaleUnit({ shopId: this.shopId }).then((res) => {
+      this.$api.mer_admin.getSaleUnit({ shopId: this.shopId }).then(res => {
         this.getSaleUnit = res.data.data;
         console.log(res);
       });
-    },
+    }
   },
   computed: {
     modalCols() {
@@ -373,7 +373,7 @@ export default {
               rules: {
                 required: true,
                 message: "请上传商品图片",
-                trigger: "blur",
+                trigger: "blur"
               },
               type: "jsx",
               render: () => {
@@ -387,20 +387,21 @@ export default {
                       if (index == 0) {
                         return {
                           isMain: 1,
-                          url: item.response ? item.response.data : item.url,
+                          url: item.response ? item.response.data : item.url
                         };
                       } else {
                         return {
-                          url: item.response ? item.response.data : item.url,
+                          isMain: 0,
+                          url: item.response ? item.response.data : item.url
                         };
                       }
                     }
                   );
                   console.log(this.modalData.productPhotoList);
-                  this.fileList = fileList.map((item) => {
+                  this.fileList = fileList.map(item => {
                     return {
                       name: item.name,
-                      url: item.response ? item.response.data : item.url,
+                      url: item.response ? item.response.data : item.url
                     };
                   });
                 };
@@ -411,20 +412,21 @@ export default {
                       if (index == 0) {
                         return {
                           isMain: 1,
-                          url: item.url,
+                          url: item.url
                         };
                       } else {
                         return {
-                          url: item.url,
+                          isMain: 0,
+                          url: item.url
                         };
                       }
                     }
                   );
                   console.log(this.modalData.productPhotoList);
-                  this.fileList = fileList.map((item) => {
+                  this.fileList = fileList.map(item => {
                     return {
                       name: item.name,
-                      url: item.url,
+                      url: item.url
                     };
                   });
                 };
@@ -437,11 +439,11 @@ export default {
                       props: {
                         "on-change": handleChange,
                         "on-success": handleAvatarSuccess,
-                        "on-remove": handleRemove,
-                      },
+                        "on-remove": handleRemove
+                      }
                     }}
                     headers={{
-                      token: "Bearer " + this.$cookie.get("token"),
+                      token: "Bearer " + this.$cookie.get("token")
                     }}
                     multiple={true}
                     file-list={this.fileList}
@@ -456,7 +458,7 @@ export default {
                     </div>
                   </el-upload>
                 );
-              },
+              }
             },
             {
               label: "商品类目",
@@ -466,7 +468,7 @@ export default {
               rules: {
                 required: true,
                 message: "请选择商品类目",
-                trigger: "blur",
+                trigger: "blur"
               },
               render: () => {
                 return (
@@ -474,7 +476,7 @@ export default {
                     placeholder="请选择商品类目"
                     v-model={this.modalData.productCategoryId}
                   >
-                    {this.getProductCategory.map((item) => {
+                    {this.getProductCategory.map(item => {
                       return (
                         <el-option
                           label={item.name}
@@ -484,7 +486,7 @@ export default {
                     })}
                   </el-select>
                 );
-              },
+              }
             },
             {
               label: "商品名称",
@@ -495,9 +497,9 @@ export default {
               rules: {
                 required: true,
                 message: "请输入商品名称",
-                trigger: "blur",
+                trigger: "blur"
               },
-              placeholder: "请输入商品名称",
+              placeholder: "请输入商品名称"
             },
             {
               label: "商品描述",
@@ -506,7 +508,7 @@ export default {
               rules: {
                 required: true,
                 message: "请填写商品描述",
-                trigger: "blur",
+                trigger: "blur"
               },
               type: "jsx",
               render: () => {
@@ -518,8 +520,8 @@ export default {
                     placeholder="请简单描述，如别称、口感、用途等"
                   />
                 );
-              },
-            },
+              }
+            }
             // {
             //   label: "是否为预售产品",
             //   prop: "isAdvanceSell",
@@ -562,7 +564,7 @@ export default {
               rules: {
                 required: true,
                 message: "请选择销售单位",
-                trigger: "blur",
+                trigger: "blur"
               },
               type: "jsx",
               render: () => {
@@ -571,7 +573,7 @@ export default {
                     v-model={this.modalData.productUnit}
                     placeholder="请选择销售单位"
                   >
-                    {this.getSaleUnit.map((item) => {
+                    {this.getSaleUnit.map(item => {
                       return (
                         <el-option
                           label={item.name}
@@ -581,7 +583,7 @@ export default {
                     })}
                   </el-select>
                 );
-              },
+              }
             },
             {
               label: "规格",
@@ -593,12 +595,18 @@ export default {
                     若有多规格请在此配置
                   </el-button>
                 );
-              },
+              }
             },
             {
               label: "成本",
               prop: "costPrice",
               type: "jsx",
+              required: true,
+              rules: {
+                required: true,
+                message: "请输入成本价格",
+                trigger: "blur"
+              },
               render: () => {
                 return (
                   <el-input
@@ -609,12 +617,18 @@ export default {
                     <template slot="append">单位（元）</template>
                   </el-input>
                 );
-              },
+              }
             },
             {
               label: "市场价",
               prop: "marketPrice",
               type: "jsx",
+              required: true,
+              rules: {
+                required: true,
+                message: "请输入市场价",
+                trigger: "blur"
+              },
               render: () => {
                 return (
                   <el-input
@@ -625,12 +639,18 @@ export default {
                     <template slot="append">单位（元）</template>
                   </el-input>
                 );
-              },
+              }
             },
             {
               label: "库存",
               prop: "stockNum",
               type: "jsx",
+              required: true,
+              rules: {
+                required: true,
+                message: "请输入库存",
+                trigger: "blur"
+              },
               render: () => {
                 return (
                   <el-input
@@ -639,35 +659,51 @@ export default {
                     v-model={this.modalData.stockNum}
                   ></el-input>
                 );
-              },
+              }
             },
             {
               label: "重量",
               prop: "weight",
               type: "jsx",
+              required: true,
+              rules: {
+                required: true,
+                message: "请输入重量",
+                trigger: "blur"
+              },
               render: () => {
                 return (
                   <el-input
                     readonly={this.modalData.specType != 0}
-                    placeholder="请输入库存"
+                    placeholder="请输入重量"
                     v-model={this.modalData.weight}
-                  ></el-input>
+                  >
+                    <template slot="append">KG</template>
+                  </el-input>
                 );
-              },
+              }
             },
             {
               label: "体积",
               prop: "volume",
               type: "jsx",
+              required: true,
+              rules: {
+                required: true,
+                message: "请输入体积",
+                trigger: "blur"
+              },
               render: () => {
                 return (
                   <el-input
                     readonly={this.modalData.specType != 0}
-                    placeholder="请输入库存"
+                    placeholder="请输入体积"
                     v-model={this.modalData.volume}
-                  ></el-input>
+                  >
+                    <template slot="append">立方米</template>
+                  </el-input>
                 );
-              },
+              }
             },
             {
               label: "其他属性",
@@ -679,8 +715,8 @@ export default {
                     添加其他属性
                   </el-button>
                 );
-              },
-            },
+              }
+            }
           ];
           break;
         case "其他信息":
@@ -688,11 +724,9 @@ export default {
             {
               label: "产地",
               prop: "productPlace",
-              required: true,
-              rules: { required: true, message: "请选择产地", trigger: "blur" },
               type: "jsx",
               render: () => {
-                const change = (e) => {
+                const change = e => {
                   console.log(e);
                   this.modalData.productPlace = e.join("-");
                 };
@@ -704,24 +738,18 @@ export default {
                     props={{
                       props: {
                         label: "name",
-                        value: "name",
-                      },
+                        value: "name"
+                      }
                     }}
                     clearable
                   ></el-cascader>
                 );
-              },
+              }
             },
             {
               label: "保质期",
               prop: "shelfLife",
               type: "jsx",
-              // required: true,
-              rules: {
-                required: true,
-                message: "请填写保质期",
-                trigger: "blur",
-              },
               render: () => {
                 return (
                   <el-input
@@ -732,7 +760,7 @@ export default {
                     <div slot="suffix">天</div>
                   </el-input>
                 );
-              },
+              }
             },
             {
               label: "商品介绍图",
@@ -746,12 +774,24 @@ export default {
                 const handleChange = (file, fileList) => {
                   // console.log(fileList);
                 };
-                const handleAvatarSuccess = (res) => {
-                  this.modalData.productIntroducePhoto = res.data;
+                const handleAvatarSuccess = (res, file, fileList) => {
+                  // 拼接所有已上传图片URL，使用逗号分隔
+                  const urls = fileList
+                    .map(item => {
+                      return item.response ? item.response.data : item.url;
+                    })
+                    .filter(Boolean);
+                  this.modalData.productIntroducePhoto = urls.join(",");
                   console.log(this.modalData.productIntroducePhoto);
                 };
-                const handleRemove = () => {
-                  this.modalData.productIntroducePhoto = "";
+                const handleRemove = (file, fileList) => {
+                  // 从已上传列表中移除一张图片后，重新拼接剩余的图片URL
+                  const urls = fileList
+                    .map(item => {
+                      return item.response ? item.response.data : item.url;
+                    })
+                    .filter(Boolean);
+                  this.modalData.productIntroducePhoto = urls.join(",");
                   console.log(this.modalData.productIntroducePhoto);
                 };
                 return (
@@ -759,18 +799,17 @@ export default {
                     class="upload-demo"
                     drag
                     action={this.$api.mer_admin.uploadFile()}
-                    limit={1}
                     file-list={this.fileListOne}
                     list-type="picture"
                     {...{
                       props: {
                         "on-change": handleChange,
                         "on-success": handleAvatarSuccess,
-                        "on-remove": handleRemove,
-                      },
+                        "on-remove": handleRemove
+                      }
                     }}
                     headers={{
-                      token: "Bearer " + this.$cookie.get("token"),
+                      token: "Bearer " + this.$cookie.get("token")
                     }}
                     multiple
                   >
@@ -783,7 +822,7 @@ export default {
                     </div>
                   </el-upload>
                 );
-              },
+              }
             },
             {
               label: "商品视频",
@@ -799,7 +838,7 @@ export default {
                 const handleChange = (file, fileList) => {
                   console.log(fileList);
                 };
-                const handleAvatarSuccess = (res) => {
+                const handleAvatarSuccess = res => {
                   this.modalData.productVideo = res.data;
                 };
                 const handleRemove = () => {
@@ -812,30 +851,29 @@ export default {
                     action={this.$api.mer_admin.uploadFile()}
                     limit={1}
                     file-list={this.fileListTwo}
-                    list-type="picture"
+                    accept=".mp4,.avi,.mov,.wmv,.flv"
                     {...{
                       props: {
                         "on-change": handleChange,
                         "on-success": handleAvatarSuccess,
-                        "on-remove": handleRemove,
-                      },
+                        "on-remove": handleRemove
+                      }
                     }}
                     headers={{
-                      token: "Bearer " + this.$cookie.get("token"),
+                      token: "Bearer " + this.$cookie.get("token")
                     }}
-                    multiple
                   >
                     <i class="el-icon-upload"></i>
                     <div class="el-upload__text">
-                      将文件拖到此处，或<em>点击上传</em>
+                      将视频文件拖到此处，或<em>点击上传</em>
                     </div>
                     <div class="el-upload__tip" slot="tip">
-                      只能上传jpg/png文件，且不超过500kb
+                      支持mp4、avi、mov等视频格式，建议不超过50MB
                     </div>
                   </el-upload>
                 );
-              },
-            },
+              }
+            }
           ];
           break;
 
@@ -846,7 +884,7 @@ export default {
     modalHandles() {
       return [
         {
-          label: this.currentPanel === "其他信息" ? "立即上架" : "下一步",
+          label: this.currentPanel === "其他信息" ? "保存并上架" : "下一步",
           type: "primary",
           loading: this.isLoading,
           submit: true,
@@ -862,8 +900,8 @@ export default {
                   {
                     id: "1821213026050191360",
                     attributeName: "重量",
-                    attributeValue: "1斤",
-                  },
+                    attributeValue: "1斤"
+                  }
                 ];
                 this.modalData.productSpecificationList = [
                   {
@@ -872,22 +910,24 @@ export default {
                     marketPrice: this.modalData.marketPrice,
                     stockNum: this.modalData.stockNum,
                     weight: this.modalData.weight,
-                    volume: this.modalData.volume,
-                  },
+                    volume: this.modalData.volume
+                  }
                 ];
               }
-              this.$api.mer_admin.saveProduct(this.modalData).then((res) => {
+              // 明确设置状态为上架
+              this.modalData.status = "UP";
+              this.$api.mer_admin.saveProduct(this.modalData).then(res => {
                 console.log(res);
                 this.$emit("queryList");
                 this.toggle();
               });
             }
-          }, 300),
+          }, 300)
         },
         {
           disabled: () => this.currentPanel != "其他信息",
-          label: "放入仓库",
-          type: "primary",
+          label: "保存并放入仓库",
+          type: "info",
           loading: this.isLoading,
           submit: true,
           handle: debounce(() => {
@@ -896,8 +936,8 @@ export default {
                 {
                   id: "1821213026050191360",
                   attributeName: "重量",
-                  attributeValue: "1斤",
-                },
+                  attributeValue: "1斤"
+                }
               ];
               this.modalData.productSpecificationList = [
                 {
@@ -906,20 +946,21 @@ export default {
                   marketPrice: this.modalData.marketPrice,
                   stockNum: this.modalData.stockNum,
                   weight: this.modalData.weight,
-                  volume: this.modalData.volume,
-                },
+                  volume: this.modalData.volume
+                }
               ];
             }
+            // 明确设置状态为下架/放入仓库
             this.modalData.status = "DOWN";
-            this.$api.mer_admin.saveProduct(this.modalData).then((res) => {
+            this.$api.mer_admin.saveProduct(this.modalData).then(res => {
               console.log(res);
               this.$emit("queryList");
               this.toggle();
             });
-          }, 300),
-        },
+          }, 300)
+        }
       ];
-    },
+    }
   },
   asyncComputed: {
     // async getProductCategory() {
@@ -933,7 +974,7 @@ export default {
     //   console.log(res);
     //   return res.data.data;
     // },
-  },
+  }
 };
 </script>
 <style lang="scss" scoped>