Просмотр исходного кода

Accept Merge Request #206 mg : (test -> master)

Merge Request: mg
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/206
Antiloveg лет назад: 8
Родитель
Сommit
08b91b2e51

Разница между файлами не показана из-за своего большого размера
+ 48 - 15
src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html


Разница между файлами не показана из-за своего большого размера
+ 22 - 10
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html


+ 5 - 5
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html

@@ -51,7 +51,7 @@
 						<h4>张泽院士的讲堂</h4>
 						<p>关于从事准晶结构及其向晶体雷声变的中间过程和准晶中的缺陷的研究</p>
 						<p>2017-07-02 09:30:00</p>
-						<span>报名中</span>
+						<span class="customer-service">报名中</span>
 					</div>
 				</li>
 				<li>
@@ -62,7 +62,7 @@
 						<h4>谭蔚泓院士的讲堂</h4>
 						<p>关于核酸适体细胞筛选新方法</p>
 						<p>2017-07-02 15:00:00</p>
-						<span>报名中</span>
+						<span class="customer-service">报名中</span>
 					</div>
 				</li>
 				<li>
@@ -73,7 +73,7 @@
 						<h4>钟志华教授的讲堂</h4>
 						<p>关于车碰撞安全技术、车身冲压成型技术和模块化轻量化汽车技术</p>
 						<p>2017-07-05 09:00:00</p>
-						<span>报名中</span>
+						<span class="customer-service">报名中</span>
 					</div>
 				</li>
 				<li>
@@ -84,7 +84,7 @@
 						<h4>丁荣军教授的讲堂</h4>
 						<p>关于轨道交通牵引控制、牵引变流和网络控制技术的创新研究和成果转化</p>
 						<p>2017-07-07 10:00:00</p>
-						<span>报名中</span>
+						<span class="customer-service">报名中</span>
 					</div>
 				</li>
 				<li>
@@ -95,7 +95,7 @@
 						<h4>柴立元教授的讲堂</h4>
 						<p>关于固体废物污染控制及其资源化</p>
 						<p>2017-07-12 10:30:00</p>
-						<span>报名中</span>
+						<span class="customer-service">报名中</span>
 					</div>
 				</li>
 			</ul>

+ 109 - 79
src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html

@@ -39,7 +39,7 @@
 		<img th:src="${portalHost + '/img/star_banner.jpg'}" alt="First slide">
 	</div>
 
-	<div class="box">
+	<!--<div class="box">
 		<div class="picbox">
 			<ul class="piclist mainlist">
 				<li>
@@ -126,6 +126,24 @@
 		</div>
 		<div class="og_prev"><span class="glyphicon glyphicon-chevron-left"></span></div>
 		<div class="og_next"><span class="glyphicon glyphicon-chevron-right"></span></div>
+	</div>-->
+	<div class="container active_info">
+		<div class="active_notice">
+			<img src="../../img/notice_ioc.png">
+			<span>明星动态:</span>
+			<div id="active_notice_ul">
+				<div class="qimo">
+					<div id="active_notice_ul1">
+						<ul>
+							<li><a href='#'>· 袁隆平取得重大突破</a></li>
+							<li><a href='#'>· 周凌宇举办科技成果发布会</a></li>
+							<li><a href='#'>· 中国科交会</a></li>
+						</ul>
+					</div>
+					<div id="active_notice_ul2"></div>
+				</div>
+			</div>
+		</div>
 	</div>
 
 	<div class="container expert">
@@ -136,90 +154,102 @@
 		<div id="myTabContent" class="expert_list">
 			<ul>
 				<li>
-                    <div class="expert_content_img">
-                        <img th:src="${portalHost + '/img/big_star_img_s_1.png'}">
-                        <a href="#">报名中</a>
-                    </div>
-                    <div class="expert_content_info">
-                        <h4>薛志敏</h4>
+					<div class="expert_content_img">
+						<img th:src="${portalHost + '/img/big_star_img_s_1.png'}">
+						<a href="#">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            关注
+                        </a>
+					</div>
+					<div class="expert_content_info">
+						<h4>薛志敏</h4>
 						<!--<a href="#" class="start">邀请开讲</a>-->
-                        <p>中南大学湘雅二医院</p>
-                        <p>精神病学 精神卫生学 生物精神病学
-                            <p>
-                                <p class="mt25"><label>技术: </label> <span class="red">4</span>人</p>
-                                <p><label>粉丝: </label> <span class="red">654</span>次</p>
-                    </div>
-                </li>
+						<p>中南大学湘雅二医院</p>
+						<p>精神病学 精神卫生学 生物精神病学</p>
+						<p class="mt25"><label>技术: </label> <span class="red">4</span>人</p>
+						<p><label>粉丝: </label> <span class="red">654</span>次</p>
+					</div>
+				</li>
 				<li>
-                    <div class="expert_content_img">
-                        <img th:src="${portalHost + '/img/big_star_img_s_2.png'}">
-                        <a href="#">报名中</a>
-                    </div>
-                    <div class="expert_content_info">
-                        <h4>李官成</h4>
-                        <p>中南大学 肿瘤研究所</p>
-                        <p>肿瘤免疫学
-                            <p>
-                                <p class="mt25"><label>技术: </label> <span class="red">9</span>人</p>
-                                <p><label>粉丝: </label> <span class="red">233</span>次</p>
-                    </div>
-                </li>
+					<div class="expert_content_img">
+						<img th:src="${portalHost + '/img/big_star_img_s_2.png'}">
+						<a href="#">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            关注
+                        </a>
+					</div>
+					<div class="expert_content_info">
+						<h4>李官成</h4>
+						<p>中南大学 肿瘤研究所</p>
+						<p>肿瘤免疫学</p>
+						<p class="mt25"><label>技术: </label> <span class="red">9</span>人</p>
+						<p><label>粉丝: </label> <span class="red">233</span>次</p>
+					</div>
+				</li>
 				<li>
-                    <div class="expert_content_img">
-                        <img th:src="${portalHost + '/img/big_star_img_s_3.png'}">
-                        <a href="#">报名中</a>
-                    </div>
-                    <div class="expert_content_info">
-                        <h4>周凌宇</h4>
-                        <p>中南大学 土木工程 结构工程</p>
-                        <p>钢-混组合箱梁受力性能
-                            <p>
-                                <p class="mt25"><label>技术: </label> <span class="red">13</span>人</p>
-                                <p><label>粉丝: </label> <span class="red">309</span>次</p>
-                    </div>
-                </li>
+					<div class="expert_content_img">
+						<img th:src="${portalHost + '/img/big_star_img_s_3.png'}">
+						<a href="#">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            关注
+                        </a>
+					</div>
+					<div class="expert_content_info">
+						<h4>周凌宇</h4>
+						<p>中南大学 土木工程 结构工程</p>
+						<p>钢-混组合箱梁受力性能</p>
+						<p class="mt25"><label>技术: </label> <span class="red">13</span>人</p>
+						<p><label>粉丝: </label> <span class="red">309</span>次</p>
+					</div>
+				</li>
 				<li>
-                    <div class="expert_content_img">
-                        <img th:src="${portalHost + '/img/big_star_img_s_4.png'}">
-                        <a href="#">报名中</a>
-                    </div>
-                    <div class="expert_content_info">
-                        <h4>孙立忠</h4>
-                        <p>湘潭大学材料科学与工程学院</p>
-                        <p>微纳光电子材料 石墨纳米带电输运
-                            <p>
-                                <p class="mt25"><label>技术: </label> <span class="red">14</span>人</p>
-                                <p><label>粉丝: </label> <span class="red">569</span>次</p>
-                    </div>
-                </li>
+					<div class="expert_content_img">
+						<img th:src="${portalHost + '/img/big_star_img_s_4.png'}">
+						<a href="#">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            关注
+                        </a>
+					</div>
+					<div class="expert_content_info">
+						<h4>孙立忠</h4>
+						<p>湘潭大学材料科学与工程学院</p>
+						<p>微纳光电子材料 石墨纳米带电输运</p>
+						<p class="mt25"><label>技术: </label> <span class="red">14</span>人</p>
+						<p><label>粉丝: </label> <span class="red">569</span>次</p>
+					</div>
+				</li>
 				<li>
-                    <div class="expert_content_img">
-                        <img th:src="${portalHost + '/img/big_star_img_s_5.png'}">
-                        <a href="#">报名中</a>
-                    </div>
-                    <div class="expert_content_info">
-                        <h4>邓联文</h4>
-                        <p>中南大学 电子信息学院</p>
-                        <p>电子信息材料
-                            <p>
-                                <p class="mt25"><label>技术: </label> <span class="red">19</span>人</p>
-                                <p><label>粉丝: </label> <span class="red">529</span>次</p>
-                    </div>
-                </li>
+					<div class="expert_content_img">
+						<img th:src="${portalHost + '/img/big_star_img_s_5.png'}">
+						<a href="#">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            关注
+                        </a>
+					</div>
+					<div class="expert_content_info">
+						<h4>邓联文</h4>
+						<p>中南大学 电子信息学院</p>
+						<p>电子信息材料</p>
+						<p class="mt25"><label>技术: </label> <span class="red">19</span>人</p>
+						<p><label>粉丝: </label> <span class="red">529</span>次</p>
+					</div>
+				</li>
 				<li>
-                    <div class="expert_content_img">
-                        <img th:src="${portalHost + '/img/big_star_img_s_6.png'}">
-                        <a href="#">报名中</a>
-                    </div>
-                    <div class="expert_content_info">
-                        <h4>何红生</h4>
-                        <p>湖南省煤炭地质勘查院</p>
-                        <p>页岩气、煤层气、煤炭地质、矿产地质
-                            <p>
-                                <p class="mt25"><label>技术: </label> <span class="red">59</span>人</p>
-                                <p><label>粉丝: </label> <span class="red">759</span>次</p>
-                    </div>
-                </li>
+					<div class="expert_content_img">
+						<img th:src="${portalHost + '/img/big_star_img_s_6.png'}">
+						<a href="#">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            关注
+                        </a>
+					</div>
+					<div class="expert_content_info">
+						<h4>何红生</h4>
+						<p>湖南省煤炭地质勘查院</p>
+						<p>页岩气、煤层气、煤炭地质、矿产地质</p>
+						<p class="mt25"><label>技术: </label> <span class="red">59</span>人</p>
+						<p><label>粉丝: </label> <span class="red">759</span>次</p>
+					</div>
+				</li>
 			</ul>
 		</div>
 	</div>