From 2a8241df4493a36b046855f2283b1c3da9e6bfbe Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
platform/src/components/business/OperaGoodsWindow.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/platform/src/components/business/OperaGoodsWindow.vue b/platform/src/components/business/OperaGoodsWindow.vue
index 440f444..d2d1ef9 100644
--- a/platform/src/components/business/OperaGoodsWindow.vue
+++ b/platform/src/components/business/OperaGoodsWindow.vue
@@ -98,8 +98,8 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import { brand } from '@/api/system/common.js'
-import { findListForGoodsId, create, updateById, companyCreate, companyUpdateById } from '@/api/business/goods.js'
+import { baseCategory,brand } from '@/api/system/common.js'
+import { create, updateById, companyCreate, companyUpdateById } from '@/api/business/goods.js'
export default {
name: 'OperaGoodsWindow',
extends: BaseOpera,
@@ -315,13 +315,13 @@
this.form.imgurl = ''
},
getbrand() {
- brand({})
+ brand({status:0})
.then(res => {
this.brandList = res
})
},
getcategory(type) {
- findListForGoodsId(this.form.id || '')
+ baseCategory({status:0 , type:1})
.then(res => {
this.categoryList = res
if (type === 1) {
--
Gitblit v1.9.3