diff --git a/src/store/modules/user.js b/src/store/modules/user.js index d602d49..b9d24fb 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -94,7 +94,7 @@ const useUserStore = defineStore('user', { }) .catch((error) => { console.error(error) - reject('获取用户信息失败') + reject('请重新登录') }) }) }, diff --git a/src/views/business/GoodsManager/Goodss/components/AddDialog.vue b/src/views/business/GoodsManager/Goodss/components/AddDialog.vue index c836d96..9959d3f 100644 --- a/src/views/business/GoodsManager/Goodss/components/AddDialog.vue +++ b/src/views/business/GoodsManager/Goodss/components/AddDialog.vue @@ -541,22 +541,20 @@ const imgData = ref({ const rules = reactive({ shopGuid: [{ required: true, message: "店铺不能为空", trigger: "blur" }], goodsCategoryGuid: [{ required: true, message: "商品类目不能为空", trigger: "blur" }], - goodsSkuGuid: [{ required: true, message: "商品规格不能为空", trigger: "blur" }], + goodsSpecType: [{ required: true, message: "商品规格类型不能为空", trigger: "blur" }], deliveryGuid: [{ required: true, message: "配送模板不能为空", trigger: "blur" }], goodsName: [{ required: true, message: "名称不能为空", trigger: "blur" }], goodsPicture: [{ required: true, message: "图片不能为空", trigger: "blur" }], - goodsPriceLowest: [{ required: true, message: "价格(最低)不能为空", trigger: "blur" }], - goodsPriceHighest: [{ required: true, message: "价格(最高)不能为空", trigger: "blur" }], + goodsPriceHighest: [{ required: true, message: "价格不能为空", trigger: "blur" }], goodsTotalInventory: [{ required: true, message: "库存总量不能为空", trigger: "blur", type: "number" }], goodsSalesInitial: [{ required: true, message: "初始销量不能为空", trigger: "blur", type: "number" }], - goodsSalesActual: [{ required: true, message: "实际销量不能为空", trigger: "blur", type: "number" }], goodsDetails: [{ required: true, message: "详情不能为空", trigger: "blur" }], - goodsDeductStockType: [{ required: true, message: "库存计算方式(1下单立减库存 2付款立减库存)不能为空", trigger: "blur", type: "number" }], - goodsIsPointsGift: [{ required: true, message: "是否赠送积分(1开启 0关闭)不能为空", trigger: "blur", type: "number" }], - goodsIsPointsDiscount: [{ required: true, message: "是否允许使用积分抵扣(1允许 0不允许)不能为空", trigger: "blur", type: "number" }], - goodsIsAlonePointsDiscount: [{ required: true, message: "积分抵扣设置(0默认抵扣 1单独设置抵扣)不能为空", trigger: "blur", type: "number" }], - goodsIsEnableGrade: [{ required: true, message: "是否开启会员折扣(1开启 0关闭)不能为空", trigger: "blur", type: "number" }], - goodsIsAloneGrade: [{ required: true, message: "会员折扣设置(0默认等级折扣 1单独设置折扣)不能为空", trigger: "blur", type: "number" }], + goodsDeductStockType: [{ required: true, message: "库存计算方式不能为空", trigger: "blur", type: "number" }], + goodsIsPointsGift: [{ required: true, message: "是否赠送积分不能为空", trigger: "blur", type: "number" }], + goodsIsPointsDiscount: [{ required: true, message: "是否允许使用积分抵扣不能为空", trigger: "blur", type: "number" }], + goodsIsAlonePointsDiscount: [{ required: true, message: "积分抵扣设置不能为空", trigger: "blur", type: "number" }], + goodsIsEnableGrade: [{ required: true, message: "是否开启会员折扣不能为空", trigger: "blur", type: "number" }], + goodsIsAloneGrade: [{ required: true, message: "会员折扣设置不能为空", trigger: "blur", type: "number" }], goodsShelfStatus: [{ required: true, message: "上下架状态不能为空", trigger: "blur", type: "number" }], goodsSort: [{ required: true, message: "排序不能为空", trigger: "blur", type: "number" }], }); @@ -575,24 +573,31 @@ function getFormPromise(form) { const handleAddClick = async () => { console.log(formData, '表单提交'); - // Promise.all([baseFormRef.value, skuFormRef.value, detailFormRef.value, moreFormRef.value,].map(getFormPromise)).then(async (res) => { - // const validateResult = res.every((item) => !!item) + Promise.all([baseFormRef.value, skuFormRef.value, detailFormRef.value, moreFormRef.value,].map(getFormPromise)).then(async (res) => { + const validateResult = res.every((item) => !!item) - // if (validateResult) { - // if (formData.goodsServicesIds.length !== 0) { - // formData.goodsServicesIds = formData.goodsServicesIds.join(',') - // } + if (validateResult) { + if (formData.goodsServicesIds.length !== 0) { + formData.goodsServicesIds = formData.goodsServicesIds.join(',') + } - // const { code } = await addOrUpdateGoods(formData); - // if (code == 200) { - // modal.msgSuccess('添加成功') - // closeDialog(); - // } - // } else { - // modal.msgError('表单未通过验证！') - // } + if (formData.goodsSpecType = "2") { + if (formData.goodsSpecList.length == 0) { + modal.msgError('商品规格不能为空！') + return + } + } - // }); + const { code } = await addOrUpdateGoods(formData); + if (code == 200) { + modal.msgSuccess('添加成功') + closeDialog(); + } + } else { + modal.msgError('表单未通过验证！') + } + + }); }; const closeDialog = () => { diff --git a/src/views/business/GoodsManager/Goodss/index.vue b/src/views/business/GoodsManager/Goodss/index.vue index 4a1ead0..2d1940a 100644 --- a/src/views/business/GoodsManager/Goodss/index.vue +++ b/src/views/business/GoodsManager/Goodss/index.vue @@ -86,13 +86,13 @@ - +