Merge remote-tracking branch 'origin/master'

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;
 }
@@ -87,6 +90,7 @@ body{
     list-style: none;
 }
 .header .container .bottom ul li{
+    position: relative;
     float: left;
     margin-right: 50px;
 }
@@ -97,6 +101,24 @@ body{
     font-size: 18px;
     color: #fff;
 }
+.header .container .bottom ul li a:before{
+    content: "";
+    position: absolute;
+    bottom: 23px;
+    left: 50%;
+    height: 1px;
+    border-bottom: 2px solid #e41f2b;
+    width: 0px;
+    -webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+}
+.header .container .bottom ul li:hover a:before{
+    width: 100%;
+    left: 0;
+}
 .header .container .bottom ul li:hover a{
     color: #e41f2b;
 }
@@ -562,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;
@@ -576,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;
 }
@@ -816,6 +870,7 @@ body{
     font-size: 18px;
     font-weight: bold;
     color: #999;
+    cursor: pointer;
 }
 .c_main .c_content .c_tab .c_toggle.active,.c_main .c_content .c_tab .c_toggle:hover{
     font-size: 18px;
@@ -831,29 +886,59 @@ body{
 .c_main .c_content .c_item_list{
     position: relative;
     text-align: left;
-    overflow: hidden;
+    /*overflow: hidden;*/
 }
 .c_main .c_content .c_item_list ul{
+    overflow: hidden;
     margin-top: 30px;
     float: left;
 }
-.c_main .c_content .c_item_list ul:first-child {
-    margin-right: 124px;
-}
 .c_main .c_content .c_item_list ul li{
-    list-style: circle ;
+    float: left;
+    /*list-style: square ;*/
     margin-bottom: 35px;
 }
+.c_main .c_content .c_item_list ul li div{
+    position: relative;
+    width: 160px;
+    float: left;
+    /*overflow: hidden;*/
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.c_main .c_content .c_item_list ul li:nth-child(odd){
+    margin-right: 120px;
+}
 .c_main .c_content .c_item_list ul li a{
     font-size: 14px;
     color: #333333;
 }
+.c_main .c_content .c_item_list ul li a:before {
+    content: "";
+    position: absolute;
+    bottom: -2px;
+    left: 50%;
+    height: 1px;
+    border-bottom: 2px solid #e41f2b;
+    width: 0px;
+    -webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+}
+.c_main .c_content .c_item_list ul li:hover a:before{
+    width: 100%;
+    left: 0;
+}
 .c_main .c_content .c_item_list ul li:hover a{
     font-weight: bold;
     color: #e41f2b;
 }
 .c_main .c_content .c_item_list ul li span.c_price{
     display: inline-block;
+    float: left;
+    width: 110px;
     margin: 0 47px 0 50px;
     font-size: 14px;
     color: #e41f2b;
@@ -864,29 +949,38 @@ body{
     color: #999;
 }
 .c_main .c_content .c_item_list ul li span.c_time{
+    float: left;
+    width: 80px;
     font-size: 14px;
     color: #999;
 }
 .c_main .c_content .c_item_list .c_line{
     position: absolute;
-    left: 550px;
+    left: 532px;
     top: 23px;
     width: 1px;
     height: 322px;
     border: solid 1px #d4d4d4;
 }
 .c_main .c_content .c_item_list .c_name{
+    display: inline-block;
+    width: 90px;
+    float: left;
     font-size: 14px;
     color: #999999;
 }
 .c_main .c_content .c_item_list .c_got{
     display: inline-block;
+    float: left;
+    width: 60px;
     margin: 0 18px 0 16px;
     font-size: 14px;
     color: #555;
 }
 .c_main .c_content .c_item_list .c_time{
-    margin-left:95px;
+    float: left;
+    width: 30px;
+    margin-left:30px;
 }
 .c_publish{
     position: absolute;
@@ -1303,10 +1397,13 @@ body{
     background-color: #e5dfda;
 }
 .k_among .k_among_bottom .k_list_one{
-    overflow: hidden;
+    /*overflow: hidden;*/
+    height: 20px;
+    width: 300px;
     margin-top: 24px;
 }
 .k_among .k_among_bottom .k_list_one .k_one{
+    float: left;
     display: inline-block;
     width: 16px;
     height: 16px;
@@ -1322,6 +1419,12 @@ body{
 .k_among .k_among_bottom .k_list_one span{
     float: left;
 }
+.k_among .k_among_bottom .k_list_one div{
+    position: relative;
+    float: left;
+    height: 20px;
+    width: 200px;
+}
 .k_among .k_among_bottom .k_list_one a{
     float: left;
     display: inline-block;
@@ -1331,11 +1434,30 @@ body{
     color: #333333;
     text-align: left;
 }
+.k_among .k_among_bottom .k_list_one a:before{
+    content: "";
+    position: absolute;
+    bottom: -2px;
+    left: 50%;
+    height: 1px;
+    border-bottom: 2px solid #e41f2b;
+    width: 0px;
+    -webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+}
+.k_among .k_among_bottom .k_list_one:hover a:before{
+    width: 100%;
+    left: 0;
+}
 .k_among .k_among_bottom .k_list_one:hover a{
     color: #e41f2b;
 }
 .k_among .k_among_bottom .k_list_one .k_data{
     display: inline-block;
+    margin-right: 10px;
     width: 35px;
     font-size: 14px;
     color: #999999;
@@ -1488,6 +1610,7 @@ a.x_gray_text{
     border-top: 1px solid #e8e8e8;
 }
 .x_item_list li {
+    position: relative;
     font-size: 14px;
     margin-bottom: 10px;
 }
@@ -1504,13 +1627,31 @@ a.x_gray_text{
     margin-left: 6px;
     color: #000;
 }
+.x_item_list li a:before{
+    content: "";
+    position: absolute;
+    bottom: -2px;
+    left: 50%;
+    height: 1px;
+    border-bottom: 2px solid #e41f2b;
+    width: 0px;
+    -webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+}
+.x_item_list li:hover a:before{
+    width: 100%;
+    left: 0;
+}
 .x_item_list li span {
     float: right;
 }
-li.active a,li:hover a{
+.x_item_list li.active a,.x_item_list li:hover a{
     color: #e41f2b;
     font-weight: bold;
-    border-bottom: 1px solid #e41f2b;
+    /*border-bottom: 1px solid #e41f2b;*/
 }
 /*第三列*/
 .third_col {

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

@@ -8,7 +8,7 @@
 			<ol class="carousel-indicators">
 				<@jp.indexPage module="index_bannner_corousel" orderBy="order_number ASC">
 					<#list page.getList() as content>
-						<li data-target="#myCarousel" data-slide-to="0" <#if content_index = 0>class="active"</#if>></li>
+						<li data-target="#myCarousel" data-slide-to="${content_index!}" <#if content_index = 0>class="active"</#if>></li>
 					</#list>
 				</@jp.indexPage>
 			</ol>
@@ -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>
@@ -509,54 +436,30 @@
 					<span class="c_toggle"><span class="tabs tabs01"></span>项目动态</span>
 				</div>
 				<!--最新需求-->
-				<div class="c_item_list">
-					<ul>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-					</ul>
+				<div class="c_item_list show">
 					<ul>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
+						<li><div><a href="">自动跟随行李箱方案开发</a></div><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
 								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
-								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
-						<li><a href="">自动跟随行李箱方案开发</a><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
+						<li><div><a href="">自动跟随行李箱方案开发</a></div><span class="c_price">￥5000~6000<b>元</b></span><span class="c_time"><img
 								src="${CTPATH}/assets/images/c_04.png" alt="">100天</span></li>
 					</ul>
 					<div class="c_line"></div>
 				</div>
 				<!--项目动态-->
-				<div class="c_item_list show">
-					<ul>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-					</ul>
+				<div class="c_item_list">
 					<ul>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
-						<li><span class="c_name">服务商名称</span><span class="c_got">中标项目</span><a href="">智能婴儿床监测系统APP开发</a><span class="c_time">10天</span></li>
+						<li>
+							<span class="c_name">服务商名称</span>
+							<span class="c_got">中标项目</span>
+							<div style="width: 200px;"><a href="">智能婴儿床监测系统APP开发</a></div>
+							<span class="c_time">10天</span>
+						</li>
+						<li>
+							<span class="c_name">服务商名称</span>
+							<span class="c_got">中标项目</span>
+							<div style="width: 200px;"><a href="">智能婴儿床监测系统APP开发</a></div>
+							<span class="c_time">10天</span>
+						</li>
 					</ul>
 					<div class="c_line"></div>
 				</div>
@@ -856,13 +759,19 @@
 			<div id="myCarousel01" class="carousel slide">
 				<!-- 轮播（Carousel）指标 -->
 				<ol class="carousel-indicators">
-					<li data-target="#myCarousel01" data-slide-to="0" class="active"></li>
-					<li data-target="#myCarousel01" data-slide-to="1"></li>
+                    <@jp.indexPage module="index_bannner_corousel" orderBy="order_number ASC">
+                        <#list page.getList() as content>
+                            <li data-target="#myCarousel" data-slide-to="${content_index!}" <#if content_index = 0>class="active"</#if>></li>
+                        </#list>
+                    </@jp.indexPage>
 				</ol>
 				<!-- 轮播（Carousel）项目 -->
 				<div class="carousel-inner">
-					<div class="item active"><a href="https://www.usoftchina.com/"><img src="${CTPATH}/assets/images/a_01.jpg"></a></div>
-					<div class="item"><a href="https://www.usoftchina.com/"><img src="${CTPATH}/assets/images/a_01.jpg"></a></div>
+                    <@jp.indexPage module="index_uas_carousel" orderBy="order_number ASC">
+                        <#list page.getList() as content>
+                            <div class="item <#if content_index = 0>active</#if>"><img src="${content.thumbnail!}"></div>
+                        </#list>
+                    </@jp.indexPage>
 				</div>
 				<!-- 轮播（Carousel）导航 -->
 				<a class="carousel-control left" href="#myCarousel01"
@@ -932,55 +841,25 @@
 					<div class="k_among_bottom">
 						<div class="k_list_one">
 							<span class="k_one k_red">1</span>
-							<a href="">自动跟随行李箱方案开发</a>
+							<div><a href="">自动跟随行李箱方案开发</a></div>
 							<span class="k_data">8-24</span>
 							<span class="k_count">100+</span>
 						</div>
 						<div class="k_list_one">
 							<span class="k_one k_red">2</span>
-							<a href="">自动跟随行李箱方案开发</a>
+							<div><a href="">自动跟随行李箱方案开发</a></div>
 							<span class="k_data">8-24</span>
 							<span class="k_count">100+</span>
 						</div>
 						<div class="k_list_one">
 							<span class="k_one k_red">3</span>
-							<a href="">自动跟随行李箱方案开发</a>
+							<div><a href="">自动跟随行李箱方案开发</a></div>
 							<span class="k_data">8-24</span>
 							<span class="k_count">100+</span>
 						</div>
 						<div class="k_list_one">
 							<span class="k_one">4</span>
-							<a href="">自动跟随行李箱方案开发</a>
-							<span class="k_data">8-24</span>
-							<span class="k_count">100+</span>
-						</div>
-						<div class="k_list_one">
-							<span class="k_one">5</span>
-							<a href="">自动跟随行李箱方案开发</a>
-							<span class="k_data">8-24</span>
-							<span class="k_count">100+</span>
-						</div>
-						<div class="k_list_one">
-							<span class="k_one">6</span>
-							<a href="">自动跟随行李箱方案开发</a>
-							<span class="k_data">8-24</span>
-							<span class="k_count">100+</span>
-						</div>
-						<div class="k_list_one">
-							<span class="k_one">7</span>
-							<a href="">自动跟随行李箱方案开发</a>
-							<span class="k_data">8-24</span>
-							<span class="k_count">100+</span>
-						</div>
-						<div class="k_list_one">
-							<span class="k_one">8</span>
-							<a href="">自动跟随行李箱方案开发</a>
-							<span class="k_data">8-24</span>
-							<span class="k_count">100+</span>
-						</div>
-						<div class="k_list_one">
-							<span class="k_one">9</span>
-							<a href="">自动跟随行李箱方案开发</a>
+							<div><a href="">自动跟随行李箱方案开发</a></div>
 							<span class="k_data">8-24</span>
 							<span class="k_count">100+</span>
 						</div>