Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 gx_tieta/WebRoot/mobil/batt-approved.html

@@ -188,6 +188,7 @@
                ,anim: 4

                ,content: 'iframe/homeinfo1.html'

            });

            layer.full(iframePopup);

      

      // applyendyanshou(arr);