Browse Source

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx 7 years ago
parent
commit
682dece17f

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

@@ -697,7 +697,7 @@
 		  ,n.hotspot
 		  from news n
 		  left join district_glossory dg on dg.id = n.province_id 
-		  where audit_status = 2 
+		  where audit_status = 2 and (`type` = 0 or `type` = 98 or `type` = 99)
 		  <if test="policy.title != null ">
 		  and title like concat('%',#{policy.title,jdbcType=VARCHAR},'%')
 		  </if>
@@ -725,7 +725,7 @@
 		  select n.id
 		  from news n
 		  left join district_glossory dg on dg.id = n.province_id 
-		  where audit_status = 2 
+		  where audit_status = 2 and (`type` = 0 or `type` = 98 or `type` = 99)
 		  <if test="policy.title != null ">
 		  and title like concat('%',#{policy.title,jdbcType=VARCHAR},'%')
 		  </if>

+ 109 - 39
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -106,48 +106,118 @@
 						</div>
 					</div>
 				</div>
-				<div class="detail_centertext">
-					<div class="text_right" th:each="achievementdetail:${achievementdetail}">
-						<div>技术简介</div>
-						<p th:utext="${achievementdetail.introduction}?${achievementdetail.introduction}:暂无相关简介"></p>
-					</div>
-				</div>
+				
 			</div>
-			<div class="detail_bottom">
-				<div class="line">猜你喜欢</div>
-				<div class="main_introduce" >
-					<ul>
-						<li th:each="reachievementlist:${guess}">
-							<div th:if="${reachievementlist.firstPicture} == null " >
-								<img th:src="${portalHost+'/img/initPic/achievementInit.jpg'}" alt=""/>
-							</div>
-							<div th:if="${reachievementlist.firstPicture} != null " >
-								<img th:src="${avatarUploadHost+reachievementlist.firstPicture}" alt=""/>
+			<div class="publicComment">
+                <ol class="tabEvaluate">
+                    <li class="active">技术简介</li>
+                    <li>用户评价(<span class="numberBars">0</span>)
+                </ol>
+                <div class="tabList ">
+                    <div class="serviceDetailsList">
+                        <div class="introduction">
+                        <div class="detail_centertext">
+							<div class="text_right" th:each="achievementdetail:${achievementdetail}">
+								<p th:utext="${achievementdetail.introduction}?${achievementdetail.introduction}:暂无相关简介"></p>
 							</div>
-							
-							<div class="list_text">
-								<p class="likeId" th:text="${reachievementlist.id}"></p>
-							<p class="likeType" th:text="${reachievementlist.dataCategory}"></p>
-								<p>
-									行业:<span th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>
-								</p>
-								<p >
-									名称:<span th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
-								</p>
-							   
-								<p >
-									交易方式:<span th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
-								</p>
-								<a href="#">了解详情</a>
-							</div>
-							<div class="star">
-								<p >成熟度:<span th:text="${reachievementlist.maturityS}?${reachievementlist.maturityS}:暂无信息"></span></p>
+						</div>
+							<div class="detail_bottom">
+								<div class="line">猜你喜欢</div>
+								<div class="main_introduce" >
+									<ul>
+										<li th:each="reachievementlist:${guess}">
+											<div th:if="${reachievementlist.firstPicture} == null " >
+												<img th:src="${portalHost+'/img/initPic/achievementInit.jpg'}" alt=""/>
+											</div>
+											<div th:if="${reachievementlist.firstPicture} != null " >
+												<img th:src="${avatarUploadHost+reachievementlist.firstPicture}" alt=""/>
+											</div>
+											
+											<div class="list_text">
+												<p class="likeId" th:text="${reachievementlist.id}"></p>
+											<p class="likeType" th:text="${reachievementlist.dataCategory}"></p>
+												<p>
+													行业:<span th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>
+												</p>
+												<p >
+													名称:<span th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
+												</p>
+											   
+												<p >
+													交易方式:<span th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
+												</p>
+												<a href="#">了解详情</a>
+											</div>
+											<div class="star">
+												<p >成熟度:<span th:text="${reachievementlist.maturityS}?${reachievementlist.maturityS}:暂无信息"></span></p>
+											</div>
+											
+										</li>
+									</ul>
+								</div>
 							</div>
-							
-						</li>
-					</ul>
-				</div>
-			</div>
+                        </div>
+                    </div>
+                    <div class="evaluateList">
+                        <div class="commentDetails">评价 :<span>好评-100%</span><span>中评-100%</span><span>差评-100%</span></div>
+                        <div>
+                            <div class="commentStar">
+                                <span>选择星级 : </span>
+                                <div class="ulStar">
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                </div>
+                            </div>
+                            <textarea id="commentArea" placeholder="来说几句吧。。"></textarea>
+                            <div class="CommentSend">
+                                <button class="btn btn-primary">评论</button>
+                            </div>
+                        </div>
+                        <ul>
+                            <li>
+                                <div class="stasf">
+                                    <p>用户 :<span class="uName">132465498</span></p>
+                                    <div class="satisfied">
+                                        <span>满意度:</span>
+                                        <ol>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star-empty"></span></li>
+                                        </ol>
+                                    </div>
+                                </div>
+                                <div class="satisfiedContent">
+                                    <p>dsadsadsadasdasd</p>
+                                    <time>124/121/12</time>
+                                </div>
+                            </li>
+                        </ul>
+                        <div class="pagination_box">
+                            <nav aria-label="Page navigation" class="clearfix">
+                                <ul class="pagination">
+                                    <li class="pagePre">
+                                        <a href="#" aria-label="Previous">
+                                            <span aria-hidden="true">首页</span>
+                                        </a>
+                                    </li>
+                                    <li class="pageNumber"><a href="#" value="1">1</a></li>
+                                    <li class="pageNext">
+                                        <a href="#" aria-label="Next">
+                                            <span aria-hidden="true">末页</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                                <span class="totalCount">共0条数据1</span>
+                            </nav>
+                        </div>
+                    </div>
+                </div>
+            </div>
 		</div>
 	</div>
 

+ 118 - 47
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -83,56 +83,127 @@
 						</div>
 					</div>
 				</div>
-				<div class="detail_centertext">
-					<div class="text_right" th:each="demand:${demand}">
-						<div>问题描述</div>
-						<p th:utext="${demand.problemDes}?${demand.problemDes}:Sorry还没有相关描述"></p>
-					</div>
-				</div>
+				
 			</div>
-			<div class="detail_bottom">
-				<div class="line">猜你喜欢</div>
-				<div class="main_introduce">
-					<ul>
-						<li th:each="redemandlist:${redemandlist}"> 
-							<div th:if="${redemandlist.firstPic} == null " >
-								<img th:src="${portalHost+'/img/initPic/demandInit.jpg'}" alt=""/>
+			 <div class="publicComment">
+                <ol class="tabEvaluate">
+                    <li class="active">技术简介</li>
+                    <li>用户评价(<span class="numberBars">0</span>)
+                </ol>
+                <div class="tabList ">
+                    <div class="serviceDetailsList">
+                        <div class="introduction">
+	                        <div class="detail_centertext">
+								<div class="text_right" th:each="demand:${demand}">
+									<p th:utext="${demand.problemDes}?${demand.problemDes}:Sorry还没有相关描述"></p>
+								</div>
 							</div>
-							<div th:if="${redemandlist.firstPic} != null" >
-								<img th:src="${avatarUploadHost+redemandlist.firstPic}" alt=""/>
+							<div class="detail_bottom">
+								<div class="line">猜你喜欢</div>
+								<div class="main_introduce">
+									<ul>
+										<li th:each="redemandlist:${redemandlist}"> 
+											<div th:if="${redemandlist.firstPic} == null " >
+												<img th:src="${portalHost+'/img/initPic/demandInit.jpg'}" alt=""/>
+											</div>
+											<div th:if="${redemandlist.firstPic} != null" >
+												<img th:src="${avatarUploadHost+redemandlist.firstPic}" alt=""/>
+											</div>
+										 
+											<div class="list_text">
+												<p>
+													行业:<span th:text="${redemandlist.industryCategory1}?${redemandlist.industryCategory1}:暂无行业分类"></span>
+												</p>
+												<p >
+													名称:<span th:text="${redemandlist.name}?${redemandlist.name}:暂无名称"></span>
+												</p>
+												<p>
+													类型:<span th:text="${redemandlist.demandTypeS}?${redemandlist.demandTypeS}:暂无分类"></span>
+												</p>
+												<p class="money">
+													预算:<span th:text="${redemandlist.budgetCost}?${redemandlist.budgetCost}:价格面议"></span>
+												</p>
+												<p th:text="${redemandlist.id}" class="demandId"></p>
+												<p th:text="${redemandlist.dataCategory}" class="demandTyp"></p>
+												<a href="#">了解详情</a>
+											</div>
+											<!-- <div class="star">
+												<p>精品:</p>
+												<ol>
+													<li></li>
+													<li></li>
+													<li></li>
+													<li></li>
+													<li></li>
+												</ol>
+											</div> -->
+											</li>
+									</ul>
+								</div>
 							</div>
-						 
-							<div class="list_text">
-								<p>
-									行业:<span th:text="${redemandlist.industryCategory1}?${redemandlist.industryCategory1}:暂无行业分类"></span>
-								</p>
-								<p >
-									名称:<span th:text="${redemandlist.name}?${redemandlist.name}:暂无名称"></span>
-								</p>
-								<p>
-									类型:<span th:text="${redemandlist.demandTypeS}?${redemandlist.demandTypeS}:暂无分类"></span>
-								</p>
-								<p class="money">
-									预算:<span th:text="${redemandlist.budgetCost}?${redemandlist.budgetCost}:价格面议"></span>
-								</p>
-								<p th:text="${redemandlist.id}" class="demandId"></p>
-								<p th:text="${redemandlist.dataCategory}" class="demandTyp"></p>
-								<a href="#">了解详情</a>
-							</div>
-							<!-- <div class="star">
-								<p>精品:</p>
-								<ol>
-									<li></li>
-									<li></li>
-									<li></li>
-									<li></li>
-									<li></li>
-								</ol>
-							</div> -->
-							</li>
-					</ul>
-				</div>
-			</div>
+                        </div>
+                    </div>
+                    <div class="evaluateList">
+                        <div class="commentDetails">评价 :<span>好评-100%</span><span>中评-100%</span><span>差评-100%</span></div>
+                        <div>
+                            <div class="commentStar">
+                                <span>选择星级 : </span>
+                                <div class="ulStar">
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                    <span class="glyphicon glyphicon-star-empty"></span>
+                                </div>
+                            </div>
+                            <textarea id="commentArea" placeholder="来说几句吧。。"></textarea>
+                            <div class="CommentSend">
+                                <button class="btn btn-primary">评论</button>
+                            </div>
+                        </div>
+                        <ul>
+                            <li>
+                                <div class="stasf">
+                                    <p>用户 :<span class="uName">132465498</span></p>
+                                    <div class="satisfied">
+                                        <span>满意度:</span>
+                                        <ol>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star"></span></li>
+                                            <li><span class="glyphicon glyphicon-star-empty"></span></li>
+                                        </ol>
+                                    </div>
+                                </div>
+                                <div class="satisfiedContent">
+                                    <p>dsadsadsadasdasd</p>
+                                    <time>124/121/12</time>
+                                </div>
+                            </li>
+                        </ul>
+                        <div class="pagination_box">
+                            <nav aria-label="Page navigation" class="clearfix">
+                                <ul class="pagination">
+                                    <li class="pagePre">
+                                        <a href="#" aria-label="Previous">
+                                            <span aria-hidden="true">首页</span>
+                                        </a>
+                                    </li>
+                                    <li class="pageNumber"><a href="#" value="1">1</a></li>
+                                    <li class="pageNext">
+                                        <a href="#" aria-label="Next">
+                                            <span aria-hidden="true">末页</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                                <span class="totalCount">共0条数据1</span>
+                            </nav>
+                        </div>
+                    </div>
+                </div>
+            </div>
+			
 		</div>
 	</div>
 	<footer>