Explorar o código

首页修改,需求修改,公用导航修改

liliang4869 %!s(int64=7) %!d(string=hai) anos
pai
achega
0e05b3ac73

+ 4 - 4
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -104,9 +104,9 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Jul 06 18:31:16 CST 2018.
       This element was generated on Fri Jul 06 18:31:16 CST 2018.
     -->
     -->
-    id, name, category_id, number, price, activity_price, member_price, offset, activity_flag, 
-    introduce, province, city, create_time, min_img_url, max_img_url, value, apply_conditions, 
-    owner_id, is_hot, audit_status, audit_info, release_date
+    id, name, category_id as categoryId, number, price, activity_price as activityPrice, member_price as memberPrice, offset, activity_flag as activityFlag, 
+    introduce, province, city, create_time as createTime, min_img_url as minImgUrl, max_img_url as maxImgUrl, value, apply_conditions as applyConditions, 
+    owner_id as ownerId, is_hot as isHot, audit_status as auditStatus, audit_info as auditInfo, release_date as releaseDate
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
     <!--
     <!--
@@ -644,7 +644,7 @@
  <include refid="Base_Column_List" />
  <include refid="Base_Column_List" />
   from jt_business_project 
   from jt_business_project 
   where audit_status=2
   where audit_status=2
-  order by create_time desc
+  order by release_date desc
   </select>
   </select>
   
   
 </mapper>
 </mapper>

+ 5 - 5
src/main/webapp/WEB-INF/views/common.html

@@ -54,24 +54,24 @@
             <div class="logo_right"></div>
             <div class="logo_right"></div>
             <div class="nav">
             <div class="nav">
                 <ul>
                 <ul>
-                    <li >
+                    <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">科技服务</a>
                         <a th:href="@{/portal/service/serviceIndex}">科技服务</a>
  
  
                        </div>
                        </div>
                     </li>
                     </li>
-                    <li >
+                    <li  th:class="${subM}=='achievement'?active:''">
                     <div>
                     <div>
                         <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
                         <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
                         </div>
                         </div>
                     </li>
                     </li>
-                    <li>
+                    <li th:class="${subM}=='demand'?active:''">
                     <div>
                     <div>
                         <a th:href="@{/portal/technologyTrading/demand}">技术需求</a></div>
                         <a th:href="@{/portal/technologyTrading/demand}">技术需求</a></div>
                     </li>
                     </li>
                             
                             
                     
                     
-                    <li >
+                    <li th:class="${subM}=='thindTankIndex'?active:''">
                     <div>
                     <div>
                         <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a>
                         <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a>
                         <ol class="subnavigation">
                         <ol class="subnavigation">
@@ -85,7 +85,7 @@
                         </div>
                         </div>
                     </li>
                     </li>
 
 
-                    <li >
+                    <li th:class="${subM}=='aboutUs'?active:''">
                     <div>
                     <div>
                         <a th:href="@{/portal/aboutUs}">关于公司</a>
                         <a th:href="@{/portal/aboutUs}">关于公司</a>
                         <ol class="subnavigation" style="display: none;">
                         <ol class="subnavigation" style="display: none;">

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

@@ -235,7 +235,7 @@
 					</a>
 					</a>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="indexServe_long"  th:each="pj1,projectStatus:${projects}" th:if="${projectStatus.index>=3} and ${projectStatus.index<5}" >
+				<div class="indexServe_long indexTxt"  th:each="pj1,projectStatus:${projects}" th:if="${projectStatus.index>=3} and ${projectStatus.index<5}" >
 					<img th:src="${pj1.maxImgUrl}==null?${portalHost+'/img/initPic/serviceInit.jpg'}:${avatarUploadHost+pj1.maxImgUrl}" alt="" />
 					<img th:src="${pj1.maxImgUrl}==null?${portalHost+'/img/initPic/serviceInit.jpg'}:${avatarUploadHost+pj1.maxImgUrl}" alt="" />
 					<div class="indexServe_bots">
 					<div class="indexServe_bots">
 							<h3 th:text="${'什么是'+pj1.name+'?'}"></h3>
 							<h3 th:text="${'什么是'+pj1.name+'?'}"></h3>

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -159,11 +159,11 @@
                 <div class="col-sm-4">
                 <div class="col-sm-4">
                         <div class="demandAdviser">
                         <div class="demandAdviser">
                         <img th:src="${portalHost+'/img/newMenu/achievement_10.png'}" alt="">
                         <img th:src="${portalHost+'/img/newMenu/achievement_10.png'}" alt="">
-                        <a href=""></a>
+                        <a onclick="_MEIQIA('showPanel')"></a>
                     </div>
                     </div>
                     <div class="demandDeclare">
                     <div class="demandDeclare">
                         <img th:src="${portalHost+'/img/newMenu/achievement_11.png'}" alt="">
                         <img th:src="${portalHost+'/img/newMenu/achievement_11.png'}" alt="">
-                        <a href=""></a>
+                        <a onclick="_MEIQIA('showPanel')"></a>
                     </div>
                     </div>
 
 
                 </div>
                 </div>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -101,7 +101,7 @@
 					
 					
 						<p>
 						<p>
 						
 						
-							<p th:text="${recentDemandList.name}"></p>
+							<p th:text="${#strings.abbreviate(recentDemandList.name,10)}"></p>
 							<p class="colorWrite" th:text="${#strings.abbreviate(recentDemandList.problemDes,18)}"></p>
 							<p class="colorWrite" th:text="${#strings.abbreviate(recentDemandList.problemDes,18)}"></p>
 							<p>
 							<p>
 							<span class="colorRed" th:case='0' th:text="企业技术需求"></span> <span
 							<span class="colorRed" th:case='0' th:text="企业技术需求"></span> <span