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-infor-conf-temp1.html

@@ -698,17 +698,14 @@
             console.info(data);

             if(data.code==1){

                alert("添加成功");

                window.location.href="batt-unapproved.html";

                window.location.href="batt-unapproved-index.html"

             }else{

                alert("添加失败");

                window.location.href="batt-unapproved.html";

                window.location.href="batt-unapproved-index.html";

             }

          }

       });

    }