5 Komitmen 053377da55 ... cf2dc0d7ac

Pembuat SHA1 Pesan Tanggal
  yanym cf2dc0d7ac portal首页主题设置 6 bulan lalu
  yanym 8090cdba98 Merge branch '20250428首页' of http://git.dgtis.com/qxp/suishenbang-oneportal into 20250428首页 6 bulan lalu
  yanym e3ccff1e87 portal首页主题设置 6 bulan lalu
  yanym 761a6505fb Merge branch '20250428首页' of http://git.dgtis.com/qxp/suishenbang-oneportal into 20250428首页 6 bulan lalu
  yanym 306c9cf505 portal首页主题设置 6 bulan lalu

+ 2 - 2
suishenbang-admin/src/main/resources/application-uat.yml

@@ -9,8 +9,8 @@ ruoyi:
   # 实例演示开关
   # 实例演示开关
   demoEnabled: true
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
-  profile: /home/admin/project/file
-#  profile: D:/ruoyi/uploadPath
+#  profile: /home/admin/project/file
+  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   # 获取ip地址开关
   addressEnabled: false
   addressEnabled: false
   cloudPath: http://127.0.0.1:8000/
   cloudPath: http://127.0.0.1:8000/

+ 1 - 1
suishenbang-admin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
 spring:
   profiles: 
   profiles: 
-    active: dev
+    active: uat
 
 
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod

+ 2 - 2
suishenbang-api/src/main/resources/application-uat.yml

@@ -7,8 +7,8 @@ ruoyi:
   # 版权年份
   # 版权年份
   copyrightYear: 2020
   copyrightYear: 2020
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
-  profile: /home/admin/project/file
-#  profile: D:/ruoyi/uploadPath
+#  profile: /home/admin/project/file
+  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   # 获取ip地址开关
   addressEnabled: false
   addressEnabled: false
   #是否开启swagger
   #是否开启swagger

+ 1 - 1
suishenbang-api/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
 spring:
   profiles:
   profiles:
-    active: dev
+    active: uat
 
 
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod

+ 32 - 16
suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/themeAdd.html

@@ -71,8 +71,16 @@
             display: flex;
             display: flex;
             align-items: center;
             align-items: center;
             justify-content: center;
             justify-content: center;
+            margin-right: 10px;
             position: relative;
             position: relative;
         }
         }
+        .activityIconItemClear{
+            position: absolute;
+            top: -8px;
+            right: 0px;
+            font-size: 20px;
+            z-index: 100;
+        }
     </style>
     </style>
 </head>
 </head>
 <body class="white-bg">
 <body class="white-bg">
@@ -86,6 +94,7 @@
                     <i id="bgImageIcon" class="fa fa-plus" style="font-size: 40px"></i>
                     <i id="bgImageIcon" class="fa fa-plus" style="font-size: 40px"></i>
                     <input type="file" class="uploadImage" id="bgImage" name="bgImage" accept="image/*"/>
                     <input type="file" class="uploadImage" id="bgImage" name="bgImage" accept="image/*"/>
                 </div>
                 </div>
+                <div style="font-size: 12px;color: #999999;margin-top: 10px;">建议图片宽度640px,高度800px</div>
             </div>
             </div>
         </div>
         </div>
         <div class="form-group">
         <div class="form-group">
@@ -105,17 +114,11 @@
         </div>
         </div>
         <div class="form-group">
         <div class="form-group">
             <label class="col-sm-3 control-label">活动图标设置:</label>
             <label class="col-sm-3 control-label">活动图标设置:</label>
-            <div class="col-sm-8">
-                <div class="activityIconBox">
-                    <!--<div class="activityIconItem">-->
-                        <!--<img src="" style="width: 50px;height: 50px;">-->
-                        <!--<i class="fa"></i>-->
-                    <!--</div>-->
-                    <div id="activityImageDiv" style="width: 50px;height: 50px;display: none;"></div>
-                    <div class="file-wraps-small-icon">
-                        <i id="activityImageIcon" class="fa fa-plus" style="font-size: 30px"></i>
-                        <input type="file" class="uploadImage" id="activityImage" name="activityImage" accept="image/*"/>
-                    </div>
+            <div class="col-sm-8" style="flex-direction: row;display: flex;">
+                <div class="activityIconBox" id="activityIconBox"></div>
+                <div class="file-wraps-small-icon">
+                    <i id="activityImageIcon" class="fa fa-plus" style="font-size: 30px"></i>
+                    <input type="file" class="uploadImage" id="activityImage" name="activityImage" accept="image/*"/>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
@@ -167,6 +170,15 @@
         getThemeInfo();
         getThemeInfo();
     })
     })
 
 
+    $('.activityIconBox').on('click','.activityIconItemClear', function (res) {
+        activityImageUrlArray.splice(res.currentTarget.dataset.index,1);
+        console.log(1111,activityImageUrlArray)
+        document.getElementById('activityIconBox').innerHTML = '';
+        activityImageUrlArray.forEach((item,index)=>{
+            $(".activityIconBox").append("<div class='activityIconItem'><img src='" + item + "' style='width: 50px;height: 50px;'><div class='activityIconItemClear'data-index='" + index + "'>×</div></div>")
+        })
+    })
+
     $('.uploadImage').on('change', function (res) {
     $('.uploadImage').on('change', function (res) {
         var reader = new FileReader();
         var reader = new FileReader();
         reader.onload = function (e) {
         reader.onload = function (e) {
@@ -230,9 +242,10 @@
                         document.getElementById("bgImageIcon").style.display = 'none';
                         document.getElementById("bgImageIcon").style.display = 'none';
                     } else if (imgType == 'activityImage'){
                     } else if (imgType == 'activityImage'){
                         activityImageUrlArray.push(result.data.url);
                         activityImageUrlArray.push(result.data.url);
-                        console.log('activityImageUrlArray',activityImageUrlArray);
-                        $("#activityImageDiv").html("<img src='" + result.data.url + "' style='width;100%;height:100%;'>");
-                        document.getElementById("activityImageDiv").style.display = 'block';
+                        document.getElementById('activityIconBox').innerHTML = '';
+                        activityImageUrlArray.forEach((item,index)=>{
+                            $(".activityIconBox").append("<div class='activityIconItem'><img src='" + item + "' style='width: 50px;height: 50px;'><div class='activityIconItemClear'data-index='" + index + "'>×</div></div>")
+                    })
                     } else {
                     } else {
                         smallImageUrlArray[imgType] = result.data.url;
                         smallImageUrlArray[imgType] = result.data.url;
                         $("#"+imgType).html("<img src='" + result.data.url + "' style='width;100%;height:100%;'>");
                         $("#"+imgType).html("<img src='" + result.data.url + "' style='width;100%;height:100%;'>");
@@ -275,8 +288,11 @@
                 }
                 }
                 if (result.data.activityIconObject.length > 0){
                 if (result.data.activityIconObject.length > 0){
                     activityImageUrlArray = result.data.activityIconObject;
                     activityImageUrlArray = result.data.activityIconObject;
-                    $("#activityImageDiv").html("<img src='" + result.data.activityIconObject[0] + "' style='width;100%;height:100%;'>");
-                    document.getElementById("activityImageDiv").style.display = 'block';
+                    activityImageUrlArray.forEach((item,index)=>{
+                        $(".activityIconBox").append("<div class='activityIconItem'><img src='" + item + "' style='width: 50px;height: 50px;'><div class='activityIconItemClear'data-index='" + index + "'>×</div></div>")
+                })
+                    // $("#activityImageDiv").html("<img src='" + result.data.activityIconObject[0] + "' style='width;100%;height:100%;'>");
+                    // document.getElementById("activityImageDiv").style.display = 'block';
                 }
                 }
                 if (result.data.bottom_prompt_text != null){
                 if (result.data.bottom_prompt_text != null){
                     document.getElementById("alertTitle").value = result.data.bottom_prompt_text;
                     document.getElementById("alertTitle").value = result.data.bottom_prompt_text;