diff --git a/ruoyi-front/src/main/resources/templates/front/carousel/add.html b/ruoyi-front/src/main/resources/templates/front/carousel/add.html
index f7eaac861..3a02ced9f 100644
--- a/ruoyi-front/src/main/resources/templates/front/carousel/add.html
+++ b/ruoyi-front/src/main/resources/templates/front/carousel/add.html
@@ -2,25 +2,28 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
     <th:block th:include="include :: header('新增首页轮播图')" />
+    <th:block th:include="include :: summernote-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-carousel-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">图片地址：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">图片：</label>
                 <div class="col-sm-8">
-                    <input name="pictureUrl" class="form-control" type="text" required>
+                    <input id="filePath" name="filePath" class="form-control" type="file">
+                    <input id="pictureUrl" name="pictureUrl" type="text" hidden>
                 </div>
             </div>
-            <div class="form-group">    
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">删除标志：</label>
                 <div class="col-sm-8">
                     <input name="delFlag" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
         </form>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: summernote-js" />
     <script th:inline="javascript">
         var prefix = ctx + "front/carousel"
         $("#form-carousel-add").validate({
@@ -29,9 +32,46 @@
 
         function submitHandler() {
             if ($.validate.form()) {
+                //同步上传图片，并且将上传图片返回的地址，赋值到pictureUrl对应的隐藏域上
+                uploadFile(false, "pictureUrl");
                 $.operate.save(prefix + "/add", $('#form-carousel-add').serialize());
             }
         }
+
+        $(function() {
+            $('.summernote').summernote({
+                lang: 'zh-CN',
+                callbacks: {
+                    onChange: function(contents, $edittable) {
+                        $("input[name='" + this.id + "']").val(contents);
+                    },
+                    onImageUpload: function(files) {
+                        var obj = this;
+                        var data = new FormData();
+                        data.append("file", files[0]);
+                        $.ajax({
+                            type: "post",
+                            url: ctx + "common/upload",
+                            data: data,
+                            cache: false,
+                            contentType: false,
+                            processData: false,
+                            dataType: 'json',
+                            success: function(result) {
+                                if (result.code == web_status.SUCCESS) {
+                                    $('#' + obj.id).summernote('insertImage', result.url);
+                                } else {
+                                    $.modal.alertError(result.msg);
+                                }
+                            },
+                            error: function(error) {
+                                $.modal.alertWarning("图片上传失败。");
+                            }
+                        });
+                    }
+                }
+            });
+        });
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-front/src/main/resources/templates/front/carousel/carousel.html b/ruoyi-front/src/main/resources/templates/front/carousel/carousel.html
index f0f943dfa..dd71aff88 100644
--- a/ruoyi-front/src/main/resources/templates/front/carousel/carousel.html
+++ b/ruoyi-front/src/main/resources/templates/front/carousel/carousel.html
@@ -6,7 +6,7 @@
 <body class="gray-bg">
      <div class="container-div">
         <div class="row">
-            <div class="col-sm-12 search-collapse">
+            <!--<div class="col-sm-12 search-collapse">
                 <form id="formId">
                     <div class="select-list">
                         <ul>
@@ -21,7 +21,7 @@
                         </ul>
                     </div>
                 </form>
-            </div>
+            </div>-->
 
             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="front:carousel:add">
@@ -66,7 +66,10 @@
                 },
                 {
                     field: 'pictureUrl',
-                    title: '图片地址'
+                    title: '图片地址',
+                    formatter: function(value, row, index) {
+                        return $.table.imageView(value);
+                    }
                 },
                 {
                     title: '操作',
diff --git a/ruoyi-front/src/main/resources/templates/front/carousel/edit.html b/ruoyi-front/src/main/resources/templates/front/carousel/edit.html
index 8b260ab42..f0703781b 100644
--- a/ruoyi-front/src/main/resources/templates/front/carousel/edit.html
+++ b/ruoyi-front/src/main/resources/templates/front/carousel/edit.html
@@ -7,15 +7,18 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-carousel-edit" th:object="${homePageCarousel}">
             <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">图片地址：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">图片：<!--<img th:src="*{pictureUrl}" class="img-circle" height="25px" width="25px"> --></label>
                 <div class="col-sm-8">
-                    <input name="pictureUrl" th:field="*{pictureUrl}" class="form-control" type="text" required>
+
+                    <input id="filePath" name="filePath" class="form-control" type="file">
+                    <input id="pictureUrl" name="pictureUrl" th:field="*{pictureUrl}"  type="text" hidden>
                 </div>
             </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: summernote-js" />
     <script th:inline="javascript">
         var prefix = ctx + "front/carousel";
         $("#form-carousel-edit").validate({
@@ -24,9 +27,48 @@
 
         function submitHandler() {
             if ($.validate.form()) {
+                uploadFile(false, "pictureUrl");
                 $.operate.save(prefix + "/edit", $('#form-carousel-edit').serialize());
             }
         }
+        $(function() {
+            $('.summernote').each(function(i) {
+                $('#' + this.id).summernote({
+                    lang: 'zh-CN',
+                    callbacks: {
+                        onChange: function(contents, $edittable) {
+                            $("input[name='" + this.id + "']").val(contents);
+                        },
+                        onImageUpload: function(files) {
+                            var obj = this;
+                            var data = new FormData();
+                            data.append("file", files[0]);
+                            $.ajax({
+                                type: "post",
+                                url: ctx + "common/upload",
+                                data: data,
+                                cache: false,
+                                contentType: false,
+                                processData: false,
+                                dataType: 'json',
+                                success: function(result) {
+                                    if (result.code == web_status.SUCCESS) {
+                                        $('#' + obj.id).summernote('insertImage', result.url);
+                                    } else {
+                                        $.modal.alertError(result.msg);
+                                    }
+                                },
+                                error: function(error) {
+                                    $.modal.alertWarning("图片上传失败。");
+                                }
+                            });
+                        }
+                    }
+                });
+                var content = $("input[name='" + this.id + "']").val();
+                $('#' + this.id).summernote('code', content);
+            })
+        });
     </script>
 </body>
 </html>
\ No newline at end of file
