anderx 4 lat temu
rodzic
commit
15c4ed7e81

+ 17 - 0
.classpath

@@ -28,5 +28,22 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/8080"/>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

+ 21 - 10
.settings/org.eclipse.wst.common.component

@@ -1,32 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-            
+                
+    
     
     <wb-module deploy-name="local">
         <wb-resource deploy-path="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>
-                        
+                                
+        
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                        
+                                
+        
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                        
+                                
+        
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                        
+                                
+        
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                        
+                                
+        
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp"/>
-                        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/annotations"/>
+                                
+        
         
         <property name="java-output-path" value="/wechat-guessing/target/classes"/>
-                        
+                                
+        
         
         <property name="context-root" value="local"/>
-                    
+                            
+    
     
     </wb-module>
-        
+            
+
 
 </project-modules>

+ 6 - 0
pom.xml

@@ -51,6 +51,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- Javax Annotation -->  
+        <dependency>  
+            <groupId>javax.annotation</groupId>  
+            <artifactId>jsr250-api</artifactId>  
+            <version>1.0</version>  
+        </dependency>  
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>

Plik diff jest za duży
+ 521 - 505
src/main/webapp/WEB-INF/views/common.html


+ 8 - 2
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -41,8 +41,14 @@
                         <div class="contact_text">
                             <ul>
                                 <li>地址:湖南省长沙市岳麓区茶子山东路湘江财富金融中心D座12层</li>
-                                <li>联系我们:400-8800-962</li>
-                                <li>客服咨询:0731-89907207</li>
+                                <li>联系我们:400-8800-962 | 0731-89907207</li>
+                                <li style="display: flex;flex-flow: row nowrap;white-space: nowrap;">
+                                    客服热线:
+                                    <span style="display: flex;flex-flow: row wrap">
+                                        <div style="padding-right: 10px;">18932403553(陈女士)</div>
+                                        <div>18974979313(颜女士)</div>
+                                    </span>
+                                </li>
                                 <li>QQ咨询:1924306267</li>
                             </ul>
                         </div>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/productServiceKejixiangmu.html

@@ -41,7 +41,7 @@
                         <li><a>省/市小巨人</a></li>
                         <li><a>省/市守合同重信用</a></li>
                         <li><a>省/市两型产品</a></li>
-                        <li><a>省/市高新产品</a></li>
+                        <li style="display: none"><a>省/市高新产品</a></li>
                         <li><a>国家/省/市企业技术中心 </a> </li>
                         <li><a>省/市工程(技术)研究中心</a> </li>
                         <li><a>国家/省/市/区科技计划 </a> </li>