From fa4729a006ae1d43c0c6a82b9b138412f7556ad4 Mon Sep 17 00:00:00 2001
From: lzx_mac <2602107437@qq.com>
Date: Sun, 24 Nov 2024 11:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/commonBanner/controller/CommonBannerController.java    | 2 +-
 .../java/org/jeecg/modules/commonBanner/entity/CommonBanner.java   | 2 +-
 .../org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java  | 2 +-
 .../jeecg/modules/commonBanner/service/ICommonBannerService.java   | 2 +-
 .../modules/commonBanner/service/impl/CommonBannerServiceImpl.java | 2 +-
 .../java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue   | 5 +++--
 .../jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue    | 2 +-
 .../java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts  | 7 +++++--
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java
index 8c0f8f3..96cf27c 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-11-19
+ * @Date:   2024-11-23
  * @Version: V1.0
  */
 @Api(tags="公共轮播图")
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java
index 6251b5f..7dd5d27 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-11-19
+ * @Date:   2024-11-23
  * @Version: V1.0
  */
 @Data
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java
index 0032367..f225b0c 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-11-19
+ * @Date:   2024-11-23
  * @Version: V1.0
  */
 public interface CommonBannerMapper extends BaseMapper<CommonBanner> {
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java
index b2daa02..e6c6532 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-11-19
+ * @Date:   2024-11-23
  * @Version: V1.0
  */
 public interface ICommonBannerService extends IService<CommonBanner> {
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java
index 7377164..eae3487 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 公共轮播图
  * @Author: jeecg-boot
- * @Date:   2024-11-19
+ * @Date:   2024-11-23
  * @Version: V1.0
  */
 @Service
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue
index 43581b6..cb075a4 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue
@@ -124,7 +124,8 @@
           {
             title:'图片',
             align:"center",
-            dataIndex: 'image'
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title: '操作',
@@ -160,7 +161,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'image',text:'图片',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         this.superFieldList = fieldList
       }
     }
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue
index 2b56c24..853636a 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <a-input v-model="model.image" placeholder="请输入图片"  ></a-input>
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
         </a-row>
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts
index 04552b7..9c8a5a7 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts
@@ -7,7 +7,8 @@ export const columns: BasicColumn[] = [
     {
     title: '图片',
     align:"center",
-    dataIndex: 'image'
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
    },
 ];
 //查询数据
@@ -18,6 +19,8 @@ export const formSchema: FormSchema[] = [
   {
     label: '图片',
     field: 'image',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
 ];