From 332f65334b64594f03ec4ef81b21149bf15e0ef8 Mon Sep 17 00:00:00 2001
From: "925116093-qq.com" <925116093@qq.com>
Date: Wed, 28 May 2025 18:30:04 +0800
Subject: [PATCH] 202505281829

---
 .../src/main/resources/application.yml        |   4 +-
 ruoyi-ui/src/components/Sku/sku.vue           |  18 +-
 .../src/views/system/IntegralCate/index.vue   |  29 +-
 .../views/system/IntegralProduct/index.vue    | 713 ++++++++++++------
 4 files changed, 488 insertions(+), 276 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f98b4d1..2e3daf3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -122,8 +122,8 @@ swagger:
 # 防止XSS攻击
 xss:
   # 过滤开关
-  enabled: true
+  enabled: false
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
+  excludes: /system/notice,/system/IntegralProduct/*,/system/Order/*,/system/Content/*
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
diff --git a/ruoyi-ui/src/components/Sku/sku.vue b/ruoyi-ui/src/components/Sku/sku.vue
index ffb7d80..bd0b906 100644
--- a/ruoyi-ui/src/components/Sku/sku.vue
+++ b/ruoyi-ui/src/components/Sku/sku.vue
@@ -53,25 +53,13 @@ export default {
 		return {
             data:{},
 			sourceAttribute: [
-            {
-					name: '颜色',
-					item: ['黑', '金', '白']
-				}
+            
             ],
 			attribute: [
-            {
-					name: '颜色',
-					item: ['黑', '金', '白']
-				}
+           
             ],
 			sku: [
-            {
-                "sku": "黑;16G",
-                "pic": "2121",
-                "price": "212121",
-                "stock":"999"
-
-            }
+            
             ],
             structure:[
                 {
diff --git a/ruoyi-ui/src/views/system/IntegralCate/index.vue b/ruoyi-ui/src/views/system/IntegralCate/index.vue
index 0d7a7de..ad2f914 100644
--- a/ruoyi-ui/src/views/system/IntegralCate/index.vue
+++ b/ruoyi-ui/src/views/system/IntegralCate/index.vue
@@ -126,34 +126,21 @@
     />
 
     <!-- 添加或修改积分商品分类对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="名称" prop="title">
           <el-input v-model="form.title" placeholder="请输入名称" />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序" />
+          <el-input-number v-model="form.sort" :min="1" style="width: 120px;" />
         </el-form-item>
-        <el-form-item label="${comment}" prop="createdAt">
-          <el-date-picker clearable
-            v-model="form.createdAt"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="updatedAt">
-          <el-date-picker clearable
-            v-model="form.updatedAt"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择${comment}">
-          </el-date-picker>
+        <el-form-item label="状态" prop="status">
+          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+      <div class="dialog-footer" style="text-align:left;margin-top:20px;">
+        <el-button @click="reset">重置</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-dialog>
 
diff --git a/ruoyi-ui/src/views/system/IntegralProduct/index.vue b/ruoyi-ui/src/views/system/IntegralProduct/index.vue
index 423aca5..c25e6b9 100644
--- a/ruoyi-ui/src/views/system/IntegralProduct/index.vue
+++ b/ruoyi-ui/src/views/system/IntegralProduct/index.vue
@@ -1,69 +1,115 @@
-
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-  <el-form-item label="名称" prop="title">
-    <el-input
-      v-model="queryParams.title"
-      placeholder="请输入名称"
-      clearable
-      @keyup.enter.native="handleQuery"
-    />
-  </el-form-item>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="名称" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!-- 市场价范围 -->
       <el-form-item label="市场价">
-        <el-input v-model="queryParams.minPrice" class="number-input" type="number" placeholder="最小值" clearable style="width: 120px;" />
+        <el-input
+          v-model="queryParams.minPrice"
+          class="number-input"
+          type="number"
+          placeholder="最小值"
+          clearable
+          style="width: 120px"
+        />
         -
-        <el-input v-model="queryParams.maxPrice" class="number-input" type="number" placeholder="最大值" clearable style="width: 120px;" />
+        <el-input
+          v-model="queryParams.maxPrice"
+          class="number-input"
+          type="number"
+          placeholder="最大值"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
 
       <!-- 积分范围 -->
       <el-form-item label="积分">
-        <el-input v-model="queryParams.minNum"  class="number-input" type="number" placeholder="最小值" clearable style="width: 120px;" />
+        <el-input
+          v-model="queryParams.minNum"
+          class="number-input"
+          type="number"
+          placeholder="最小值"
+          clearable
+          style="width: 120px"
+        />
         -
-        <el-input v-model="queryParams.maxNum"  class="number-input" type="number" placeholder="最大值" clearable style="width: 120px;" />
+        <el-input
+          v-model="queryParams.maxNum"
+          class="number-input"
+          type="number"
+          placeholder="最大值"
+          clearable
+          style="width: 120px"
+        />
+      </el-form-item>
+      <el-form-item label="分类" prop="cateId">
+        <el-input
+          v-model="queryParams.cateId"
+          placeholder="请输入分类"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-  <el-form-item label="分类" prop="cateId">
-    <el-input
-      v-model="queryParams.cateId"
-      placeholder="请输入分类"
-      clearable
-      @keyup.enter.native="handleQuery"
-    />
-  </el-form-item>
 
-  <!-- 新增：状态 -->
-  <el-form-item label="状态" prop="status">
-    <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-      <el-option label="启用" :value="1" />
-      <el-option label="停用" :value="0" />
-    </el-select>
-  </el-form-item>
+      <!-- 新增：状态 -->
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+        >
+          <el-option label="启用" :value="1" />
+          <el-option label="停用" :value="0" />
+        </el-select>
+      </el-form-item>
 
-  <!-- 新增：创建时间范围 -->
-  <el-form-item label="创建时间">
-    <el-date-picker
-      v-model="queryParams.beginTime"
-      type="date"
-      placeholder="开始日期"
-      value-format="yyyy-MM-dd"
-      format="yyyy-MM-dd"
-    ></el-date-picker>
-    -
-    <el-date-picker
-      v-model="queryParams.endTime"
-      type="date"
-      placeholder="结束日期"
-      value-format="yyyy-MM-dd"
-      format="yyyy-MM-dd"
-    ></el-date-picker>
-  </el-form-item>
+      <!-- 新增：创建时间范围 -->
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="queryParams.beginTime"
+          type="date"
+          placeholder="开始日期"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+        ></el-date-picker>
+        -
+        <el-date-picker
+          v-model="queryParams.endTime"
+          type="date"
+          placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+        ></el-date-picker>
+      </el-form-item>
 
-  <el-form-item>
-    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-  </el-form-item>
-</el-form>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -74,7 +120,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:IntegralProduct:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -85,7 +132,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:IntegralProduct:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -96,7 +144,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:IntegralProduct:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -106,63 +155,148 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:IntegralProduct:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="IntegralProductList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="IntegralProductList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center"  width="55" prop="id" />
+      <el-table-column label="ID" align="center" width="55" prop="id" />
       <el-table-column label="分类" align="center" prop="cateName" />
       <el-table-column label="名称" align="center" prop="title" />
-      <el-table-column label="主图" align="center"  prop="image" width="100">
+      <el-table-column label="主图" align="center" prop="image" width="100">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.image" :width="50" :height="50"/>
+          <image-preview :src="scope.row.image" :width="50" :height="50" />
         </template>
       </el-table-column>
 
       <!-- 市场价范围 -->
-      <el-form-item label="市场价">
-        <el-input v-model="queryParams.minPrice" placeholder="最小值" style="width: 80px;" oninput="value=value.replace(/[^\\d\\.]/g,'')" />
+      <!-- <el-form-item label="市场价">
+        <el-input
+          v-model="queryParams.minPrice"
+          placeholder="最小值"
+          style="width: 80px"
+          oninput="value=value.replace(/[^\\d\\.]/g,'')"
+        />
         -
-        <el-input v-model="queryParams.maxPrice" placeholder="最大值" style="width: 80px;" oninput="value=value.replace(/[^\\d\\.]/g,'')" />
-      </el-form-item>
+        <el-input
+          v-model="queryParams.maxPrice"
+          placeholder="最大值"
+          style="width: 80px"
+          oninput="value=value.replace(/[^\\d\\.]/g,'')"
+        />
+      </el-form-item> -->
 
       <!-- 积分范围 -->
-      <el-form-item label="积分">
-        <el-input v-model="queryParams.minNum" placeholder="最小值" style="width: 80px;" oninput="value=value.replace(/[^\\d]/g,'')" />
+      <!-- <el-form-item label="积分">
+        <el-input
+          v-model="queryParams.minNum"
+          placeholder="最小值"
+          style="width: 80px"
+          oninput="value=value.replace(/[^\\d]/g,'')"
+        />
         -
-        <el-input v-model="queryParams.maxNum" placeholder="最大值" style="width: 80px;" oninput="value=value.replace(/[^\\d]/g,'')" />
-      </el-form-item>
+        <el-input
+          v-model="queryParams.maxNum"
+          placeholder="最大值"
+          style="width: 80px"
+          oninput="value=value.replace(/[^\\d]/g,'')"
+        />
+      </el-form-item> -->
       <el-table-column label="排序" align="center" width="75" prop="sort">
         <template slot-scope="scope">
-          <div style="cursor:pointer;color:#409EFF;display:inline-block;">
-            <span @click="openEditDialog(scope.row, 'sort', '排序')">{{ scope.row.sort }}</span>
-            <svg @click="openEditDialog(scope.row, 'sort', '排序')" width="14" height="14" viewBox="0 0 1024 1024" fill="#bbb" style="margin-left:4px;vertical-align:middle;cursor:pointer;"><path d="M880.64 227.84l-84.48-84.48c-25.6-25.6-67.2-25.6-92.8 0l-59.52 59.52 177.28 177.28 59.52-59.52c25.6-25.6 25.6-67.2 0-92.8zM160 736v128h128l376.32-376.32-128-128L160 736z"/></svg>
-            <div style="border-bottom:1px dashed #bbb;width:100%;margin-top:2px;"></div>
+          <div style="cursor: pointer; color: #409eff; display: inline-block">
+            <span @click="openEditDialog(scope.row, 'sort', '排序')">{{
+              scope.row.sort
+            }}</span>
+            <svg
+              @click="openEditDialog(scope.row, 'sort', '排序')"
+              width="14"
+              height="14"
+              viewBox="0 0 1024 1024"
+              fill="#bbb"
+              style="margin-left: 4px; vertical-align: middle; cursor: pointer"
+            >
+              <path
+                d="M880.64 227.84l-84.48-84.48c-25.6-25.6-67.2-25.6-92.8 0l-59.52 59.52 177.28 177.28 59.52-59.52c25.6-25.6 25.6-67.2 0-92.8zM160 736v128h128l376.32-376.32-128-128L160 736z"
+              />
+            </svg>
+            <div
+              style="
+                border-bottom: 1px dashed #bbb;
+                width: 100%;
+                margin-top: 2px;
+              "
+            ></div>
           </div>
         </template>
       </el-table-column>
       <el-table-column label="销量" align="center" width="75" prop="sales">
         <template slot-scope="scope">
-          <div style="cursor:pointer;color:#409EFF;display:inline-block;">
-            <span @click="openEditDialog(scope.row, 'sales', '销量')">{{ scope.row.sales }}</span>
-            <svg @click="openEditDialog(scope.row, 'sales', '销量')" width="14" height="14" viewBox="0 0 1024 1024" fill="#bbb" style="margin-left:4px;vertical-align:middle;cursor:pointer;"><path d="M880.64 227.84l-84.48-84.48c-25.6-25.6-67.2-25.6-92.8 0l-59.52 59.52 177.28 177.28 59.52-59.52c25.6-25.6 25.6-67.2 0-92.8zM160 736v128h128l376.32-376.32-128-128L160 736z"/></svg>
-            <div style="border-bottom:1px dashed #bbb;width:100%;margin-top:2px;"></div>
+          <div style="cursor: pointer; color: #409eff; display: inline-block">
+            <span @click="openEditDialog(scope.row, 'sales', '销量')">{{
+              scope.row.sales
+            }}</span>
+            <svg
+              @click="openEditDialog(scope.row, 'sales', '销量')"
+              width="14"
+              height="14"
+              viewBox="0 0 1024 1024"
+              fill="#bbb"
+              style="margin-left: 4px; vertical-align: middle; cursor: pointer"
+            >
+              <path
+                d="M880.64 227.84l-84.48-84.48c-25.6-25.6-67.2-25.6-92.8 0l-59.52 59.52 177.28 177.28 59.52-59.52c25.6-25.6 25.6-67.2 0-92.8zM160 736v128h128l376.32-376.32-128-128L160 736z"
+              />
+            </svg>
+            <div
+              style="
+                border-bottom: 1px dashed #bbb;
+                width: 100%;
+                margin-top: 2px;
+              "
+            ></div>
           </div>
         </template>
       </el-table-column>
       <el-table-column label="库存" align="center" width="75" prop="stock">
         <template slot-scope="scope">
-          <div style="cursor:pointer;color:#409EFF;display:inline-block;">
-            <span @click="openEditDialog(scope.row, 'stock', '库存')">{{ scope.row.stock }}</span>
-            <svg @click="openEditDialog(scope.row, 'stock', '库存')" width="14" height="14" viewBox="0 0 1024 1024" fill="#bbb" style="margin-left:4px;vertical-align:middle;cursor:pointer;"><path d="M880.64 227.84l-84.48-84.48c-25.6-25.6-67.2-25.6-92.8 0l-59.52 59.52 177.28 177.28 59.52-59.52c25.6-25.6 25.6-67.2 0-92.8zM160 736v128h128l376.32-376.32-128-128L160 736z"/></svg>
-            <div style="border-bottom:1px dashed #bbb;width:100%;margin-top:2px;"></div>
+          <div style="cursor: pointer; color: #409eff; display: inline-block">
+            <span @click="openEditDialog(scope.row, 'stock', '库存')">{{
+              scope.row.stock
+            }}</span>
+            <svg
+              @click="openEditDialog(scope.row, 'stock', '库存')"
+              width="14"
+              height="14"
+              viewBox="0 0 1024 1024"
+              fill="#bbb"
+              style="margin-left: 4px; vertical-align: middle; cursor: pointer"
+            >
+              <path
+                d="M880.64 227.84l-84.48-84.48c-25.6-25.6-67.2-25.6-92.8 0l-59.52 59.52 177.28 177.28 59.52-59.52c25.6-25.6 25.6-67.2 0-92.8zM160 736v128h128l376.32-376.32-128-128L160 736z"
+              />
+            </svg>
+            <div
+              style="
+                border-bottom: 1px dashed #bbb;
+                width: 100%;
+                margin-top: 2px;
+              "
+            ></div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态"  width="85"  align="center">
+      <el-table-column label="状态" width="85" align="center">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -173,17 +307,32 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="创建时间" align="center" prop="createdAt" width="150">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createdAt"
+        width="150"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createdAt, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updatedAt" width="150">
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updatedAt"
+        width="150"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updatedAt, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center"  width="100"  class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        width="100"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -191,20 +340,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:IntegralProduct:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:IntegralProduct:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -212,50 +363,109 @@
     />
 
     <!-- 添加或修改积分商品对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="名称" prop="title">
-          <el-input v-model="form.title" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="主图" prop="image">
-          <image-upload v-model="form.image"/>
-        </el-form-item>
-        <el-form-item label="轮播图" prop="images">
-          <image-upload v-model="form.images"/>
-        </el-form-item>
-        <el-form-item label="市场价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入市场价" />
-        </el-form-item>
-        <el-form-item label="积分" prop="num">
-          <el-input v-model="form.num" placeholder="请输入积分" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序" />
-        </el-form-item>
-        <el-form-item label="销量" prop="sales">
-          <el-input v-model="form.sales" placeholder="请输入销量" />
-        </el-form-item>
-        <el-form-item label="库存" prop="stock">
-          <el-input v-model="form.stock" placeholder="请输入库存" />
-        </el-form-item>
-        <el-form-item label="标签" prop="tags">
-          <el-input v-model="form.tags" placeholder="请输入标签" />
-        </el-form-item>
-        <el-form-item label="分类" prop="cateId">
-          <el-input v-model="form.cateId" placeholder="请输入分类" />
-        </el-form-item>
-        <el-form-item label="规格" prop="sku">
-          <el-input v-model="form.sku" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="详情">
-          <editor v-model="form.contetnt" :min-height="192"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+    <el-drawer :title="title" :visible.sync="open" size="60%" append-to-body>
+      <div style="padding:0 30px;">
+
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="基本信息" name="base">
+          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+            <el-form-item label="分类" prop="cateId">
+              <el-input v-model="form.cateId" placeholder="请输入分类" />
+            </el-form-item>
+            <el-form-item label="名称" prop="title">
+              <el-input v-model="form.title" placeholder="请输入名称" />
+            </el-form-item>
+            <el-form-item label="主图" prop="image">
+              <image-upload v-model="form.image"/>
+            </el-form-item>
+            <el-form-item label="轮播图" prop="images">
+              <image-upload v-model="form.images"/>
+            </el-form-item>
+            <el-form-item label="标签" prop="tags">
+              <el-input v-model="form.tags" placeholder="请输入标签" />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="营销配置" name="marketing">
+          
+            <el-form-item label="市场价" prop="price">
+              <el-input-number v-model="form.price" :min="0" :step="0.01" :precision="2" placeholder="请输入市场价" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="积分" prop="num">
+              <el-input-number v-model="form.num" :min="0" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="排序" prop="sort">
+              <el-input-number v-model="form.sort" :min="1" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="销量" prop="sales">
+              <el-input-number v-model="form.sales" :min="0" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="库存" prop="stock">
+              <el-input-number v-model="form.stock" :min="0" style="width: 200px;" />
+            </el-form-item>
+          
+        </el-tab-pane>
+        <el-tab-pane label="规格配置" name="spec">
+            <el-form-item label="规格">
+              <el-radio-group v-model="skuType">
+                <el-radio-button label="single">单规格</el-radio-button>
+                <el-radio-button label="multi">多规格</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <div v-if="skuType === 'single'">
+             
+              <el-form-item label="规格名">
+                <el-input v-model="form.skuName" placeholder="请输入规格名" />
+              </el-form-item>
+              <el-form-item label="规格值">
+                <el-input v-model="form.skuValue" placeholder="请输入规格值" />
+              </el-form-item>
+            </div>
+            <div v-else>
+             
+              <Sku :info="form.sku" ref="skuRef"></Sku>
+            </div>
+          </el-tab-pane>
+
+
+        <!-- <el-tab-pane label="规格配置1" name="sku">
+          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+            <el-form-item label="规格" prop="skuType">
+              <el-radio-group v-model="form.skuType">
+                <el-radio :label="1">单规格</el-radio>
+                <el-radio :label="2">多规格</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="规格名" v-if="form.skuType == 2">
+              <el-input v-model="form.skuName" placeholder="请输入规格名" />
+            </el-form-item>
+            <el-form-item label="规格值" v-if="form.skuType == 2">
+              <el-input v-model="form.skuValue" placeholder="请输入规格值" />
+            </el-form-item>
+            <el-form-item label="规格" prop="sku">
+              <el-input v-model="form.sku" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-form>
+        </el-tab-pane> -->
+        <el-tab-pane label="详情配置" name="detail">
+          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+            <el-form-item label="详情">
+              <editor v-model="form.contetnt" :min-height="192"/>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
+    </el-form>
+      <div class="dialog-footer" style="text-align:left;margin-top:20px;">
+        <el-button @click="reset">重置</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
-    </el-dialog>
+</div>
+    </el-drawer>
 
     <el-dialog :visible.sync="editDialogVisible" title="编辑" width="300px">
       <el-form>
@@ -272,10 +482,18 @@
 </template>
 
 <script>
-import { listIntegralProduct, getIntegralProduct, delIntegralProduct, addIntegralProduct, updateIntegralProduct,changetypeStatus } from "@/api/system/IntegralProduct"
-
+import {
+  listIntegralProduct,
+  getIntegralProduct,
+  delIntegralProduct,
+  addIntegralProduct,
+  updateIntegralProduct,
+  changetypeStatus,
+} from "@/api/system/IntegralProduct";
+import Editor from "@/components/Editor";
 export default {
   name: "IntegralProduct",
+  components: { Editor },
   data() {
     return {
       // 遮罩层
@@ -319,64 +537,55 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        title: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
-        ],
-        price: [
-          { required: true, message: "市场价不能为空", trigger: "blur" }
-        ],
-        num: [
-          { required: true, message: "积分不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "排序不能为空", trigger: "blur" }
-        ],
-        sales: [
-          { required: true, message: "销量不能为空", trigger: "blur" }
-        ],
-        stock: [
-          { required: true, message: "库存不能为空", trigger: "blur" }
-        ],
+        title: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        price: [{ required: true, message: "市场价不能为空", trigger: "blur" }],
+        num: [{ required: true, message: "积分不能为空", trigger: "blur" }],
+        sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
+        sales: [{ required: true, message: "销量不能为空", trigger: "blur" }],
+        stock: [{ required: true, message: "库存不能为空", trigger: "blur" }],
         status: [
-          { required: true, message: "状态不能为空", trigger: "change" }
-        ],
-        tags: [
-          { required: true, message: "标签不能为空", trigger: "blur" }
-        ],
-        cateId: [
-          { required: true, message: "分类不能为空", trigger: "blur" }
+          { required: true, message: "状态不能为空", trigger: "change" },
         ],
+        tags: [{ required: true, message: "标签不能为空", trigger: "blur" }],
+        cateId: [{ required: true, message: "分类不能为空", trigger: "blur" }],
         skuType: [
-          { required: true, message: "1：单规格 2：多规格不能为空", trigger: "change" }
-        ],
-        sku: [
-          { required: true, message: "规格不能为空", trigger: "blur" }
+          {
+            required: true,
+            message: "1：单规格 2：多规格不能为空",
+            trigger: "change",
+          },
         ],
+        sku: [{ required: true, message: "规格不能为空", trigger: "blur" }],
       },
       editDialogVisible: false,
-      editFieldValue: '',
-      editField: '',
-      editFieldLabel: '',
+      editFieldValue: "",
+      editField: "",
+      editFieldLabel: "",
       editRow: null,
-    }
+      activeTab: "base",
+      skuType: "single",
+      skuList: [{ name: "", value: "" }],
+      specList: [{ name: "", values: [""] }],
+      skuTable: [],
+    };
   },
   created() {
-    this.getList()
+    this.getList();
   },
   methods: {
     /** 查询积分商品列表 */
     getList() {
-      this.loading = true
-      listIntegralProduct(this.queryParams).then(response => {
-        this.IntegralProductList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+      this.loading = true;
+      listIntegralProduct(this.queryParams).then((response) => {
+        this.IntegralProductList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     // 取消按钮
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -397,99 +606,124 @@ export default {
         sku: null,
         contetnt: null,
         createdAt: null,
-        updatedAt: null
-      }
-      this.resetForm("form")
+        updatedAt: null,
+      };
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.pageNum = 1;
       // 校验最小最大值逻辑（可选）
-      if (this.queryParams.minPrice !== null && this.queryParams.maxPrice !== null && this.queryParams.minPrice > this.queryParams.maxPrice) {
+      if (
+        this.queryParams.minPrice !== null &&
+        this.queryParams.maxPrice !== null &&
+        this.queryParams.minPrice > this.queryParams.maxPrice
+      ) {
         this.$message.warning("市场价范围不合法");
         return;
       }
 
-      if (this.queryParams.minNum !== null && this.queryParams.maxNum !== null && this.queryParams.minNum > this.queryParams.maxNum) {
+      if (
+        this.queryParams.minNum !== null &&
+        this.queryParams.maxNum !== null &&
+        this.queryParams.minNum > this.queryParams.maxNum
+      ) {
         this.$message.warning("积分范围不合法");
         return;
       }
 
-      this.getList()
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     // 任务状态修改
     handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用"
-      this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
-        return changetypeStatus(row.id, row.status)
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功")
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0"
-      })
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal
+        .confirm('确认要"' + text + '""' + row.title + '"状态吗？')
+        .then(function () {
+          return changetypeStatus(row.id, row.status);
+        })
+        .then(() => {
+          this.$modal.msgSuccess(text + "成功");
+        })
+        .catch(function () {
+          row.status = row.status === "0" ? "1" : "0";
+        });
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加积分商品"
+      this.reset();
+      this.open = true;
+      this.title = "添加积分商品";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      const id = row.id || this.ids
-      getIntegralProduct(id).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = "修改积分商品"
-      })
+      this.reset();
+      const id = row.id || this.ids;
+      getIntegralProduct(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改积分商品";
+      });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      if( this.$refs.skuRef.submit()){
+        this.form.sku=this.$refs.skuRef.submit();
+      }else{
+        return
+      }
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateIntegralProduct(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
+            updateIntegralProduct(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
-            addIntegralProduct(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
+            addIntegralProduct(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除积分商品编号为"' + ids + '"的数据项？').then(function() {
-        return delIntegralProduct(ids)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除积分商品编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delIntegralProduct(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/IntegralProduct/export', {
-        ...this.queryParams
-      }, `IntegralProduct_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/IntegralProduct/export",
+        {
+          ...this.queryParams,
+        },
+        `IntegralProduct_${new Date().getTime()}.xlsx`
+      );
     },
     openEditDialog(row, field, label) {
       this.editRow = row;
@@ -501,30 +735,33 @@ export default {
     async saveEditField() {
       if (!this.editRow) return;
       // 需要转为数字的字段
-      const numberFields = ['price', 'num', 'sort', 'sales', 'stock'];
+      const numberFields = ["price", "num", "sort", "sales", "stock"];
       const value = numberFields.includes(this.editField)
         ? Number(this.editFieldValue)
         : this.editFieldValue;
       const payload = {
         id: this.editRow.id,
-        [this.editField]: value
+        [this.editField]: value,
       };
       try {
         await updateIntegralProduct(payload);
-        this.$message.success('修改成功');
+        this.$message.success("修改成功");
         this.editDialogVisible = false;
         this.getList();
       } catch (e) {
-        this.$message.error('修改失败');
+        this.$message.error("修改失败");
       }
     },
-  }
-}
+  },
+};
 </script>
 <style scoped>
-
-.number-input ::v-deep .el-input__inner[type="number"]::-webkit-inner-spin-button,
-.number-input ::v-deep .el-input__inner[type="number"]::-webkit-outer-spin-button {
+.number-input
+  ::v-deep
+  .el-input__inner[type="number"]::-webkit-inner-spin-button,
+.number-input
+  ::v-deep
+  .el-input__inner[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }