From 9a55093516825965faa1f4b92812ed5a4fc97dd4 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 8 Aug 2024 09:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=95=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=92=8C=E5=A4=9A=E8=A7=84=E6=A0=BC=E4=B9=8B=E9=97=B4=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/add_shop.vue | 13 +++++++------
 src/views/product/index.vue    |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 78769d1..4682db6 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-form ref="formRef" :model="form" :rules="rules" label-width="140px" label-position="left">
       <el-form-item label="商品类型" prop="typeEnum">
-        <div class="shop_type_box" :class="{ disabled: form.id }">
+        <div class="shop_type_box" :class="{  }">
+          <!-- <div class="shop_type_box" :class="{ disabled: form.id }"> -->
           <div class="item" v-for="(item, index) in shopTypes" :key="index"
             :class="{ active: shopTypesActive == index }" @click="changeTypeEnum(index)">
             <div class="s_title">{{ item.label }}</div>
@@ -152,9 +153,9 @@
             </template>
           </el-table-column>
         </el-table>
-        <div class="tips" v-if="form.isShowMall">
+        <!-- <div class="tips" v-if="form.isShowMall">
           注：小程序商城必须设置库存数量大于0
-        </div>
+        </div> -->
       </el-form-item>
       <template v-if="form.typeEnum == 'group'">
         <el-form-item label="使用日期说明" prop="notices.dateUsed">
@@ -307,9 +308,9 @@
             </template>
           </el-table-column> -->
         </el-table>
-        <div class="tips" v-if="form.isShowMall">
+        <!-- <div class="tips" v-if="form.isShowMall">
           注：小程序商城必须设置库存数量大于0
-        </div>
+        </div> -->
       </el-form-item>
       <template v-if="form.typeEnum != 'group'">
         <el-form-item label="上架区域">
@@ -745,7 +746,7 @@ export default {
     },
     // 切换类型
     changeTypeEnum(index) {
-      if (this.form.id) return;
+      // if (this.form.id) return;
       this.shopTypesActive = index;
       const typeEnum = this.shopTypes[index].typeEnum;
       this.form.typeEnum = typeEnum;
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 66cea89..7449606 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -53,6 +53,9 @@
           <template v-slot="scope">
             <span>￥{{ scope.row.lowPrice }}</span>
           </template>
+        </el-table-column>
+        <el-table-column label="商品规格" prop="typeEnum">
+        
         </el-table-column>
         <el-table-column label="销量/库存">
           <template v-slot="scope">