From 446d0e7f59aef3f028913984165648ff4df75985 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 18 Jul 2023 16:06:31 +0800
Subject: [PATCH] 商城商品修改
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 36 +++++++++++++++++++-----------------
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 8 +++++---
src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java | 2 +-
3 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
index eec53f8..f447f0f 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "是否热卖", example = "1是2否")
private Integer isHot;
- @ApiModelProperty(value = "是否普通商品 1-普通商品 2-积分商品 3-双卷商品", example = "2")
+ @ApiModelProperty(value = "1-积分兑换商品2-购买积分商品3-普通商品商品4-课程卷商品5-名宿卷商品", example = "2")
private Integer isNormal;
@ApiModelProperty(value = "1-付费商品 2-积分商品")
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 1cb5608..3c32390 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -97,28 +97,30 @@
<label class="layui-form-label febs-form-item-require">商品类型</label>
<div class="layui-input-block">
<select name="isNormal" class="goods-type" lay-filter="goods-type-select">
- <option value="1">普通商品</option>
- <option value="2">积分商品</option>
- <option value="2">双卷商品</option>
+ <option value="1">积分兑换商品</option>
+ <option value="2">购买积分商品</option>
+ <option value="3">普通商品商品</option>
+ <option value="4">课程卷商品</option>
+ <option value="5">名宿卷商品</option>
</select>
</div>
</div>
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态倍数</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态倍数</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 1c10672..41e0088 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -106,9 +106,11 @@
<div class="layui-input-block">
<select name="isNormal" class="goods-type"
lay-filter="goods-type-select">
- <option value="1">普通商品</option>
- <option value="2">积分商品</option>
- <option value="2">双卷商品</option>
+ <option value="1">积分兑换商品</option>
+ <option value="2">购买积分商品</option>
+ <option value="3">普通商品商品</option>
+ <option value="4">课程卷商品</option>
+ <option value="5">名宿卷商品</option>
</select>
</div>
</div>
--
Gitblit v1.9.1