From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index e1487df..1f48a49 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
@@ -85,8 +85,8 @@
}},
{ align: 'center', width: 150, toolbar: '#contract-table-bar', title: '操作' }
]],
- done:function(){
- permissionsInput();
+ done:function(res){
+ permissionsInput(res,config);
}
});
}
@@ -132,7 +132,7 @@
success:function(){
table.render({
elem: '#contract-table-detail',
- url: config.base_server + 'api-opration/productorderdetail',
+ url: config.base_server + 'api-opration/productorderrecord',
method: 'GET',
where:{'orderId':orderId},
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
--
Gitblit v1.8.0