Merge remote-tracking branch 'origin/master'

jpress-web-core/src/main/java/io/jpress/ui/freemarker/tag/ApiDataTag.java

@@ -78,11 +78,11 @@ public class ApiDataTag extends JTag {
 		apiDataCollection.put("uuzcc_program_types", new ApiData("uuzcc_program_types", "https://login.uuzcc.com/ubtob/index/getProgrammeIndus"));
 
 		// IC快讯
-		apiDataCollection.put("news_ic", new ApiData("ic", "https://login.uuzcc.com/ubtob/index/getProgrammeIndus"));
+		apiDataCollection.put("news_ic", new ApiData("ic", "https://login.uuzcc.com/ubtob/index/getArticle"));
 		// 智能家居
-		apiDataCollection.put("news_smart_home", new ApiData("ic", "https://login.uuzcc.com/ubtob/index/getProgrammeIndus"));
+		apiDataCollection.put("news_smart_home", new ApiData("ic", "https://login.uuzcc.com/ubtob/index/getArticle?id=18"));
 		// 最新资讯
-		apiDataCollection.put("news_lastest", new ApiData("ic", "https://login.uuzcc.com/ubtob/index/getProgrammeIndus"));
+		apiDataCollection.put("news_lastest", new ApiData("ic", "https://login.uuzcc.com/ubtob/index/getNewArtList"));
 		// 热门资讯
 		apiDataCollection.put("news_hotest", new ApiData("ic", "https://login.uuzcc.com/ubtob/index/getProgrammeIndus"));
 

jpress-web-template-mallcms/src/main/webapp/templates/mallcms/assets/css/index.css

@@ -41,6 +41,9 @@ body{
     height: 18px;
     background-color: #aaa;
 }
+.inquiry_title .tabs:before{
+    background-color: #e41f2b;
+}
 .c_toggle.active .tabs:before,.c_toggle:hover .tabs:before{
     background-color: #e56971;
 }
@@ -581,7 +584,7 @@ body{
     vertical-align: middle;
 }
 .inquiry_item .inquiry_content table tr{
-    text-align: left;
+    text-align: center;
 }
 .inquiry_item .inquiry_content table thead tr{
     height: 50px;
@@ -595,21 +598,53 @@ body{
 }
 .inquiry_item .inquiry_content table tbody tr{
     width: 850px;
-    height: 180px;
+    height: 40px;
     vertical-align: middle;
     background-color: #fff;
-    border-bottom: 1px solid #dcdcdc;
 }
 .inquiry_item .inquiry_content table tbody tr:hover{
-    box-shadow: 0px 2px 8px 0px
-    rgba(16, 16, 16, 0.56);
+   background: #e9e9e9;
 }
 .inquiry_item .inquiry_content table tbody tr td{
     position: relative;
+    vertical-align: middle;
 }
 .inquiry_item .inquiry_content table tbody tr td:first-child {
     padding-left: 10px;
 }
+.inquiry_item .inquiry_content table tbody tr td:first-child span{
+    color: #fe7c7c;
+}
+.inquiry_item .inquiry_content table tbody tr td{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.inquiry_item .inquiry_content table tbody tr td span{
+    font-size: 14px;
+    color: #666;
+    width: 80%;
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+td.inquiry_btn a{
+    display: inline-block;
+    width: 80px;
+    height: 28px;
+    line-height: 28px;
+    text-align: center;
+    font-size: 14px;
+    color: #e31f29;
+    border-radius: 5px;
+    border: solid 1px #e31f29;
+}
+td.inquiry_btn:hover a{
+    background-color: #e31f29;
+    border-radius: 5px;
+    color: #ffffff;
+}
 .top_line {
     margin-bottom: 42px;
 }

jpress-web-template-mallcms/src/main/webapp/templates/mallcms/index.html

@@ -81,107 +81,34 @@
 								<table>
 									<thead>
 									<tr>
-										<td width="125">买家/发布时间</td>
-										<td width="168">品牌/物料名称</td>
-										<td width="260">型号/规格</td>
-										<td width="140">采购数量（PCS）</td>
-										<td width="100">已报价</td>
+										<td width="70">发布时间</td>
+										<td width="140">买家名称</td>
+										<td width="110">品牌</td>
+										<td width="120">物料名称</td>
+										<td width="110">型号</td>
+										<td width="130">规格</td>
+										<td width="120">操作</td>
 									</tr>
 									</thead>
 									<tbody>
 									<tr>
 										<td>
-											<div class="top_line inquiry_line">
-												<p>买家</p>
-												<span>深圳</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<p>发布时间</p>
-												<span>2018-08-28 09:35</span>
-											</div>
+											<span class="inquiry_red">今天</span>
 										</td>
 										<td>
-											<div class="top_line inquiry_line">
-												<p>品牌</p>
-												<span>三星Samsung,国巨</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<p>物料名称</p>
-												<span>贴片电容</span>
-											</div>
+											<span>深圳哈哈市哈哈</span>
 										</td>
 										<td>
-											<div class="top_line inquiry_line">
-												<p>型号</p>
-												<span>陶瓷电容04</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<p>规格</p>
-												<span>陶瓷电容0402_0.三星</span>
-											</div>
+											<span>三星星</span>
 										</td>
 										<td>
-											<div class="top_line inquiry_line top45">
-												<p>PCS</p>
-												<span class="red">2</span>
-											</div>
+											<span>切片</span>
 										</td>
 										<td>
-											<div class="top_line inquiry_line top45">
-												<p>条</p>
-												<span>0</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<a href="" class="inquiry_btn">我要报价/<span>剩余8天</span></a>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<div class="top_line inquiry_line">
-												<p>买家</p>
-												<span>深圳</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<p>发布时间</p>
-												<span>2018-08-28 09:35</span>
-											</div>
-										</td>
-										<td>
-											<div class="top_line inquiry_line">
-												<p>品牌</p>
-												<span>三星Samsung,国巨</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<p>物料名称</p>
-												<span>贴片电容</span>
-											</div>
-										</td>
-										<td>
-											<div class="top_line inquiry_line">
-												<p>型号</p>
-												<span>陶瓷电容04</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<p>规格</p>
-												<span>陶瓷电容0402_0.三星</span>
-											</div>
-										</td>
-										<td>
-											<div class="top_line inquiry_line top45">
-												<p>PCS</p>
-												<span class="red">2</span>
-											</div>
-										</td>
-										<td>
-											<div class="top_line inquiry_line top45">
-												<p>条</p>
-												<span>0</span>
-											</div>
-											<div class="bottom_line inquiry_line">
-												<a href="" class="inquiry_btn">我要报价/<span>剩余8天</span></a>
-											</div>
+											<span>HHHKKk</span>
 										</td>
+										<td><span>说的就是</span></td>
+										<td class="inquiry_btn"><a href="">我要报价</a></td>
 									</tr>
 									</tbody>
 								</table>
@@ -442,59 +369,9 @@
 				<div class="section-process">
 					<div class="case_indus">
 						<div class="case_indus_list active">
-							<div class="c_image c_image_01"></div>
+							<div class="c_image c_image_01" style=" background: url(${CTPATH}/assets/images/c-001.png) no-repeat center center;"></div>
 							<span>智能穿戴</span>
 						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_02"></div>
-							<span>安防监控</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_03"></div>
-							<span>医疗健康</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_04"></div>
-							<span>软件/系统开发</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_05"></div>
-							<span>工业电子</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_06"></div>
-							<span>汽车电子</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_07"></div>
-							<span>机器人/无人机</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_08"></div>
-							<span>APP开发</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_09"></div>
-							<span>共享类</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_10"></div>
-							<span>母婴产品</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_11"></div>
-							<span>广告机</span>
-						</div>
-						<div class="case_indus_list">
-							<div class="c_image c_image_12"></div>
-							<span>智能家居</span>
-						</div>
-						<div class="case_indus_list">
-							<a href="https://zb.uuzcc.com/tasklist.html">
-								<div class="c_image c_image_13"></div>
-								<span>更多</span>
-							</a>
-						</div>
 					</div>
 				</div>
 			</div>
@@ -991,47 +868,27 @@
 							<a href="https://www.uuzcc.com/article/list/iczixun.html" class="x_gray_text">更多></a>
 						</div>
 						<div class="x_content_footer_list">
-							<dl>
-								<dt>
-									22
-									<p class="x_gray_text">/08</p>
-								</dt>
-								<dd>
-									<a href="">中国IC业发展困境破解之道</a>
-									<p class="x_gray_text">晶圆厂BOM最大头居然是它？真空...</p>
-								</dd>
-							</dl>
-							<dl>
-								<dt>
-									22
-									<p class="x_gray_text">/08</p>
-								</dt>
-								<dd>
-									<a href="">中国IC业发展困境破解之道</a>
-									<p class="x_gray_text">晶圆厂BOM最大头居然是它？真空...</p>
-								</dd>
-							</dl>
-							<dl>
-								<dt>
-									22
-									<p class="x_gray_text">/08</p>
-								</dt>
-								<dd>
-									<a href="">中国IC业发展困境破解之道</a>
-									<p class="x_gray_text">晶圆厂BOM最大头居然是它？真空...</p>
-								</dd>
-							</dl>
-							<dl>
-								<dt>
-									22
-									<p class="x_gray_text">/08</p>
-								</dt>
-								<dd>
-									<a href="">中国IC业发展困境破解之道</a>
-									<p class="x_gray_text">晶圆厂BOM最大头居然是它？真空...</p>
-								</dd>
-							</dl>
-						</div>
+							<@jp.apiData id="news_ic">
+							<#assign text >
+								${data!}
+							</#assign>
+							<#assign json=text?eval />
+							<#list json.data.list as item>
+								<dl>
+									<dt>
+										${item.day}
+									<p class="x_gray_text">/${item.month}</p>
+									</dt>
+									<dd>
+										<a href="http://login.uuzcc.com/ubtob/index/getArticle">${item.title}</a>
+										<p class="x_gray_text">
+											${item.description}...
+										</p>
+									</dd>
+								</dl>
+							</#list>
+						</@jp.apiData>
+					    </div>
 					</div>
 				</div>
 				<!--第二列-->
@@ -1068,38 +925,18 @@
 							<a href="https://www.uuzcc.com/article/list/hardwarel.html" class="x_gray_text">更多></a>
 						</div>
 						<ul class="x_item_list">
-							<li>
-								<a href="">自动跟随行李箱方案开发</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
-							<li>
-								<a href="">互联网下半场重点在“万物互联、人工智能”</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
-							<li>
-								<a href="">互联网下半场重点在“万物互联、人工智能”</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
-							<li>
-								<a href="">互联网下半场重点在“万物互联、人工智能”</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
-							<li>
-								<a href="">互联网下半场重点在“万物互联、人工智能”</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
-							<li>
-								<a href="">互联网下半场重点在“万物互联、人工智能”</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
-							<li>
-								<a href="">互联网下半场重点在“万物互联、人工智能”</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
-							<li>
-								<a href="">互联网下半场重点在“万物互联、人工智能”</a>
-								<span class="x_gray_text">8-24</span>
-							</li>
+							<@jp.apiData id="news_smart_home">
+							<#assign text >
+								${data!}
+							</#assign>
+							<#assign json=text?eval />
+							<#list json.data.list as item>
+								<li>
+									<a href="http://login.uuzcc.com/ubtob/index/getArticle">${item.title}</a>
+									<span class="x_gray_text">${item.month}-${item.day}</span>
+								</li>
+							</#list>
+						</@jp.apiData>
 						</ul>
 					</div>
 				</div>