From c1e567ddda7f65651179a8a73ca849b07b066b14 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 19:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
seller/src/views/goods/goods-seller/goodsOperationFirst.vue | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index 47af408..db69887 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -109,19 +109,19 @@
type: "PHYSICAL_GOODS",
check: false,
},
- {
- title: "铏氭嫙鍟嗗搧",
- img: require("@/assets/goodsType2.png"),
- desc: "铏氭嫙鏍搁獙锛屾棤闇�鐗╂祦",
- type: "VIRTUAL_GOODS",
- check: false,
- },
- {
- title: "鍟嗗搧妯℃澘瀵煎叆",
- img: require("@/assets/goodsTypeTpl.png"),
- desc: "鍟嗗搧妯℃澘锛屼竴閿鍏�",
- check: false,
- },
+ // {
+ // title: "铏氭嫙鍟嗗搧",
+ // img: require("@/assets/goodsType2.png"),
+ // desc: "铏氭嫙鏍搁獙锛屾棤闇�鐗╂祦",
+ // type: "VIRTUAL_GOODS",
+ // check: false,
+ // },
+ // {
+ // title: "鍟嗗搧妯℃澘瀵煎叆",
+ // img: require("@/assets/goodsTypeTpl.png"),
+ // desc: "鍟嗗搧妯℃澘锛屼竴閿鍏�",
+ // check: false,
+ // },
],
// 鍟嗗搧鍒嗙被閫夋嫨鏁扮粍
category: [
@@ -130,7 +130,8 @@
{ name: "", id: "" },
],
// 鍟嗗搧绫诲瀷
- goodsType: "",
+ // goodsType: "",
+ goodsType: "PHYSICAL_GOODS",
/** 1绾у垎绫诲垪琛�*/
categoryListLevel1: [],
/** 2绾у垎绫诲垪琛�*/
@@ -230,10 +231,13 @@
if (!this.category[0].name) {
this.$Message.error("璇烽�夋嫨鍟嗗搧鍒嗙被");
return;
- } else if (!this.category[2].name) {
- this.$Message.error("蹇呴』閫夋嫨鍒颁笁绾у垎绫�");
- return;
- } else if (this.category[2].name) {
+ }
+ //鍏抽棴蹇呴』閫夋嫨3涓祦绋嬬殑閫夐」
+ // else if (!this.category[2].name) {
+ // this.$Message.error("蹇呴』閫夋嫨鍒颁笁绾у垎绫�");
+ // return;
+ // }
+ else if (this.category[2].name) {
let params = {
category: this.category,
goodsType: this.goodsType,
@@ -245,6 +249,14 @@
this.$emit("change", params);
}
}
+ //娴佺▼璋冩暣
+ else {
+ let params = {
+ category: this.category,
+ goodsType: this.goodsType,
+ };
+ this.$emit("change", params);
+ }
},
},
mounted() {
--
Gitblit v1.8.0