Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

master
ELF 5 years ago
commit 91825c0eab

@ -368,4 +368,6 @@ ALTER TABLE `sys_shift_task` ADD COLUMN `remark` varchar(255) NOT NULL DEFAULT '
ALTER TABLE `tab_withdraw` ADD COLUMN `transfer_proof` int(11) NOT NULL DEFAULT 0 COMMENT '汇款证明' AFTER `settlement_end_time`;
-- 2019-11-08 cxj
ALTER TABLE `sys_document_download` MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '文档ID' FIRST;
ALTER TABLE `sys_document_download` MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '文档ID' FIRST;
ALTER TABLE `tab_promote`
CHANGE COLUMN `ver_status` `ver_status` TINYINT(2) NULL DEFAULT '3' COMMENT '资质认证审核状态(1是审核成功2审核失败3未审核)' AFTER `child_game_permission`;

@ -78,9 +78,9 @@ $(function(){
$.get(target).success(function(data){
if (data.status==1) {
if (data.url) {
updateAlert(data.info + ' 页面即将自动跳转~','alert-success');
updateAlert(data.info + ' 页面即将自动跳转~',1,'alert-success');
}else{
updateAlert(data.info,'alert-success');
updateAlert(data.info,1,'alert-success');
}
setTimeout(function(){
if (data.url) {

Loading…
Cancel
Save