From 89c12efa2ef8464680c81b11a5d98ac39fc99338 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 15 九月 2025 11:59:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
seller/src/views/goods/goods-seller/goodsOperationFirst.vue | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index e4eef7d..280a589 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -109,13 +109,13 @@
type: "PHYSICAL_GOODS",
check: false,
},
- // {
- // title: "铏氭嫙鍟嗗搧",
- // img: require("@/assets/goodsType2.png"),
- // desc: "铏氭嫙鏍搁獙锛屾棤闇�鐗╂祦",
- // type: "VIRTUAL_GOODS",
- // check: false,
- // },
+ {
+ title: "铏氭嫙鍟嗗搧",
+ img: require("@/assets/goodsType2.png"),
+ desc: "铏氭嫙鏍搁獙锛屾棤闇�鐗╂祦",
+ type: "VIRTUAL_GOODS",
+ check: false,
+ },
// {
// title: "鍟嗗搧妯℃澘瀵煎叆",
// img: require("@/assets/goodsTypeTpl.png"),
@@ -231,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,
@@ -246,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