From ce1ae461829b0a43580beb467fc899fa57f319f7 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Tue, 7 Apr 2020 22:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DJPA=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/goods/form.vue  | 4 +++-
 src/views/shop/goods/index.vue | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/shop/goods/form.vue b/src/views/shop/goods/form.vue
index caa776a..887996c 100644
--- a/src/views/shop/goods/form.vue
+++ b/src/views/shop/goods/form.vue
@@ -2,7 +2,7 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="900px">
     <el-form ref="form" :model="form" :inline="true" :rules="rules" size="small" label-width="80px">
       <el-form-item style="margin-bottom: 0px;" label="商品分类">
-        <treeselect v-model="form.cateId" :options="cates" style="width: 370px;" placeholder="选择商品分类" />
+        <treeselect v-model="form.storeCategory.id" :options="cates" style="width: 370px;" placeholder="选择商品分类" />
       </el-form-item>
       <el-form-item label="商品名称">
         <el-input v-model="form.storeName" style="width: 500px;" />
@@ -119,6 +119,7 @@ export default {
         keyword: '',
         barCode: '',
         cateId: 1,
+        storeCategory: {id:null},
         price: 0,
         vipPrice: 0,
         otPrice: 0,
@@ -218,6 +219,7 @@ export default {
         keyword: '',
         barCode: '',
         cateId: 1,
+        storeCategory: {},
         price: 0,
         vipPrice: 0,
         otPrice: 0,
diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index 2306dfc..760311c 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -216,7 +216,7 @@ export default {
         storeInfo: data.storeInfo,
         keyword: data.keyword,
         barCode: data.barCode,
-        cateId: data.cateId,
+        storeCategory: data.storeCategory,
         price: data.price,
         vipPrice: data.vipPrice,
         otPrice: data.otPrice,
@@ -359,7 +359,7 @@ export default {
         storeInfo: data.storeInfo,
         keyword: data.keyword,
         barCode: data.barCode,
-        cateId: data.cateId,
+        storeCategory: data.storeCategory,
         price: data.price,
         vipPrice: data.vipPrice,
         otPrice: data.otPrice,