Explorar o código

购物车、业务品类、成果需求服务详情

liliang4869 %!s(int64=7) %!d(string=hai) anos
pai
achega
3d1635f267
Modificáronse 22 ficheiros con 353 adicións e 102 borrados
  1. 2 2
      src/main/java/com/goafanti/business/controller/JtBusinessController.java
  2. 1 1
      src/main/java/com/goafanti/business/service/JtBusinessService.java
  3. 2 2
      src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java
  4. 22 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  5. 40 20
      src/main/java/com/goafanti/common/controller/WebpageController.java
  6. 1 1
      src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java
  7. 4 2
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  8. 2 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  9. 3 0
      src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml
  10. 1 0
      src/main/java/com/goafanti/common/utils/LimitLengthUtil.java
  11. 1 0
      src/main/java/com/goafanti/common/utils/RandomUtil.java
  12. 8 0
      src/main/java/com/goafanti/order/bo/JtOrderInput.java
  13. 1 1
      src/main/java/com/goafanti/order/controller/UserJtOrderController.java
  14. 1 0
      src/main/java/com/goafanti/order/service/impl/JtOrderServiceImpl.java
  15. 236 59
      src/main/webapp/WEB-INF/views/common.html
  16. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  17. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html
  18. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  19. 13 4
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  20. 2 2
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  21. 9 4
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  22. 1 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/shopList.html

+ 2 - 2
src/main/java/com/goafanti/business/controller/JtBusinessController.java

@@ -18,9 +18,9 @@ public class JtBusinessController extends CertifyApiController {
 	private JtBusinessService jtBusinessService;
 	
 	@RequestMapping(value = "/jtBusiness/getCategoryList" , method = RequestMethod.GET)
-	public Result getCategoryList() {
+	public Result getCategoryList(Integer module) {
 		Result result=new Result();
-		result.setData(jtBusinessService.getCategoryBoList());
+		result.setData(jtBusinessService.getCategoryBoList(module));
 		return result;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/business/service/JtBusinessService.java

@@ -15,7 +15,7 @@ public interface JtBusinessService {
 	List<JtBusinessProject>getBusinessProjectByCategoryId(String id,Integer size,Integer isHot);
 	JtBusinessProjectResult getBusinessProjectDetail(String id);
 	JtBusinessCategoryTree getCategoryTree(String id);
-	List<JtBusinessCategoryBo>getCategoryBoList();
+	List<JtBusinessCategoryBo>getCategoryBoList(Integer module);
 	Pagination<JtBusinessProject>getProjects(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot); 
 	int insertCategory(JtBusinessCategory jtBusinessCategory);
 	int deleteCategoryById(String id);

+ 2 - 2
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -61,8 +61,8 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 		return jtBusinessCategoryMapper.getCategoryTree(id);
 	}
 	
-	public List<JtBusinessCategoryBo>getCategoryBoList(){
-		return jtBusinessCategoryMapper.getCategoryBoList();
+	public List<JtBusinessCategoryBo>getCategoryBoList(Integer module){
+		return jtBusinessCategoryMapper.getCategoryBoList(module);
 	}
 
 	/*

+ 22 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.admin.service.AftFileService;
+import com.goafanti.comment.bo.CommentResult;
+import com.goafanti.comment.service.CommentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.enums.UserType;
@@ -74,6 +76,9 @@ public class PublicController extends BaseController {
 	
 	@Resource
 	private FieldGlossoryService			fieldGlossoryService;
+	
+	@Resource
+	private CommentService commentService;
 
 	@Autowired
 	private IndustryCategoryService	industryCategoryService;
@@ -641,6 +646,23 @@ public class PublicController extends BaseController {
 	}
 	
 	
+	@RequestMapping(value = "/comment/list", method = RequestMethod.GET)
+	@ResponseBody
+	public Result listComment(String commodityId,Integer pageNo,Integer pageSize) {
+		Result result=new Result();
+		if(StringUtils.isBlank(commodityId)) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品id"));
+		}
+		CommentResult commentResult=new CommentResult();
+		commentResult.setPositiveCommentCount(commentService.getCommentCount(0, commodityId));
+		commentResult.setOrdinaryCommentCount(commentService.getCommentCount(1, commodityId));
+		commentResult.setNegativeCommentCount(commentService.getCommentCount(2, commodityId));
+		commentResult.setComments(commentService.searchComment(commodityId, pageNo, pageSize));
+		result.setData(commentResult);
+		return result;
+		
+	}
+	
 	
 	
 }

+ 40 - 20
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -537,36 +537,49 @@ public class WebpageController extends BaseController {
 	 * 
 	 * */
 	
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/portal/index")
 	public ModelAndView mainIndex(HttpServletRequest request, ModelAndView modelview) {
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelview.setViewName("/portal/index");
-		List<JtBusinessProject> jtBusinessProjects=jtBusinessService.getProjectsLimit(5);
+		@SuppressWarnings("unchecked")
+		List<JtBusinessProject> jtBusinessProjects=(List<JtBusinessProject>) jtBusinessService.getProjects(null, null, null, 5, 1, 1, 2, 0, 1).getList();
 		for(JtBusinessProject project:jtBusinessProjects) {
 			if(project.getMaxImgUrl()!=null && project.getMaxImgUrl().length()<=0)project.setMaxImgUrl(null);
 			if(project.getMinImgUrl()!=null && project.getMinImgUrl().length()<=0)project.setMinImgUrl(null);
 		}
 		modelview.addObject("projects",jtBusinessProjects);
-		List<AchievementObject> achievementObjects=achievementService.getHotAchievements(9, url, "web_index");
-		modelview.addObject("achievements",achievementObjects);
-//		List<PolicyEntity> policyEntities=achievementService.getIntellectualProperty(4);
-		@SuppressWarnings("unchecked")
-		List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 4).getList();
+		List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 2).getList();
 		modelview.addObject("policys",policies);
-		List<DemandListBo> demandListBos=demandService.getHotDemand(9, url, "web_index");
-		for(DemandListBo demandListBo:demandListBos) {
-			if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
-			else demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
+		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, "web_index").getList();
+		modelview.addObject("news",newsList);
+//		
+		List<News> subscriptions=(List<News>) newsService.listNews(98, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
+		modelview.addObject("subscription",subscriptions);
+		
+		if(subscriptions!=null && subscriptions.size()>0 && subscriptions.get(0).getSourceUrl()!=null && subscriptions.get(0).getSourceUrl().contains(".")) {
+			modelview.addObject("videoUrl",subscriptions.get(0).getSourceUrl());
 		}
-		//专家
-				List<UserIdentityBo>aExperts=userIdentityService.getExperts(8);
-				for(UserIdentityBo u:aExperts) {
-					if(u.getHeadPortraitUrl()!=null && u.getHeadPortraitUrl().length()<=0) {
-						u.setHeadPortraitUrl(null);
-					}
-				}
-				modelview.addObject("experts",aExperts);
-		modelview.addObject("demands",demandListBos);
+//		List<AchievementObject> achievementObjects=achievementService.getHotAchievements(9, url, "web_index");
+//		modelview.addObject("achievements",achievementObjects);
+//
+//		
+//		
+//		
+//		List<DemandListBo> demandListBos=demandService.getHotDemand(9, url, "web_index");
+//		for(DemandListBo demandListBo:demandListBos) {
+//			if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
+//			else demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
+//		}
+//		//专家
+//				List<UserIdentityBo>aExperts=userIdentityService.getExperts(8);
+//				for(UserIdentityBo u:aExperts) {
+//					if(u.getHeadPortraitUrl()!=null && u.getHeadPortraitUrl().length()<=0) {
+//						u.setHeadPortraitUrl(null);
+//					}
+//				}
+//				modelview.addObject("experts",aExperts);
+//		modelview.addObject("demands",demandListBos);
 		
 		return modelview;
 	}
@@ -723,7 +736,7 @@ public class WebpageController extends BaseController {
 	public ModelAndView achievementDetail(HttpServletRequest request, ModelAndView modelAndView,String id, Integer type) {
 		if(type==null) {type =1;}
 		//详情
-		AchievementObject achievementObject=achievementService.getAchievementDetail(id,type);
+		AchievementObject achievementObject=achievementService.getAchievementDetail(id,type); 
 		modelAndView.addObject("achievementdetail",achievementObject);
 		//精品
 		List<AchievementObject>boutiques=LimitLengthUtil.LimitListLengthRandomly(achievementService.getBoutiquePatent(10),3,10);
@@ -754,5 +767,12 @@ public class WebpageController extends BaseController {
 	        int days = (int) ((date2.getTime() - date1.getTime()) / (1000*3600*24));
 	        return days;
 	    }
+	 
+		
+		@RequestMapping(value = "/portal/technologyTrading/shopList")
+		public ModelAndView shopList(HttpServletRequest request, ModelAndView modelAndView,String id, Integer type) {
+			modelAndView.setViewName("/portal/technologyTrading/shopList");
+			return modelAndView;
+		}
 
 }

+ 1 - 1
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -84,7 +84,7 @@ public interface JtBusinessCategoryMapper {
     
     JtBusinessCategoryTree getCategoryTree(String id);
     
-    List<JtBusinessCategoryBo>getCategoryBoList();
+    List<JtBusinessCategoryBo>getCategoryBoList(@Param("module")Integer module);
     
     int insertCategory(JtBusinessCategory jtBusinessCategory);
     

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

@@ -1224,14 +1224,16 @@ select
 	a.owner_postal_address as city,
 	fg.name as fieldAS,
 	fgg.name as fieldBS,
-	release_date as releaseDate,
-	introduction
+	a.release_date as releaseDate,
+	a.introduction,
+	u.identify_name as ownerName
 from
 	achievement a
 left join industry_category fg on
 	fg.id = a.field_a
 left join industry_category fgg on
 	fgg.id = a.field_b
+left join user u on u.id=a.owner_id
 where
 	a.id = #{0}
 </select>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1080,10 +1080,11 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   
  <select id="getDemandDetail" resultType="com.goafanti.demand.bo.DemandListBo">
   select d.name,d.budget_cost as budgetCost,d.validity_period as validityPeriod,data_category as dataCategory,d.picture_url as pictureUrl,problem_des as problemDes,
-  fg.name as industryCategory1,fgg.name as industryCategory2
+  fg.name as industryCategory1,fgg.name as industryCategory2,u.identify_name as employerName
    from demand d
   left join aft.industry_category  fg  on fg.id=d.industry_category_a
     left join aft.industry_category fgg  on fgg.id=d.industry_category_b
+    left join user u on u.id=d.employer_id
     where d.id=#{0}
   </select>
   <select id="getBoutiqueDemandList" resultType="com.goafanti.demand.bo.DemandListBo">

+ 3 - 0
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -437,6 +437,9 @@ where
     id as topLevelId
     from jt_business_category
     where layer=1
+    <if test="module!=null">
+    and module=#{module,jdbcType=INTEGER}
+    </if>
     order by sort
     </select>
     

+ 1 - 0
src/main/java/com/goafanti/common/utils/LimitLengthUtil.java

@@ -100,6 +100,7 @@ public class LimitLengthUtil {
  public static  <T>List<T>  LimitListLengthRandomly(List<T> list,int count,int queryLength)
  {
 	 int truelyQueryLength=Math.min(list.size(), queryLength);
+	 count=Math.min(count, truelyQueryLength);
 	 if(list==null || list.size()<=0)return list;
 	 int[] randomInts=RandomUtil.generateRandomList(truelyQueryLength, count);
 	 if(list==null || list.size()<=count)return list;

+ 1 - 0
src/main/java/com/goafanti/common/utils/RandomUtil.java

@@ -10,6 +10,7 @@ public class RandomUtil {
 		boolean flag = false;
 		int randInt = 0;
 		for (int i = 0; i < count; i++) {
+			res[i]=-1;
 			do {
 				randInt = rand.nextInt(maxNum);
 				for (int i1 = 0; i1 < count; i1++) {

+ 8 - 0
src/main/java/com/goafanti/order/bo/JtOrderInput.java

@@ -21,6 +21,14 @@ public class JtOrderInput {
 		Integer orderChannel;
 		Integer payType;
 		String commodityMode;
+		String orderNo;
+		
+		public String getOrderNo() {
+			return orderNo;
+		}
+		public void setOrderNo(String orderNo) {
+			this.orderNo = orderNo;
+		}
 		public String getCommodityId() {
 			return commodityId;
 		}

+ 1 - 1
src/main/java/com/goafanti/order/controller/UserJtOrderController.java

@@ -32,7 +32,7 @@ public class UserJtOrderController extends BaseApiController {
 		List<JtSingleOrder>orders=gson.fromJson(orderList,new TypeToken<ArrayList<JtSingleOrder>>() {}.getType());
 		if(orders==null || orders.size()<=0) {result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","列表不符合规范,")); return result;}
 		int addRes=jtOrderService.addOrder(orders);
-		if(addRes>=0) {result.setData("提交成功");return result;}
+		if(addRes>=0) {result.setData(orders);return result;}
 		else if(addRes==-1) {
 			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","商品id,")); return result;
 		}

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/JtOrderServiceImpl.java

@@ -115,6 +115,7 @@ public class JtOrderServiceImpl extends BaseMybatisDao<JtOrderMapper> implements
 			String orderNo=jdbcIdGenerator.generateId()+"";
 			jtOrder.setBuyerId(TokenManager.getUserId());
 //			jtOrder.setBuyerId("0549c290-5178-4886-8294-5037f1743b0c");
+			order.setOrderNo(orderNo);
 			jtOrder.setDeleteSign(0);
 			jtOrder.setOrderChannel(order.getOrderChannel());
 			jtOrder.setOrderNo(orderNo);

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

@@ -19,14 +19,19 @@
 
 <body>
 	<th:block th:fragment="nav(mainM,subM)">
-	 <div class="header">
-        <div class="container">
-            <div>
-      
-            </div>
-           <div>
+	  <div class="header">
+		<div class="container">
+			<div class="navigationList webkitHover">
+				<a>网站导航
+					<span class="webkitDown"></span>
+				</a>
+			</div>
+			<div>
 				<ul>
-						<li>
+                    <li class="blue">
+                        全国统一服务热线:400-8800-962
+                    </li>    
+											<li>
 							<a th:href="@{/user/signIn}">注册</a>
 						</li>
 						<li>
@@ -37,13 +42,143 @@
 							th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a>
 						<a th:href="${basePath + '/user/logout'}">退出</a>
 					</li>
+
+					<li class="shopIcon">
+						<a th:href="@{/portal/technologyTrading/shopList}">
+							<img th:src="${portalHost+'/img/index/index_shopCar.jpg'}" alt="">购物车(<span class="numberTotal">0</span>)件 </a>
+                        <span class="glyphicon glyphicon-tint tint" aria-hidden="true"></span>
+					</li>
 				</ul>
 			</div>
-			<div class="colorRed">
-               	全国统一服务热线:400-8800-962
-            </div>
-        </div>
-    </div>
+		</div>
+		<div class="navWrapper webkitHover">
+			<ol>
+				<li>
+					<div>知识产权申请</div>
+					<span>
+						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
+					</span>
+					<p>
+						<a href="#">最新发布</a>
+					</p>
+					<p>
+						<a href="#">专利服务</a>
+					</p>
+					<p>
+						<a href="#">商标服务</a>
+					</p>
+					<p>
+						<a href="#">版权服务</a>
+					</p>
+					<p>
+						<a href="#">知产百科</a>
+					</p>
+
+				</li>
+				<li>
+					<div>知识产权赚钱</div>
+					<span>
+						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">
+					</span>
+					<p>
+						<a href="#">高企服务</a>
+						<a href="#">科技项目</a>
+					</p>
+					<p>
+						<a href="#">知识产权</a>
+						<a href="#">合作客户</a>
+					</p>
+					<p>
+						<a href="#">企业认证</a>
+						<a href="#">服务能力</a>
+					</p>
+					<p>
+						<a href="#">管理体系</a>
+						<a href="#">服务流程</a>
+					</p>
+					<p>
+						<a href="#">品牌通</a>
+					</p>
+				</li>
+				<li>
+					<div>知识产权交易</div>
+					<span>
+						<img th:src="${portalHost+'/img/index/index_webkit3.png'}" alt="">
+					</span>
+					<p>
+						<a href="#">热门关注</a>
+						<a href="#">最新需求</a>
+					</p>
+					<p>
+						<a href="#">最新发布</a>
+						<a href="#">热门需求</a>
+					</p>
+					<p>
+						<a href="#">专利技术</a>
+						<a href="#">企业技术需求</a>
+					</p>
+					<p>
+						<a href="#">实用技术</a>
+						<a href="#">技术人才需求</a>
+					</p>
+					<p>
+						<a href="#">知识产权交易政策</a>
+					</p>
+				</li>
+				<li>
+					<div>知识产权维权</div>
+					<span>
+						<img th:src="${portalHost+'/img/index/index_webkit4.png'}" alt="">
+					</span>
+					<p>
+						<a href="#">最新发布</a>
+					</p>
+					<p>
+						<a href="#">专利服务</a>
+					</p>
+					<p>
+						<a href="#">商标服务</a>
+					</p>
+					<p>
+						<a href="#">版权服务</a>
+					</p>
+					<p>
+						<a href="#">知产百科</a>
+					</p>
+				</li>
+				<!-- <li>
+					<div>智库咨询</div>
+					<span>
+						<img src="http://192.168.1.166/portal/1.0.0/img/index/index_webkit1.png" alt="">
+					</span>
+					<p>
+						<a href="#">智政</a>
+					</p>
+					<p>
+						<a href="#">智者</a>
+					</p>
+				</li> -->
+				<li>
+					<div>关于公司 </div>
+					<span>
+						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
+					</span>
+					<p>
+						<a href="#">公司简介</a>
+					</p>
+					<p>
+						<a href="#">业务范围</a>
+					</p>
+					<p>
+						<a href="#">荣誉资质</a>
+					</p>
+					<p>
+						<a href="#">发展历程</a>
+					</p>
+				</li>
+			</ol>
+		</div>
+	</div>
     <!-- search -->
     <div class="topNavBj">
     <div class="topNav">
@@ -59,51 +194,62 @@
                 <ul>
                     <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/serviceIndex}">科技服务</a>
+                        <a th:href="@{/portal/service/serviceIndex}">知识产权申请</a>
  
                        </div>
                     </li>
-                    <li  th:class="${subM}=='achievement'?active:''">
-                    <div>
-                        <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
-                        </div>
-                    </li>
-                    <li th:class="${subM}=='demand'?active:''">
+                    <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
-                        <a th:href="@{/portal/technologyTrading/demand}">技术需求</a></div>
+                        <a th:href="@{/portal/service/serviceIndex}">知识产权赚钱</a>
+ 
+                       </div>
                     </li>
-                            
-                    
-                    <li th:class="${subM}=='thindTankIndex'?active:''">
-                    <div>
-                        <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a>
-                        <ol class="subnavigation">
-                            <li>
-                                <a th:href="@{/portal/thinkTank/policyList}">智政</a>
-                            </li>
-                            <li>
-                                <a th:href="@{/portal/thinkTank/index.html#zizone}">智者</a>
-                            </li>
-                        </ol>
+                    <li th:class="${subM}=='trading'?active:''" >
+                   		 <div>
+	                        <a th:href="@{/portal/service/serviceIndex}">知识产权交易</a>
+	 						<ol class="subnavigation">
+	                            <li>
+	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
+	                            </li>
+	                            <li>
+	                                <a th:href="@{/portal/technologyTrading/demand}">技术需求</a>
+	                            </li>
+	                        </ol>
                         </div>
-                    </li>
-
-                    <li th:class="${subM}=='aboutUs'?active:''">
+                    </li>                           
+                    <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
-                        <a th:href="@{/portal/aboutUs}">关于公司</a>
-                        <ol class="subnavigation" style="display: none;">
-                            <li>
-                                <a th:href="@{/portal/contactUs}">联系我们</a>
-                            </li>
-                        </ol>
-                        </div>
+                        <a th:href="@{/portal/service/serviceIndex}">知识产权维权</a>
+ 
+                       </div>
                     </li>
+<!--                     <li th:class="${subM}=='thindTankIndex'?active:''"> -->
+<!--                     <div> -->
+<!--                         <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a> -->
+<!--                         <ol class="subnavigation"> -->
+<!--                             <li> -->
+<!--                                 <a th:href="@{/portal/thinkTank/policyList}">智政</a> -->
+<!--                             </li> -->
+<!--                             <li> -->
+<!--                                 <a th:href="@{/portal/thinkTank/index.html#zizone}">智者</a> -->
+<!--                             </li> -->
+<!--                         </ol> -->
+<!--                         </div> -->
+<!--                     </li> -->
+
+<!--                     <li th:class="${subM}=='aboutUs'?active:''"> -->
+<!--                     <div> -->
+<!--                         <a th:href="@{/portal/aboutUs}">关于公司</a> -->
+<!--                         <ol class="subnavigation" style="display: none;"> -->
+<!--                             <li> -->
+<!--                                 <a th:href="@{/portal/contactUs}">联系我们</a> -->
+<!--                             </li> -->
+<!--                         </ol> -->
+<!--                         </div> -->
+<!--                     </li> -->
                 </ul>
             </div>
-            <div class="nav_right">
-                <img th:src="${portalHost+'/img/newMenu/navImg.jpg'}" alt="">
-                <span>国家技术转移示范机构</span>
-            </div>
+          
         </div>
     </div>
     </div>
@@ -199,22 +345,52 @@
 			</div>	
 		</div>
 		<div class="pub_fix">
-			<span class="index_blur"></span>
-			<ul class="ret_top">
+			<ul>
 				<li>
-					<a onclick="_MEIQIA('showPanel')">
-						<img th:src="${portalHost+'/img/index_fix3.png'}" alt="" />
-						<p>联系客服</p>
+					<a href="" class="pendent_box">
+						<span class="glyphicon glyphicon-plane"></span>
 					</a>
 				</li>
-				 <li>
-                    <a href="" class="pendent_box">
-                        <img th:src="${portalHost+'/img/index_fix4.png'}" alt="">
-                        <p>返回顶部</p>
-                    </a>
-                </li>
+				<li>
+					<a onclick="lrminiMax();">
+						<span class="glyphicon glyphicon-user"></span>
+					</a>
+				</li>
+				<li class="phonefix">
+					<a>
+						<span class="glyphicon glyphicon-phone-alt"></span>
+					</a>
+					<div class="phoneTxt">
+						<p>联系电话</p>
+						<p>400-8800-962</p>
+					</div>
+				</li>
+				<li >
+					<a>
+						<span class="glyphicon glyphicon-send"></span> 
+					</a>
+					<div class="phoneTxt">
+						<p>公众号</p>
+						<img th:src="${portalHost+'/img/erweima.jpg'}" alt="">
+					</div>
+				</li>
+				<li>
+					<a>
+						<span class="glyphicon glyphicon-bookmark"></span>
+					</a>
+					<div class="phoneTxt">
+						<p>APP</p>
+						<div>
+							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="">
+							<p>iPhone版</p>
+						</div>
+						<div>
+							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
+							<p>Android版</p>
+						</div>
+					</div>
+				</li>
 			</ul>
-			<span class="index_orange"></span>
 		</div>
 	</th:block>
 	<th:block th:fragment="login">
@@ -326,6 +502,7 @@
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">
+	<script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script>
 		<script th:inline="javascript">
 			/*<![CDATA[*/
 			window.globalConfig = {};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


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

@@ -9,7 +9,7 @@
 </head>
 
 <body>
-   <div th:replace="common::nav('','achievement')"></div>
+   <div th:replace="common::nav('','trading')"></div>
     <!-- search -->
     <div class="container">
         

+ 13 - 4
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -59,20 +59,29 @@
 						<div class="inline_span">
 							<span>类型:</span> <span th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息"></span>
 						</div>
+						<div class="inline_span">
+   							  <span>价格:</span> <span class="price">212</span>
+						</div>
+						<div class="inline_span">
+   							  <span>所属公司:</span> <span class="companyName" th:text="${achievementdetail.ownerName}==null?'佚名':${achievementdetail.ownerName}"></span>
+						</div>
 						<div class="inline_span1">
 							<span>最近更新</span><span th:text="${achievementdetail.releaseDate}?${#dates.format(achievementdetail.releaseDate,'yyyy-MM-dd')}:暂无该信息"></span>  
 						</div>
 						<div class="loves">							
                        		<span class="box_love"></span><span class="dem_number" ></span><span>我感兴趣</span>
-							<input type="hidden" th:val="${achievementdetail.id}" id="demand_id">                     
-							<input type="hidden" th:isInterester="${isInterester}" id="isInterester">                     
+							<input type="hidden" th:val="${achievementdetail.id}" id="demand_id">         
+												            
+							<input type="hidden" th:isInterester="${isInterester}" id="isInterester">    
+						   					                 
                     	</div>
 	                    <div class="detail_btn">	
-	                       <a href="javascript:;" onclick="_MEIQIA('showPanel')">我要咨询</a>
+	                       <a href="javascript:;" onclick="lrminiMax();">我要咨询</a>
 	         
 	                        <input type="hidden" th:val="${achievementdetail.id}" id="Id_" />
-		
+							<input type="hidden" id="number" value='1'>		
 							<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
+							 <a class="shopCar"><span class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span>加入购物车</a>		
 	                    </div>
 
 					</div>

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

@@ -10,7 +10,7 @@
 
 <body>
 
-		<div th:replace="common::nav('','demand')"></div>
+		<div th:replace="common::nav('','trading')"></div>
 	<!-- search -->
 	<div class="container">
 		<div class="clearFix search">
@@ -431,5 +431,5 @@
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 <script type="text/javascript" th:src="${portalHost+'/newMenu/demand.js'}"></script></div>
-
+</body>
 </html>

+ 9 - 4
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -23,7 +23,7 @@
 			<div class="detail_center">
 				<div class="detail_centerimg" th:each="demand:${demand}">
 					<div class="big_text">
-						<h3 th:text="${#strings.abbreviate(demand.name,11)}" type="3"  class="orderType"></h3>
+						<h3 th:text="${#strings.abbreviate(demand.name,11)}" type="3"  class="orderType cname"></h3>
 					</div>
 					<div class="big_img">
 						<div th:if="${demand.firstPic} == null " >
@@ -45,17 +45,22 @@
 							<span>行业:</span>  <span th:text="${demand.industryCategory1}?${demand.industryCategory1}:暂无行业分类"></span>
 						</div>
 						<div class="inline_span" >
-							<span>需求预算:</span> <span th:text="${demand.budgetCost}?${demand.budgetCost}:价格面议"></span>
+							<span th:text="${demand.demandType}==3?'需求资金:':'需求预算:'">需求预算:</span> <span class="price" th:text="${demand.budgetCost}?${demand.budgetCost}:价格面议"></span>
 						</div>
 						<div class="inline_span">
-							<span>有效日期:</span> <span th:text="${demand.validityPeriod}?${#dates.format(demand.validityPeriod,'YYYY-MM-DD')}:永久"></span>
+   							  <span>所属公司:</span> <span class="companyName" th:text="${demand.employerName}==null?'佚名':${demand.employerName}"></span>
+						</div>
+						<div class="inline_span">
+							<span>有效日期:</span> <span th:text="${demand.validityPeriod}?${#dates.format(demand.validityPeriod,'yyyy-MM-dd')}:永久"></span>
 						</div>
 						
 	                    <div class="detail_btn">
-	                       <a href="javascript:;" onclick="_MEIQIA('showPanel')">我要咨询</a>
+	                       <a href="javascript:;" onclick="lrminiMax();">我要咨询</a>
 	                        <input type="hidden" th:val="${demand.id}" id="Id_" />
+	                        <input type="hidden" id="number" value='1'>		
 							<input type="hidden" th:typ="${demand.dataCategory}" id="ownerType_" />
 							<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
+							 <a class="shopCar"><span class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span>加入购物车</a>	
 	                    </div>
  
 					</div>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/shopList.html