Browse Source

专家详情页面更新

Michael_9527 8 years ago
parent
commit
a24a00503e

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

@@ -1223,13 +1223,16 @@
 		info.person_portrait_url as personPortraitUrl,
 		i.province,
 		info.personal_profile as personalProfile,
-		ua.ability_label as abilityLabel
+		ua.ability_label as abilityLabel,c.qualification,
+		e.graduate_school,e.major_category,c.work_unit as workUnit,
+		c.engaged_field as engagedField
 		from `user` u
 		left join user_identity i on u.id=i.uid
 		left join
 		user_career c on u.id=c.uid
 		left join user_info info on u.id=info.uid
 		left join user_ability ua on u.id=ua.uid
+		left join user_edu e on u.id=e.uid
 		WHERE
 		u.type = 0
 		<if test="_parameter!= null">

+ 30 - 0
src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java

@@ -37,6 +37,36 @@ public class UserPartnerDetailBo {
 	private String position;
 	/**成就**/
 	private String achievement;
+	/**职业资格**/
+	private String qualification;
+	/**毕业院校**/
+	private String graduate_school;
+	/**专业类别**/
+	private String major_category;
+	
+	public String getGraduate_school() {
+		return graduate_school;
+	}
+
+	public void setGraduate_school(String graduate_school) {
+		this.graduate_school = graduate_school;
+	}
+
+	public String getMajor_category() {
+		return major_category;
+	}
+
+	public void setMajor_category(String major_category) {
+		this.major_category = major_category;
+	}
+
+	public String getQualification() {
+		return qualification;
+	}
+
+	public void setQualification(String qualification) {
+		this.qualification = qualification;
+	}
 
 	public String getInterestId() {
 		return interestId;

+ 69 - 99
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -15,113 +15,83 @@
 	<div class="banner">
 		<img th:src="${portalHost + '/img/thinkerDetail_banner01.jpg'}" alt="" />
 	</div>
-	<div id="all_thinkerDetail">
-		<div class="thinkerdetail_top"
-			th:each="rePartnerDetail:${rePartnerDetail}">
-			<div>
-				<div class="detailtop_text">
-					<div>
-						<h4
-							th:text="${rePartnerDetail.workUnit}?${rePartnerDetail.workUnit}:${rePartnerDetail.username}"></h4>
-						<h4
-							th:text="${rePartnerDetail.position}?${rePartnerDetail.position}:''"></h4>
-						<p th:text="${rePartnerDetail.achievement}"></p>
-					</div>
-				</div>
-				<div class="detailtop_img">
-					<div th:if="${rePartnerDetail.personPortraitUrl == null or rePartnerDetail.personPortraitUrl == ''}" class="head_img">
-						<img th:src="${avatarUploadHost+ '/default/person.jpg'}" alt="" />
-					</div>
-					<div th:if="${rePartnerDetail.personPortraitUrl != null and rePartnerDetail.personPortraitUrl != ''}" class="head_img">
-						<img th:src="${avatarUploadHost+ rePartnerDetail.personPortraitUrl}" alt="" />
-					</div>
-					<div class="people_name" th:text="${rePartnerDetail.username}"></div>
-				</div>
-			</div>
+	<div class="think_man">
+		<img th:src="${portalHost + '/img/thinkTank_er1.png'}" alt="" />			
+		<div th:if="${rePartnerDetail.personPortraitUrl == null or rePartnerDetail.personPortraitUrl == ''}" class="man_img">
+			<img th:src="${avatarUploadHost+ '/default/person.jpg'}" alt="" />
 		</div>
-		<div class="thinkerdetail_center">
-			<div th:if="${showflg} == 1 ">
-				<div class="detailcenter_left">
-					<div th:each="partnerAchievementList:${partnerAchievementList}">
-						<div class="fruit_title">
-							<p th:text="${partnerAchievementList.maturityS}"></p>
-							<h4 th:text="${partnerAchievementList.name}"></h4>
-						</div>
-						<div class="fruit_text">
-							<p th:text="${partnerAchievementList.introduction}"></p>
-						</div>
-						<div class="fruit_bottom">
-							<span class="text_spanimg"> <img
-								th:src="${portalHost + '/img/thinker_detail1.jpg'}" alt="" />
-							</span>
-						</div>
-					</div>
-				</div>
+		<div th:if="${rePartnerDetail.personPortraitUrl != null and rePartnerDetail.personPortraitUrl != ''}" class="man_img">
+			<img th:src="${avatarUploadHost+ rePartnerDetail.personPortraitUrl}" alt="" />
+		</div>
+		<div class="man_name" th:text="${rePartnerDetail.username}"></div>
+	</div>
+	<div class="think_basc">
+		<div class="basc_img">
+			<div class="bacs-img" th:if="${rePartnerDetail.personPortraitUrl != null and rePartnerDetail.personPortraitUrl !=''}">
+				<img
+						th:src="${avatarUploadHost + rePartnerDetail.personPortraitUrl}"
+						alt="" />
 			</div>
-			<div th:if="${showflg} == 0 ">
-				<div class="detailcenter_">
-					<img th:src="${portalHost+ '/img/all_null.png'}" alt="" />
-				</div> 
+			<div class="bacs-img" th:if="${rePartnerDetail.personPortraitUrl == null or rePartnerDetail.personPortraitUrl ==''}">
+				<img
+						th:src="${avatarUploadHost + '/default/subscriberDetail.jpg'}"
+						alt="" />
 			</div>
-
-			<div class="detailcenter_right">
-				<div class="right_img">
-					<p
-						th:if="${rePartnerDetail.personPortraitUrl != null and rePartnerDetail.personPortraitUrl !=''}">
-						<img
-							th:src="${avatarUploadHost + rePartnerDetail.personPortraitUrl}"
-							alt="" />
-					</p>
-					<p
-						th:if="${rePartnerDetail.personPortraitUrl == null or rePartnerDetail.personPortraitUrl ==''}">
-						<img
-							th:src="${avatarUploadHost + '/default/subscriberDetail.jpg'}"
-							alt="" />
-					</p>
-					<div >
-						线下约见 <span>32次</span>
-					</div>
+			<div>
+				<div>
+				<span>擅长领域</span>
+				<span class="lingyu" th:text="${rePartnerDetail.abilityLabel}?${rePartnerDetail.abilityLabel}:未知"></span>
+				<span class="box_love"></span>
+				<span class="dem_number">0</span>
+				<span class="shoucang">收藏</span>
+				<span class="yuejian">线下约见</span>
+				<span class="cishu">32</span>
+				<span class="ci">次</span>
 				</div>
-				<div class="right_text" th:each="rePartnerDetail:${rePartnerDetail}">
-					<h3>关于智者</h3>
-					<div>
-						<h5>专业领域:</h5>
-						<p
-							th:text="${rePartnerDetail.abilityLabel}?${rePartnerDetail.abilityLabel}:未知"></p>
-					</div>
-					<div>
-						<h5>所在地:</h5>
-						<p
-							th:text="${rePartnerDetail.provinceS}?${rePartnerDetail.provinceS}:未公开"></p>
-					</div>
-					<div class="summary">
-						<h5>智者简介:</h5>
-						<p
-							th:text="${rePartnerDetail.personalProfile}?${rePartnerDetail.personalProfile}:无"></p>
-					</div>
-					<div class="right_btn" th:val="${rePartnerDetail.uid}">
-						<div class="btn_right" onclick="_MEIQIA('showPanel')">在线咨询</div>
-						<div id="consultBtn" >线下约见</div>
-						<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
-					</div>
+			</div>
+		</div>
+		<div class="basc_p">
+			<h4>关于智者</h4>
+			<p th:text="${rePartnerDetail.achievement}">
+			</p>
+			<div>毕业院校:<span th:text="${rePartnerDetail.graduate_school}"></span></div>
+			<div>专业类别:<span th:text="${rePartnerDetail.major_category}"></span></div>
+			<div>职业资格:<span th:text="${rePartnerDetail.qualification}"></span></div>
+			<div>就职单位:<span th:text="${rePartnerDetail.workUnit}"></span></div>
+			<div>从事行业类别:<span th:text="${rePartnerDetail.engagedField}"></span></div>
+			<div>职&nbsp;&nbsp;&nbsp;&nbsp;称:<span th:text="${rePartnerDetail.position}?${rePartnerDetail.position}:''"></span></div>
+		</div>
+	</div>
+	<div class="think_achieve">
+		<h3>技术成果</h3>
+		<div class="achieve_cont" th:if="${showflg} == 1 ">
+			<a th:each="partnerAchievementList:${partnerAchievementList}">
+				<div>
+					<span></span>
+					<p th:text="${partnerAchievementList.introduction}"></p>
 				</div>
-				<h3>相关智者</h3>
-				<div class="right_bottom" th:each="reuserPartner:${reuserPartner}">
-					<div>
-						<div class="people_img">
-							<img th:src="${avatarUploadHost+reuserPartner.personPortraitUrl}"
+			</a>
+		</div>
+		<div class="achieve_btn">
+			<a onclick="_MEIQIA('showPanel')">线下约见</a>
+			<a id="consultBtn">在线咨询</a>
+			<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
+		</div>
+	</div>
+	<div class="think_about">
+		<h3>相关智者</h3>
+		<div>
+			<div th:each="reuserPartner:${reuserPartner}">
+					<a>
+						<img th:src="${avatarUploadHost+reuserPartner.personPortraitUrl}"
 								alt="" />
+						<div class="about_name">
+							<span class="about_man" th:text="${reuserPartner.username}?${reuserPartner.username}:佚名"></span>
+							<span class="about_manp" th:text="${reuserPartner.position}?${reuserPartner.position}:未公开"></span>
 						</div>
-						<div class="people_text">
-							<h5
-								th:text="${reuserPartner.username}?${reuserPartner.username}:佚名"></h5>
-							<span
-								th:text="${reuserPartner.position}?${reuserPartner.position}:未公开"></span>
-							<p
-								th:text="${reuserPartner.personalProfile}?${reuserPartner.personalProfile}:暂无简介"></p>
+						<div class="about_p" th:text="${reuserPartner.personalProfile}?${reuserPartner.personalProfile}:暂无简介">
 						</div>
-					</div>
-				</div>
+					</a>		
 			</div>
 		</div>
 	</div>