From f0596fb2bf8fd0ecd8332b176549dad290a6a78d Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 19:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index 25ec7f9..7d5cc44 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -274,7 +274,10 @@
},
{ field: 'isShare', fixed: 'right', align: 'center', width: 100, templet: '#product-tpl-isShare', title: '共享' },
{ field: 'id', fixed: 'right', align: 'center', width: 100, toolbar: '#product-tpl-bar', title: '操作' }
- ]]
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
//待充值列表功能操作
table.on('tool(product-table-temp)', function (obj) {
@@ -410,6 +413,7 @@
};
listDetailData.push(detailData);
})
+
if (listDetailData.length > 0) {
//提交订单数据
admin.req('api-opration/productorderdetail/saveall', JSON.stringify(listDetailData), function (data) {
@@ -417,7 +421,7 @@
if (data.code === 0) {
//现将临时数据清理
admin.putTempData("t_tempProduct", "");
- layer.msg(data.msg, { icon: 1, time: 1000 }, function () {
+ layer.msg(data.msg, { icon: 1, time: 3000 }, function () {
admin.finishPopupCenter();
});
}
@@ -447,5 +451,4 @@
return false;
});
});
- permissionsInput();
</script>
\ No newline at end of file
--
Gitblit v1.8.0