yangc 8 tahun lalu
induk
melakukan
7b9922fff6

+ 4 - 4
src/main/resources/spring/context.xml

@@ -11,13 +11,13 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.1.xsd">
 
-	<context:property-placeholder location="classpath*:${profile}/*.properties" />
+	<context:property-placeholder location="classpath*:dev/*.properties" />
 	<!-- 系统运行参数注入 -->
 	<util:properties id="sys"
-		location="classpath:${profile}/sys.properties" />
+		location="classpath:dev/sys.properties" />
 	<!-- 消息参数 -->
 	<util:properties id="message"
-		location="classpath:${profile}/message.properties" />
+		location="classpath:dev/message.properties" />
 	<!-- 注册spring上下文对象 -->
 	<bean class="com.uas.platform.b2c.core.support.ApplicationContextRegister" />
 	<!-- 容器启动完成之后执行 -->
@@ -185,7 +185,7 @@
 	<!-- 账户中心配置 -->
 	<bean id="accountConfigurer" class="com.uas.account.web.AccountConfigurer"
 		init-method="init">
-		<property name="configPath" value="classpath:${profile}/account.properties" />
+		<property name="configPath" value="classpath:dev/account.properties" />
 	</bean>
 	
 	<import resource="classpath:spring/dubbo-consumer.xml"/>

+ 51 - 0
src/main/webapp/resources/css/commonComponent.css

@@ -65,3 +65,54 @@
     color: #fff;
 }
 /*---------------------提示框样式 end---------------------*/
+
+/*---------------------btn样式 start---------------------*/
+/*btnSize*/
+.com-btn-level1 {
+    display: inline-block;
+    padding: 7px 19px;
+    font-size: 14px;
+}
+.com-btn-level2 {
+    display: inline-block;
+    padding: 5px 11px;
+    border-radius: 2px;
+    font-size: 12px;
+}
+.com-btn-level3 {
+    display: inline-block;
+    padding: 5px 12px;
+    font-size: 12px;
+}
+/*btnType*/
+.com-btn-submit {
+    color: #fff;
+    background: #5078cb;
+}
+.com-btn-cancel {
+    background: #c8c6c6;
+    color: #fff;
+}
+.com-btn-detail {
+    color: #fff;
+    background: #ff8522;
+}
+.com-btn-detail-border {
+    color: #ff8522;
+    background: #fff;
+    border: 1px solid #ff8522;
+}
+.com-btn-red {
+    background: #f15601;
+    color: #fff;
+}
+.com-btn-green {
+    background: #33b401;
+    color: #fff;
+}
+.com-btn-submit-border {
+    border: 1px solid #5078cb;
+    background: #fff;
+    color: #5078cb;
+}
+/*---------------------btn样式 end-----------------------*/