From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html
index 25cb240..ae1206c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html
@@ -80,15 +80,15 @@
             page: true,
             cols: [[
                 {type: 'numbers'},
-                {field: 'clientId',width:180, sort: true, title: '应用标识'},
-                {field: 'clientName',width:200, sort: true, title: '应用名称'},
-                {field: 'clientSecretStr', width:180, sort: true, title: '应用密钥'},
-                {field: 'webServerRedirectUri',sort: true, title: '回调地址'},
-                {field: 'authorizedGrantTypes',width:250, sort: true, title: 'oauth授权方式'},
-                {align: 'center',width:150, toolbar: '#app-table-bar', title: '操作'}
+                {field: 'clientId',width:"10%", sort: true, title: '应用标识'},
+                {field: 'clientName',width:"10%", sort: true, title: '应用名称'},
+                {field: 'clientSecretStr', width:"10%", sort: true, title: '应用密钥'},
+                {field: 'webServerRedirectUri',width:"25%",sort: true, title: '回调地址'},
+                {field: 'authorizedGrantTypes',width:"35%", sort: true, title: 'oauth授权方式'},
+                {align: 'center',width:"10%", toolbar: '#app-table-bar', title: '操作'}
             ]],
-            done:function(){
-                permissionsInput();
+            done:function(res){
+                permissionsInput(res,config);
             }
         });
 
@@ -112,7 +112,7 @@
                 layer.load(2);
                 admin.req('api-uaa/clients/' + obj.data.id, {}, function (data) {
                     layer.closeAll('loading');
-                    layer.msg('成功', {icon: 1, time: 500});
+                    layer.msg('成功', {icon: 1, time: 2000});
                     obj.del();
                 }, 'DELETE');
             });
@@ -157,13 +157,12 @@
             layer.load(2);
             admin.req('api-uaa/clients/saveOrUpdate', JSON.stringify(data.field), function (data) {
                 layer.closeAll('loading');
-                console.log(data);
                 if (data.code == 0) {
-                    layer.msg(data.msg, {icon: 1, time: 500});
+                    layer.msg(data.msg, {icon: 1, time: 2000});
                     table.reload('app-table');
                     layer.closeAll('page');
                 } else {
-                    layer.msg(data.msg, {icon: 2, time: 500});
+                    layer.msg(data.msg, {icon: 2, time: 2000});
                 }
             }, $('#app-form').attr('method'));
             return false;

--
Gitblit v1.8.0