Merge branch 'master' of dd.tall.wiki:ccsens_wiki/ruidie

bjyy-core/pom.xml

@@ -166,9 +166,9 @@
 			<properties>
 				<profiles.active>dev</profiles.active>
 			</properties>
- 			<!--<activation>
+ 			<activation>
  				<activeByDefault>true</activeByDefault>
- 			</activation>-->
+ 			</activation>
 		</profile>
 		<profile>
 			<id>test</id>
@@ -184,9 +184,9 @@
 			<properties>
 				<profiles.active>prod</profiles.active>
 			</properties>
-			<activation>
+<!--			<activation>-->
-				<activeByDefault>true</activeByDefault>
+<!--				<activeByDefault>true</activeByDefault>-->
-			</activation>
+<!--			</activation>-->
 		</profile>
 	</profiles>
 </project>

bjyy-weixin/src/main/webapp/WEB-INF/pages/core/index.jsp

@@ -68,6 +68,7 @@
                           </ul>
                      </div>
                       <div class="banner1"><img src="${contextPath}/static/images/banner1.png" width="100%"></div>
+                      <div class="banner2"><img src="${contextPath}/static/images/2wei.jpg"></div>
                 </div>
 
                 <div class="deletebox">

bjyy-weixin/src/main/webapp/static/css/style.css

@@ -149,6 +149,8 @@ b{ font-weight:normal}
 .sortlist li a p{ line-height: 0.5rem; height: 1rem;  font-size:0.35rem; }
 .banner1{ margin: 0 0.3rem;}
 .banner1 img{ margin: 0 auto; display: block; width: 98%;}
+.banner2{ width: 100%;text-align: center}
+.banner2 img{ margin: 0 auto; width: 30%; }
 
 /*注册码*/
 .register{ margin: 1rem 0}