From 4aa8af6ccffb47efdd8472f60960222390aff721 Mon Sep 17 00:00:00 2001 From: Administrator <513693417@qq.com> Date: Tue, 8 Sep 2020 18:31:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/business/domain/BizProduct.java | 14 +- .../mapper/business/BizProductMapper.xml | 8 +- .../templates/business/product/add.html | 6 + .../templates/business/product/edit.html | 358 +++++++++--------- 4 files changed, 204 insertions(+), 182 deletions(-) diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProduct.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProduct.java index 30deacfa8..66b3a4f07 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProduct.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProduct.java @@ -40,6 +40,10 @@ public class BizProduct extends BaseEntity @Excel(name = "产品单价") private Long amount; + /** 产品返现 */ + @Excel(name = "产品单价") + private Long cashbackAmount; + /** 排序 */ @Excel(name = "排序") private Long sort; @@ -119,7 +123,15 @@ public class BizProduct extends BaseEntity this.sort = sort; } - public Long getSort() + public Long getCashbackAmount() { + return cashbackAmount; + } + + public void setCashbackAmount(Long cashbackAmount) { + this.cashbackAmount = cashbackAmount; + } + + public Long getSort() { return sort; } diff --git a/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml index 9b9f13c8b..bf3abab9a 100644 --- a/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/BizProductMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select product_id, product_code, product_name, product_type_id, product_class, amount, sort, online_status, online_time, offline_time, remark, create_by, create_time, update_by, update_time from biz_product + select product_id, product_code, product_name, product_type_id, product_class, amount, cashback_amount, sort, online_status, online_time, offline_time, remark, create_by, create_time, update_by, update_time from biz_product +
+ +
+ +
+
diff --git a/ruoyi-business/src/main/resources/templates/business/product/edit.html b/ruoyi-business/src/main/resources/templates/business/product/edit.html index 43f565523..f54273dd5 100644 --- a/ruoyi-business/src/main/resources/templates/business/product/edit.html +++ b/ruoyi-business/src/main/resources/templates/business/product/edit.html @@ -2,195 +2,195 @@ + -
-
-

产品信息

- -
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-

产品图片信息

-
-
- - -
-
+ + + + +
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 排序数字越大排列越靠前 +
+
+
+ +
+
+ + +
+
+ + +
+
+
+
+ +
+ +
- +
+
+
+ +
+ +
+ +
+ 只能上传png jpg gif图片且大小不能超过200KB +
+
+
+ +
+
+ +
+ 只能上传png jpg gif图片且大小不能超过200KB +
+
+
+ +
+
+ +
+ 只能上传png jpg gif图片且大小不能超过200KB +
+
+
+
+
- - + $("#detailImages").fileinput({ + uploadUrl: '/common/upload', + initialPreviewAsData: true, + initialPreview: detailImagesArr, + maxFileCount: 20, + maxFilesNum : 20, + maxFileSize: 200, + allowedFileTypes: ['image'], + allowedFileExtensions: ['jpg','png','gif','jpeg'] + }).on('fileuploaded', function (event, data, previewId, index) { + detailImagesArr.push(data.response.url); + }).on('fileremoved', function (event, id, index) { + detailImagesArr.splice(detailImagesArr.indexOf(data.response.url), 1); + }); + + $("#loopImages").fileinput({ + uploadUrl: '/common/upload', + initialPreviewAsData: true, + initialPreview: loopImagesArr, + maxFileCount: 5, + maxFilesNum : 5, + maxFileSize: 200, + allowedFileTypes: ['image'], + allowedFileExtensions: ['jpg','png','gif','jpeg'] + }).on('fileuploaded', function (event, data, previewId, index) { + loopImagesArr.push(data.response.url); + }).on('fileremoved', function (event, id, index) { + loopImagesArr.splice(loopImagesArr.indexOf(data.response.url), 1); + }); + \ No newline at end of file