Merge remote-tracking branch 'origin/custom-for-wangli' into custom-f…

…or-wangli
Welxk · Mar 17, 2015 · fefc311 · fefc311
2 parents d669168 + e5d4116
commit fefc311
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
@@ -5,7 +5,7 @@
 <head>
     <%@ include file="/common/meta.jsp"%>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>华埠特克仓储管理系统登录</title>
+<title>万里磷肥仓储管理系统登录</title>
 <style type="text/css">
 <!--
 body {

diff --git a/src/main/webapp/drp/base/view/CenterView.js b/src/main/webapp/drp/base/view/CenterView.js
@@ -24,11 +24,11 @@ Ext.define('drp.base.view.CenterView', {
                   '<div style="line-height: 23px;"> '+
                     '<table width="1180" border="0" cellspacing="0" cellpadding="0" margin="10 0 10 30"><tbody><tr> '+
                         '<td width="170" height="100"> '+
-                            '&nbsp; <img src="'+'resources/images/footer/company.gif"></td> '+
+                            '&nbsp; <img src="'+'resources/images/footer/company.png"></td> '+
                         '<td> '+
-                            '地址(ADD)：济南市二环东路7151号港澳花园综合楼<br> '+
-                            '电话(TEL)：(0531) 85599617 85599618 传真(FAX)：(0531) 85599615 E-MAIL： wavetek@sdwavetek.com<br> '+
-                            '页面版权所有&nbsp; 山东华埠特克智能机电工程有限公司&nbsp;</td> '+
+                            '地址：宁夏固原市经济开发区<br> '+
+                            '电话：&nbsp; 15202698249&nbsp;  官网 ：http://originspark.com.cn&nbsp;   邮箱: originspark@163.com<br> '+
+                            '页面版权所有：&nbsp; 宁夏奥睿星火网络技术有限责任公司&nbsp; 技术支持：&nbsp; 奥睿星火&nbsp;</td> '+
                     '</tr></tbody></table></div></div></div>'
         }]
     }]

diff --git a/src/main/webapp/drp/base/view/NorthView.js b/src/main/webapp/drp/base/view/NorthView.js
@@ -17,7 +17,7 @@ Ext.define("drp.base.view.NorthView", {
                 region : 'west',
                 height : 75,
                 width : 1360,
-                src : "resources/images/banner.png"
+                src : "resources/images/banner2.png"
             },{
                 xtype : 'fieldcontainer',
                 region : 'east',

diff --git a/src/main/webapp/images/login_03.gif b/src/main/webapp/images/login_03.gif
diff --git a/src/main/webapp/resources/images/back.png b/src/main/webapp/resources/images/back.png
diff --git a/src/main/webapp/resources/images/banner.png b/src/main/webapp/resources/images/banner.png
diff --git a/src/main/webapp/resources/images/banner2.png b/src/main/webapp/resources/images/banner2.png
diff --git a/src/main/webapp/resources/images/footer/company.gif b/src/main/webapp/resources/images/footer/company.gif
diff --git a/src/main/webapp/resources/images/footer/company.png b/src/main/webapp/resources/images/footer/company.png