From a4ee6af8526ad03f98b9dbf5b11aff4ac50441c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 9 Jan 2019 23:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=94=E7=94=A8=E5=92=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/app.html       |  9 +++++++--
 erp_web/pages/manage/functions.html | 13 ++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/erp_web/pages/manage/app.html b/erp_web/pages/manage/app.html
index 591755e7..f254e044 100644
--- a/erp_web/pages/manage/app.html
+++ b/erp_web/pages/manage/app.html
@@ -369,13 +369,18 @@
         if (checkAppName()) {
             return;
         }
+        var infoObj = $("#appFM").serializeObject();
+        infoObj.ReSize = $("#ReSize").is(':checked');
+        infoObj.OpenMax = $("#OpenMax").is(':checked');
+        infoObj.Flash = $("#Flash").is(':checked');
+        infoObj.Enabled = $("#Enabled").is(':checked');
         $.ajax({
             url: url,
             type: "post",
             dataType: "json",
             fileElementId: 'Icon',
             data: ({
-                info: JSON.stringify($("#appFM").serializeObject())
+                info: JSON.stringify(infoObj)
             }),
             success: function(res) {
                 if(res && res.code === 200) {
@@ -420,7 +425,7 @@
         appID = appInfo[0];
         //焦点在名称输入框==定焦在输入文字后面
         $("#name").val("").focus().val(appInfo[1]);
-        url = '/depot/update?id=' + appInfo[0];
+        url = '/app/update?id=' + appInfo[0];
     }
 
     //检查名称是否存在 ++ 重名无法提示问题需要跟进
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html
index 70ce2252..619db4e0 100644
--- a/erp_web/pages/manage/functions.html
+++ b/erp_web/pages/manage/functions.html
@@ -252,12 +252,14 @@
 
     //绑定事件
     function bindEvent() {
+        var url = '/js/pages/manage/pushBtn.json';
         $('#PushBtn').combobox({
-            url: '/js/pages/manage/pushBtn.json',
+            url: url,
             valueField: 'id',
             textField: 'text',
             panelHeight: 120,
-            multiple: true
+            multiple: true,
+            method: 'get'
         });
     }
 
@@ -353,12 +355,17 @@
         if (checkFunctionsName()) {
             return;
         }
+        var infoObj = $("#functionsFM").serializeObject();
+        infoObj.State = $("#State").is(':checked');
+        infoObj.Enabled = $("#Enabled").is(':checked');
+        var PushBtn = JSON.stringify($("#PushBtn").combobox('getValues'));
+        infoObj.PushBtn = PushBtn.replace(/\"/g, "").replace(/\[|]/g,"");
         $.ajax({
             url: url,
             type: "post",
             dataType: "json",
             data: ({
-                info: JSON.stringify($("#functionsFM").serializeObject())
+                info: JSON.stringify(infoObj)
             }),
             success: function(res) {
                 if(res && res.code === 200) {