From 66a6fb034ac203bf484d9bf2c13ba25f8fc8a6fb Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Tue, 8 Oct 2024 11:10:08 +0800
Subject: [PATCH] 'commit'

---
 dsBaseWeb/ds-base/html/pages/menu/add.html    | 16 +++++++++++++---
 dsBaseWeb/ds-base/html/pages/menu/edit.html   | 19 +++++++++++++++----
 .../ds-base/html/pages/menu/menuList.html     |  2 +-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dsBaseWeb/ds-base/html/pages/menu/add.html b/dsBaseWeb/ds-base/html/pages/menu/add.html
index d23f8c12..0fca8eb8 100644
--- a/dsBaseWeb/ds-base/html/pages/menu/add.html
+++ b/dsBaseWeb/ds-base/html/pages/menu/add.html
@@ -51,14 +51,23 @@
             </div>
             <div class="layui-form-item">
                 <label for="name" class="layui-form-label">
-                    <span class="we-red">*</span>图标：
+                    <span class="we-red">*</span>小图标：
                 </label>
                 <div class="layui-input-inline" style="display: flex;width: 300px;align-items: center;">
-                    <input type="text" id="icon" name="icon" lay-verify="required" disabled value="Menu"
+                    <input type="text" id="sicon" name="sicon" lay-verify="required" 
                         autocomplete="off" class="layui-input">
                     <div style="width: 50px;text-align: right;color: #1e9fff;cursor: pointer;" id="selectIcon">选择</div>
                 </div>
             </div>
+            <div class="layui-form-item">
+                <label for="name" class="layui-form-label">
+                    <span class="we-red">*</span>大图标：
+                </label>
+                <div class="layui-input-inline" >
+                    <input type="text" id="bicon" name="bicon" lay-verify="required" 
+                        autocomplete="off" class="layui-input">                   
+                </div>
+            </div>
             <div class="layui-form-item">
                 <label for="name" class="layui-form-label">
                     <span class="we-red">*</span>是否全屏：
@@ -197,7 +206,8 @@
                         identity_ids: f.chk,
                         for_school: for_school,
                         for_bureau: for_bureau,
-                        icon: $("#icon").val(),
+                        small_icon: $("#sicon").val(),
+                        big_icon:$("#bicon").val(),
                         isFull: isfullFlag
                     },
                     success: function (data) {
diff --git a/dsBaseWeb/ds-base/html/pages/menu/edit.html b/dsBaseWeb/ds-base/html/pages/menu/edit.html
index a6e49474..9a4c1fad 100644
--- a/dsBaseWeb/ds-base/html/pages/menu/edit.html
+++ b/dsBaseWeb/ds-base/html/pages/menu/edit.html
@@ -50,14 +50,23 @@
             </div>
             <div class="layui-form-item">
                 <label for="name" class="layui-form-label">
-                    <span class="we-red">*</span>图标：
+                    <span class="we-red">*</span>小图标：
                 </label>
                 <div class="layui-input-inline" style="display: flex;width: 300px;align-items: center;">
-                    <input type="text" id="icon" name="icon" lay-verify="required" disabled autocomplete="off"
+                    <input type="text" id="sicon" name="sicon" lay-verify="required" autocomplete="off"
                         class="layui-input">
                     <div style="width: 50px;text-align: right;color: #1e9fff;cursor: pointer;" id="selectIcon">选择</div>
                 </div>
             </div>
+            <div class="layui-form-item">
+                <label for="name" class="layui-form-label">
+                    <span class="we-red">*</span>大图标：
+                </label>
+                <div class="layui-input-inline">
+                    <input type="text" id="bicon" name="bicon" lay-verify="required" autocomplete="off"
+                        class="layui-input">
+                </div>
+            </div>
             <div class="layui-form-item">
                 <label for="name" class="layui-form-label">
                     <span class="we-red">*</span>是否全屏：
@@ -153,7 +162,8 @@
                             memo: lis1.memo,
                             sort_id: lis1.sort_id,
                             url: lis1.url,
-                            icon: lis1.icon,
+                            sicon: lis1.small_icon,
+                            bicon: lis1.big_icon,
                             isfull: lis1.isFull == 1 ? true : false
                         });
                         isfullFlag = lis1.isFull;
@@ -235,7 +245,8 @@
                         identity_ids: f.chk,
                         for_school: for_school,
                         for_bureau: for_bureau,
-                        icon: $("#icon").val(),
+                        small_icon: $("#sicon").val(),
+                        big_icon:$("#bicon").val(),
                         isFull: isfullFlag
                     },
                     success: function (data) {
diff --git a/dsBaseWeb/ds-base/html/pages/menu/menuList.html b/dsBaseWeb/ds-base/html/pages/menu/menuList.html
index 72e8a10d..716a56c3 100644
--- a/dsBaseWeb/ds-base/html/pages/menu/menuList.html
+++ b/dsBaseWeb/ds-base/html/pages/menu/menuList.html
@@ -306,7 +306,7 @@
         function operation(title,url,id){
             layer.open({
                 type: 2,
-                area: ['600px', '600px'],
+                area: ['600px', '650px'],
                 fix: false, //不固定
                 maxmin: true,
                 shadeClose: false,