伊宁项目更改相关 统一app增加登录接口 增加阿里icon库

ruoyi-admin/src/main/resources/templates/system/dangan/add.html

@@ -349,6 +349,16 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
+                        <label class="col-sm-3 control-label">apply图标颜色：</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" type="color" name="applyIconColor">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
                         <label class="col-sm-3 control-label">apply类型：</label>
                         <div class="col-sm-8">
                             <select name="applyType" id="applyType" class="form-control m-b">

ruoyi-admin/src/main/resources/templates/system/dangan/edit.html

@@ -345,6 +345,16 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
+                        <label class="col-sm-3 control-label">apply图标颜色：</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" value="" type="color" id="applyIconColor" name="applyIconColor">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
                         <label class="col-sm-3 control-label">apply类型：</label>
                         <div class="col-sm-8">
                             <select name="applyType" id="applyType" th:field="*{applyType}" class="form-control m-b">
@@ -507,8 +517,9 @@
                 $("#h5Div").hide();
             }
         });
-        
+        var danganObj = [[${dangan}]];
         function loadSelectApplyType() {
+            $("#applyIconColor").val(danganObj.applyIconColor);
             let applyTypeValue = $("#applyType").val();
             if(applyTypeValue===0||applyTypeValue==="0"){
                 $("#appDiv").show();
@@ -526,6 +537,7 @@
         var prefix = ctx + "system/dangan";
         var danganFileList = [[${fileList}]];
 
+
         $("#form-dangan-edit").validate({
             focusCleanup: true
         });

ruoyi-system/src/main/java/com/ruoyi/system/domain/Dangan.java

@@ -175,10 +175,19 @@ public class Dangan extends BaseEntity
     private String hUrl;//h5路径 applyType为1时有效
 
     private String applyMenuName;//应用菜单名
+    private String applyIconColor;//应用icon颜色
 
     //TODO 查询用组装字段, 数据库结构无关
     private String danganLoginName;
 
+    public String getApplyIconColor() {
+        return applyIconColor;
+    }
+
+    public void setApplyIconColor(String applyIconColor) {
+        this.applyIconColor = applyIconColor;
+    }
+
     public String getApplyMenuName() {
         return applyMenuName;
     }