Merge branch 'master' of https://github.com/lpn520/baishop.git

zhukejiaowo · Aug 11, 2012 · 1627ae4 · 1627ae4
2 parents 04703ab + ef65905
commit 1627ae4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/Baishop-manager/pom.xml b/Baishop-manager/pom.xml
@@ -15,6 +15,7 @@
 			<id>kadang snapshots</id>
 			<name>Kadang Snapshots Repository</name>
 			<url>https://repository.sonatype.org/content/groups/public/</url>
+			<uniqueVersion>true</uniqueVersion> 
 		</snapshotRepository>
 	</distributionManagement>
 	<properties>

diff --git a/Baishop-manager/src-web/com/baishop/manager/web/ass/SysAdmins.jsp b/Baishop-manager/src-web/com/baishop/manager/web/ass/SysAdmins.jsp
@@ -40,7 +40,7 @@ Ext.onReady(function() {
 			border: false,
 			autoScroll: false,
 			fieldDefaults: {
-			labelAlign: 'left',
+				labelAlign: 'left',
 				labelWidth: 70, 
 				msgTarget: 'side',
 				width: 260
@@ -56,6 +56,15 @@ Ext.onReady(function() {
 		       	    layout: 'fit',
 		       	    showed: true,
 					bodyStyle:'padding:20px',
+					defaults: { 
+						listeners: {
+							specialkey: function(obj,e){
+								 if (e.getKey() == Ext.EventObject.ENTER) {
+									Ext.getCmp("btnOK").handler();
+								}
+							}
+						}
+					},
 		       	    items:[{
 					    xtype: 'hiddenfield',
 					    id: 'userId',

diff --git a/Baishop/pom.xml b/Baishop/pom.xml
@@ -15,11 +15,10 @@
 			<id>kadang snapshots</id>
 			<name>Kadang Snapshots Repository</name>
 			<url>https://repository.sonatype.org/content/groups/public/</url>
+			<uniqueVersion>true</uniqueVersion> 
 		</snapshotRepository>
 	</distributionManagement>
 	<properties>
-		<spring.version>3.0.6.RELEASE</spring.version>
-		<spring.security.version>3.0.7.RELEASE</spring.security.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<build>

diff --git a/Documents/other/电子商务/登录页(1).psd b/Documents/other/电子商务/登录页(1).psd
diff --git a/Documents/other/电子商务/首页(1).psd b/Documents/other/电子商务/首页(1).psd