商品

src/views/modules/product/popup/add-attribute.vue

@@ -111,15 +111,34 @@ export default {
         this.init(cloneDeep(e.row));
       }
       return {
-        add: () => {
+        add: (data) => {
           this.modalConfig.title = "添加属性";
-          this.$nextTick(() => {
+          if (data.length == 0) {
-            this.modalData = {};
+            this.ruleForm = {
-            this.$refs.ruleForm.resetFields();
+              name: "",
-          });
+              value: [],
+            };
+          } else {
+            this.ruleForm = {
+              name: data[0].name,
+              value: data[0].value.split(","),
+            };
+          }
           this.isAdd = true;
         },
-        update: () => {
+        update: (data) => {
+          console.log(data);
+          if (data.length == 0) {
+            this.ruleForm = {
+              name: "",
+              value: [],
+            };
+          } else {
+            this.ruleForm = {
+              name: data[0].name,
+              value: data[0].value.split(","),
+            };
+          }
           this.isAdd = false;
         },
       };

src/views/modules/product/popup/add-discount.vue

@@ -204,7 +204,7 @@ export default {
               .catch(() => {
                 this.$message({
                   type: "info",
-                  message: "已取消删除",
+                  message: "已取消",
                 });
               });
           },

src/views/modules/product/popup/add-or-update.vue

@@ -64,7 +64,7 @@ export default {
         //单库存
         singleStock: "",
         //其他属性
-        otherAttribute: '[{"name":"颜色","value":"黄色；屎黄色"}]',
+        otherAttribute: [], //[{"name":"颜色","value":"黄色；屎黄色"}]
         //折扣情况
         discountActivity: {
           // "endTime": "2024-08-31 00:00:00",
@@ -146,6 +146,8 @@ export default {
         fullscreen: true,
       },
       fileList: [], //回显图片
+      fileListOne: [], //介绍图
+      fileListTwo: [], //视频
       place: "", //场地
       passCheck: [], //通行证
     };
@@ -178,7 +180,7 @@ export default {
               description: "",
               merchantId: "",
               name: "",
-              otherAttribute: "",
+              otherAttribute: [],
               productAttributeList: [],
               productCategoryId: "",
               productIntroducePhoto: "",
@@ -220,13 +222,59 @@ export default {
           url: item.url,
         };
       });
+      if (row.productIntroducePhoto) {
+        this.fileListOne = [
+          {
+            name: "",
+            url: row.productIntroducePhoto,
+          },
+        ];
+      } else {
+        this.fileListOne = [];
+      }
+      if (row.productVideo) {
+        this.fileListTwo = [
+          {
+            name: "",
+            url: row.productVideo,
+          },
+        ];
+      } else {
+        this.fileListTwo = [];
+      }
       this.place = row.productPlace.split("-");
       this.modalData = row;
+      this.$set(this.modalData, "singleStock", row.stockNum);
+      if (row.minSalePrice == row.maxSalePrice) {
+        this.$set(this.modalData, "singlePrice", row.maxSalePrice);
+      } else {
+        this.$set(
+          this.modalData,
+          "singlePrice",
+          row.minSalePrice + "~" + row.maxSalePrice
+        );
+      }
+      if (!row.productAttributeList) {
+        this.$set(this.modalData, "productAttributeList", []);
+      }
+      if (row.otherAttribute) {
+        this.modalData.otherAttribute = JSON.parse(row.otherAttribute);
+      } else {
+        this.modalData.otherAttribute = [];
+      }
     },
     addSpecs() {
       console.log("123");
       if (this.isAdd) {
-        this.$refs.addSpecifications.toggle().add();
+        this.$refs.addSpecifications
+          .toggle()
+          .add(
+            this.modalData.productAttributeList,
+            this.modalData.productSpecificationList
+          );
+      } else {
+        if (this.modalData.productAttributeList.length == 0) {
+          this.$refs.addSpecifications.toggle().update([], []);
         } else {
           this.$refs.addSpecifications
             .toggle()
@@ -235,6 +283,7 @@ export default {
               this.modalData.productSpecificationList
             );
         }
+      }
     },
     //获取属性
     getSpecs(tableData, AttributeData, salePrice, stockNum) {
@@ -250,7 +299,11 @@ export default {
       this.$set(this.modalData, "singleStock", stockNum);
     },
     addAttribute() {
-      this.$refs.addAttribute.toggle().add();
+      if (this.isAdd) {
+        this.$refs.addAttribute.toggle().add(this.modalData.otherAttribute);
+      } else {
+        this.$refs.addAttribute.toggle().update(this.modalData.otherAttribute);
+      }
     },
     getAttribute(data) {
       console.log(data);
@@ -488,9 +541,7 @@ export default {
               render: () => {
                 return (
                   <el-input
-                    readonly={
+                    readonly={this.modalData.productAttributeList.length > 0}
-                      this.modalData.productSpecificationList.length > 0
-                    }
                     placeholder="请输入价格"
                     v-model={this.modalData.singlePrice}
                   ></el-input>
@@ -504,9 +555,7 @@ export default {
               render: () => {
                 return (
                   <el-input
-                    readonly={
+                    readonly={this.modalData.productAttributeList.length > 0}
-                      this.modalData.productSpecificationList.length > 0
-                    }
                     placeholder="请输入库存"
                     v-model={this.modalData.singleStock}
                   ></el-input>
@@ -603,6 +652,8 @@ export default {
                     drag
                     action={this.$api.mer_admin.uploadFile()}
                     limit={1}
+                    file-list={this.fileListOne}
+                    list-type="picture"
                     {...{
                       props: {
                         "on-change": handleChange,
@@ -652,6 +703,8 @@ export default {
                     drag
                     action={this.$api.mer_admin.uploadFile()}
                     limit={1}
+                    file-list={this.fileListTwo}
+                    list-type="picture"
                     {...{
                       props: {
                         "on-change": handleChange,

src/views/modules/product/popup/add-specifications.vue

@@ -133,16 +133,17 @@ export default {
         this.init(cloneDeep(e.row));
       }
       return {
-        add: () => {
+        add: (productAttributeList, productSpecificationList) => {
-          this.modalConfig.title = "属性";
+          this.modalConfig.title = "添加属性";
-          this.$nextTick(() => {
+          if (productAttributeList.length == 0) {
-            // this.$refs.modal.resetFields();
+            this.AttributeData = [
-            this.modalData = {};
+              {
-          });
+                attributeName: "",
-          this.isAdd = true;
+                attributeValue: [],
+                inputVisible: false,
               },
-        update: (productAttributeList, productSpecificationList) => {
+            ];
-          console.log(productAttributeList, productSpecificationList);
+          } else {
             this.AttributeData = productAttributeList.map((item) => {
               return {
                 attributeName: item.attributeName,
@@ -151,6 +152,31 @@ export default {
                 inputVisible: false,
               };
             });
+          }
+          this.tableData = productSpecificationList;
+          this.isAdd = true;
+        },
+        update: (productAttributeList, productSpecificationList) => {
+          this.modalConfig.title = "编辑属性";
+          console.log(productAttributeList, productSpecificationList);
+          if (productAttributeList.length == 0) {
+            this.AttributeData = [
+              {
+                attributeName: "",
+                attributeValue: [],
+                inputVisible: false,
+              },
+            ];
+          } else {
+            this.AttributeData = productAttributeList.map((item) => {
+              return {
+                attributeName: item.attributeName,
+                attributeValue: item.attributeValue.split(","),
+                id: item.id,
+                inputVisible: false,
+              };
+            });
+          }
           this.tableData = productSpecificationList;
           this.isAdd = false;
         },