From e9a606c71e654ea1a7f1134b64189bdd60ea586d Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 17 Apr 2025 13:41:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B2=A1=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4=E6=88=90=E5=8A=9F=E4=B8=8D=E4=BF=AE=E6=94=B9=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/index.vue | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 9009f39..2b37ab7 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -149,7 +149,7 @@
-
+
@@ -229,10 +229,13 @@ function newHandleQueryClick(e: IObject | undefined) {
// 库存修改
function kucunedit(item) {
kucundata.value = item
+ kucundata.value.stockNumbers = item.stockNumber
myDialogRefkucun.value.open()
}
async function confirmkucun() {
- let res = await UserAPI.modifyStock({ id: kucundata.value.id, stockNumber: kucundata.value.stockNumber })
+
+ let res = await UserAPI.modifyStock({ id: kucundata.value.id, stockNumber: kucundata.value.stockNumbers })
+ kucundata.value.stockNumber = kucundata.value.stockNumbers
ElMessage.success('成功')
myDialogRefkucun.value.close()
}
@@ -318,7 +321,7 @@ async function handleSwitchhaocai(row: IObject) {
// 编辑
async function handleEditClick(row: IObject) {
try {
- router.push({ name: "addgoods", query: { goods_id: row.id } });
+ router.push({ name: "addgoods", query: { goods_id: row.id } });
} catch (error) {
ElMessage.error('没有编辑权限')
}
From a6bca24c1a569b7cb213d15919fadda1956bd660 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 18 Apr 2025 18:00:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/indexconfig/addgoods.vue | 24 ++++++++++++----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index 95f3e28..2b19d2b 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -188,9 +188,15 @@
-
-
+
+
+
+
+ -
+
+
@@ -440,6 +446,10 @@ onMounted(() => {
watch(() => router.currentRoute.value.query.goods_id, (val) => {
tbProductGetDetail(val);
})
+function pickerOptions(d) {
+ console.log(d, '11111111');
+
+}
async function tbProductGetDetail(id: any) {
// 获取商品详情
const res = await UserAPI3.getDetail(id);
@@ -750,14 +760,6 @@ const submitForm = async (formEl: FormInstance | undefined) => {
ElMessage.error('请填写组名和几选几')
return
}
- // 修改时间
- console.log(ruleForm.useTime)
- if (!ruleForm.useTime) {
- ElMessage.error('请选择定时上下架时间')
- return
- }
- ruleForm.startTime = ruleForm.useTime[0]
- ruleForm.endTime = ruleForm.useTime[1]
// 拿到sku数据
ruleForm.skuList = (specificationAttributeRef.value as any)?.getdata()
// 多规格 selectSpecInfo 添加
From 593f5693ef703f5d60aa85abaa22ca8b6fb5a631 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 21 Apr 2025 15:31:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?-=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/indexconfig/addgoods.vue | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index 2575f5e..87850a6 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -758,10 +758,6 @@ const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return;
await formEl.validate(async (valid, fields) => {
if (valid) {
-<<<<<<< HEAD
-
-=======
->>>>>>> 2602916201f0e12ac5cb51e5a88d69cfaaeb7baf
// 第一张图片作为封面图
ruleForm.coverImg = ruleForm.images[0];
// 规格id修改