From cf1c3f21c6796f39b9a4c8318db9eb584f92bbef Mon Sep 17 00:00:00 2001
From: "AERWEN\\26795" <123456789a>
Date: Wed, 25 Oct 2023 22:33:05 +0800
Subject: [PATCH] init

---
 src/main.js                                                | 2 +-
 .../business/GoodsManager/Goodss/components/AddDialog.vue  | 4 ++--
 .../ShopGoodsCategorys/components/AddDialog.vue            | 7 +++++++
 .../ShopGoodsCategorys/components/DetailDialog.vue         | 6 ++++++
 .../ShopGoodsCategorys/components/EditDialog.vue           | 6 ++++++
 .../business/GoodsManager/ShopGoodsCategorys/index.vue     | 7 +++++++
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index 71ea075..19773a9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,7 +17,7 @@ import pinia from '@/store/index'
 
 // svg图标
 import '@/assets/iconfont/iconfont.js' //iconfont
-import 'virtual:svg-icons-register'
+// import 'virtual:svg-icons-register'
 import SvgIcon from '@/components/SvgIcon/index.vue'
 import elementIcons from '@/components/SvgIcon/svgicon'
 
diff --git a/src/views/business/GoodsManager/Goodss/components/AddDialog.vue b/src/views/business/GoodsManager/Goodss/components/AddDialog.vue
index 07bb834..c06f2a8 100644
--- a/src/views/business/GoodsManager/Goodss/components/AddDialog.vue
+++ b/src/views/business/GoodsManager/Goodss/components/AddDialog.vue
@@ -532,7 +532,7 @@ const formData = reactive({
   goodsSpecList: [],
   skuList: [],
   goodsSpecType: 1,
-  goodsDeductStockType: 1,
+  goodsDeductStockType: 2,
   goodsPriceLowest: 1.00,
   goodsTotalInventory: 100,
   goodsSalesInitial: 0,
@@ -596,7 +596,7 @@ const handleAddClick = async () => {
         formData.goodsServicesIds = formData.goodsServicesIds.join(',')
       }
 
-      if (formData.goodsSpecType = 2) {
+      if (formData.goodsSpecType == 2) {
         if (formData.goodsSpecList.length == 0) {
           modal.msgError('商品规格不能为空！')
           return
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue
index 63709b7..b4fdb84 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue
@@ -46,6 +46,12 @@
             <el-input v-model="formData.shopGoodsCategoryName" placeholder="请输入名称" />
           </el-form-item>
         </el-col>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="图片" prop="shopGoodsCategoryImg">
+            <UploadImage ref="uploadRef" v-model="formData.shopGoodsCategoryImg" :data=imgData :limit="1" :fileSize="5"
+              :drag="true" />
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="显示状态" prop="shopGoodsCategoryDisplayStatus">
             <el-radio-group v-model="formData.shopGoodsCategoryDisplayStatus">
@@ -177,6 +183,7 @@ const handleAddClick = async (formEl) => {
 };
 const closeDialog = () => {
   formData.shopName = ""
+  formData.shopGoodsCategoryImg = ""
   formData.shopGuid = ""
   formData.shopGoodsCategoryParentGuid = ""
   console.log(formData);
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue
index c7c7c09..dc968da 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue
@@ -40,6 +40,12 @@
             <el-input v-model="formData.shopGoodsCategoryName" placeholder="请输入名称" />
           </el-form-item>
         </el-col>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="图片" prop="shopGoodsCategoryImg">
+            <UploadImage ref="uploadRef" v-model="formData.shopGoodsCategoryImg" :data=imgData :limit="1" :fileSize="5"
+              :drag="true" />
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="显示状态" prop="shopGoodsCategoryDisplayStatus">
             <el-radio-group v-model="formData.shopGoodsCategoryDisplayStatus">
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue
index 61c7554..6dd32b8 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue
@@ -40,6 +40,12 @@
             <el-input v-model="formData.shopGoodsCategoryName" placeholder="请输入名称" />
           </el-form-item>
         </el-col>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="图片" prop="shopGoodsCategoryImg">
+            <UploadImage ref="uploadRef" v-model="formData.shopGoodsCategoryImg" :data=imgData :limit="1" :fileSize="5"
+              :drag="true" />
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="显示状态" prop="shopGoodsCategoryDisplayStatus">
             <el-radio-group v-model="formData.shopGoodsCategoryDisplayStatus">
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
index a03363b..ff73b3b 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
@@ -63,6 +63,13 @@
 	  
       <el-table-column v-if="userid == 1" prop="shopName" label="店铺名称" align="left" :show-overflow-tooltip="true" />
       <el-table-column prop="shopGoodsCategoryName" label="名称" align="left" :show-overflow-tooltip="true" />
+      <el-table-column prop="shopGoodsCategoryImg" label="图片" align="center">
+        <template #default="scope">
+          <el-image preview-teleported :hide-on-click-modal="true" lazy class="table-td-thumb" fit="contain" :src="scope.row.shopGoodsCategoryImg?.split(',')[0]" :preview-src-list="scope.row.goodsCategoryImg?.split(',')">
+            <div><el-icon :size="15"><document /></el-icon></div>
+          </el-image>
+        </template>
+      </el-table-column>
       <el-table-column prop="shopGoodsCategoryDisplayStatus" label="显示状态" align="center">
         <template #default="scope">
           <dict-tag :options=" display_status " :value="scope.row.shopGoodsCategoryDisplayStatus" />