From 58e36270b8e6c5dbd81af072af564ac689a25cb0 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 15 十月 2025 10:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
seller/src/views/goods/goods-seller/goodsOperationSec.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index e300a85..4b5e0cb 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -87,7 +87,7 @@
</FormItem>
<FormItem v-if="baseInfoForm.goodsType == 'PHYSICAL_GOODS'" class="form-item-view-el" label="鍟嗗搧绫诲瀷">
<Select
- v-model="baseInfoForm.customizeGoodsType"
+ v-model="baseInfoForm.customizeFlag"
clearable
style="width: 160px"
@on-clear="handleGoodsType"
@@ -921,7 +921,7 @@
],
/** 鍙戝竷鍟嗗搧鍩烘湰鍙傛暟 */
baseInfoForm: {
- customizeGoodsType:"",
+ customizeFlag:"",
virtualGoodsType:"",
salesModel: "RETAIL",
/** 鍟嗗搧鐩稿唽鍒楄〃 */
@@ -2170,7 +2170,7 @@
}
)
}
- if(this.baseInfoForm.goodsType==="PHYSICAL_GOODS" &&this.baseInfoForm.customizeGoodsType==="CUSTOMIZE"){
+ if(this.baseInfoForm.goodsType==="PHYSICAL_GOODS" &&this.baseInfoForm.customizeFlag==="CUSTOMIZE"){
pushData.push({
title:"瀹氬埗鍟嗗搧妯℃澘",
slot:"CUSTOMIZE"
@@ -2435,8 +2435,8 @@
quantity: sku.quantity,
couponName:this.baseInfoForm.virtualGoodsType === "COUPON" ? sku.couponName:null,
couponId:this.baseInfoForm.virtualGoodsType === "COUPON" ? sku.couponId:null,
- customizeTemplateName:this.baseInfoForm.customizeGoodsType === "CUSTOMIZE" ? sku.customizeTemplateName : null,
- customizeTemplateId:this.baseInfoForm.customizeGoodsType === "CUSTOMIZE" ? sku.customizeTemplateId :null,
+ customizeTemplateName:this.baseInfoForm.customizeFlag === "CUSTOMIZE" ? sku.customizeTemplateName : null,
+ customizeTemplateId:this.baseInfoForm.customizeFlag === "CUSTOMIZE" ? sku.customizeTemplateId :null,
// alertQuantity: sku.alertQuantity,
sn: sku.sn,
images: [],
@@ -2454,7 +2454,7 @@
}
}
if(this.baseInfoForm.goodsType === "PHYSICAL_GOODS" &&
- this.baseInfoForm.customizeGoodsType === "CUSTOMIZE"){
+ this.baseInfoForm.customizeFlag === "CUSTOMIZE"){
if (sku.customizeTemplateId === null || sku.customizeTemplateId === undefined){
this.$Message.error("璇烽�夋嫨瀹氬埗妯℃澘")
return;
--
Gitblit v1.8.0