From a942cb0a9090867a3bf0afc69eb63df0d4b9d762 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 06 十二月 2018 10:25:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-info-add.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index ac7051a..e671491 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -28,7 +28,7 @@
<div style="height: 8px;"></div>
<div class="layui-row">
<div class="layui-col-xs3 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">
- <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="" lay-filter="enAdd">纭娣诲姞</button>
+ <button class="layui-btn layui-btn-sm layui-btn-normal layui-anim-scaleSpring" lay-submit="" lay-filter="enAdd">纭娣诲姞</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="closePage">鍏抽棴闈㈡澘</button>
</div>
</div>
@@ -538,11 +538,11 @@
layer.msg('娣诲姞鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
setTimeout(function() {
parent.$('#iframeClose').click();
+ parent.$('#paging .search').click();
}, 3000);
}else{
layer.msg('娣诲姞澶辫触锛�');
- }
- loading.hideLoading($('#main'));
+ }
},
error:function(){
layer.msg('娣诲姞澶辫触锛�');
--
Gitblit v1.9.1