Merge remote-tracking branch 'origin/master' into hotfix-2148-wangmh

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

@@ -75,27 +75,27 @@ public class ApiDataTag extends JTag {
 		apiDataCollection.put("mall_products_new", new ApiData("mall_products_new", "http://cms.usoftchina.com/cmsApi?method=queryContentPage&module=home_expand_f2&orderBy=order_number%20ASC"));
 
 		// 众创项目需求
-		apiDataCollection.put("uuzcc_program_requires", new ApiData("uuzcc_program_requires", "https://login.uuzcc.com/ubtob/index/gettask"));
+		apiDataCollection.put("uuzcc_program_requires", new ApiData("uuzcc_program_requires", "https://login.usoftchina.com/ubtob/index/gettask"));
 		// 众创项目动态
-		apiDataCollection.put("uuzcc_program_updates", new ApiData("uuzcc_program_updates", "https://login.uuzcc.com/ubtob/index/getTaskBid"));
+		apiDataCollection.put("uuzcc_program_updates", new ApiData("uuzcc_program_updates", "https://login.usoftchina.com/ubtob/index/getTaskBid"));
 		// 众创方案分类
-		apiDataCollection.put("uuzcc_program_types", new ApiData("uuzcc_program_types", "https://login.uuzcc.com/ubtob/index/getProgrammeIndus"));
+		apiDataCollection.put("uuzcc_program_types", new ApiData("uuzcc_program_types", "https://login.usoftchina.com/ubtob/index/getProgrammeIndus"));
 
 		// 众创方案分类详细
-		apiDataCollection.put("uuzcc_program_types_list", new ApiData("uuzcc_program_types_list", "https://login.uuzcc.com/ubtob/index/getProgramme?id=458"));
+		apiDataCollection.put("uuzcc_program_types_list", new ApiData("uuzcc_program_types_list", "https://login.usoftchina.com/ubtob/index/getProgramme?id=458"));
 
 		// 帖子排行榜
-		apiDataCollection.put("discuss_post_list", new ApiData("discuss_post_list", "https://login.uuzcc.com/ubtob/index/getThread"));
+		apiDataCollection.put("discuss_post_list", new ApiData("discuss_post_list", "https://login.usoftchina.com/ubtob/index/getThread"));
 		// 热门集锦
-		apiDataCollection.put("news_hot_list", new ApiData("news_hot_list", "https://login.uuzcc.com/ubtob/index/getArticle?id=16"));
+		apiDataCollection.put("news_hot_list", new ApiData("news_hot_list", "https://login.usoftchina.com/ubtob/index/getArticle?id=16"));
 		// IC快讯
-		apiDataCollection.put("news_ic", new ApiData("news_ic", "https://login.uuzcc.com/ubtob/index/getArticle"));
+		apiDataCollection.put("news_ic", new ApiData("news_ic", "https://login.usoftchina.com/ubtob/index/getArticle"));
 		// 智能家居
-		apiDataCollection.put("news_smart_home", new ApiData("news_smart_home", "https://login.uuzcc.com/ubtob/index/getArticle?id=18&limit=8"));
+		apiDataCollection.put("news_smart_home", new ApiData("news_smart_home", "https://login.usoftchina.com/ubtob/index/getArticle?id=18&limit=8"));
 		// 最新资讯
-		apiDataCollection.put("news_lastest", new ApiData("news_lastest", "https://login.uuzcc.com/ubtob/index/getNewArtList"));
+		apiDataCollection.put("news_lastest", new ApiData("news_lastest", "https://login.usoftchina.com/ubtob/index/getNewArtList"));
 		// 热门资讯
-		apiDataCollection.put("news_hotest", new ApiData("news_hotest", "https://login.uuzcc.com/ubtob/index/getNewArtList?type=hot"));
+		apiDataCollection.put("news_hotest", new ApiData("news_hotest", "https://login.usoftchina.com/ubtob/index/getNewArtList?type=hot"));
 
 		// 优软商城统计数据-交易额
 //		apiDataCollection.put("mall_count_thisYear", new ApiData("mall_count_thisYear", "https://mall.usoftchina.com/api/product/commoncount/21/count"));

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

@@ -44,7 +44,8 @@
         <div class="container">
             <div class="top">
                 <div class="menu fl">
-                    <a href="https://www.usoftchina.com/"><img src="${CTPATH}/assets/images/logo_uas_01.png" alt=""/></a>
+                    <a href="https://www.usoftchina.com/" class="logo"><img src="${CTPATH}/assets/images/logo_uas_01.png" alt=""/></a>
+                    <div class="gong-gao"><img src="${CTPATH}/assets/images/ic_notice.png" alt=""><span class="first">公告：</span><span class="top01">B2B商务和商城合并啦,</span><a href="https://b2b.usoftchina.com/">【立即前往】</a><span class="top01">了解更多元化的服务体验！</span></div>
                 </div>
                 <div class="menu fr">
                     <ul>
@@ -60,6 +61,7 @@
                 <ul>
                     <li class="active"><a href="${CPATH}/">首页</a></li>
                     <li><a href="https://mall.usoftchina.com/">U软商城</a></li>
+                    <li><a href="https://made.usoftchina.com/">U制造</a></li>
                     <li><a href="https://fin.usoftchina.com/">U智融</a></li>
                     <li><a href="https://zb.usoftchina.com/">闯客网</a></li>
                     <li><a href="https://uas.usoftchina.com/">UAS</a></li>
@@ -82,7 +84,7 @@
                     <div class="logo"><img src="${CTPATH}/assets/images/logo_w.png" alt=""></div>
                     <div class="time">客服热线：400-830-1818</div>
                     <div class="time">工作时间：周一至周五08:30~18:00</div>
-                    <div class="time">意见反馈：usoftmall.com</div>
+                    <!--<div class="time">意见反馈：usoftmall.com</div>-->
                 </div>
                 <div class="link">
                     <ul>
@@ -94,9 +96,9 @@
                     <ul>
                         <li><span>U优商城</span></li>
                         <li><a href="https://www.usoftmall.com/help/helpDetail/50">服务条例</a></li>
-                        <li><a href="https://www.usoftmall.com/help/helpDetail/16">买卖条例</a></li>
-                        <li><a href="https://www.usoftmall.com/help/helpDetail/51">代收代付协议</a></li>
-                        <li><a href="https://www.usoftmall.com/help/helpList/47">合作模式</a></li>
+                        <li><a href="https://mall.usoftchina.com/help/helpDetail/88">买卖条例</a></li>
+                        <li><a href="https://mall.usoftchina.com/help/helpDetail/87">代收代付协议</a></li>
+                        <li><a href=" https://mall.usoftchina.com/help/helpDetail/7">合作模式</a></li>
                     </ul>
                     <ul>
                         <li><span>闯客网</span></li>
@@ -106,8 +108,8 @@
                     </ul>
                     <ul>
                         <li><span>关于我们</span></li>
-                        <li><a href="https://www.usoftchina.com/about">优软云介绍</a></li>
-                        <li><a href="https://www.usoftchina.com/events">发展历程</a></li>
+                        <li><a class="no-link">优软云介绍</a></li>
+                        <li><a class="no-link">发展历程</a></li>
                         <li><a href="https://www.usoftchina.com/contact">联系我们</a></li>
                     </ul>
                 </div>

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

@@ -101,6 +101,41 @@ body{
 .header .container .top .menu .login{
     display: none;
 }
+.header .container .top .menu.fl a.logo{
+    float: left;
+}
+.header .container .top .menu.fl div.gong-gao{
+    overflow: hidden;
+    margin-top: 5px;
+    float: left;
+    font-size: 16px;
+    color: #FAFAFA;
+}
+.header .container .top .menu.fl div img{
+    float: left;
+    margin: 18px 4px 0 24px;
+    width: 18px;
+    height: 15px;
+}
+.header .container .top .menu.fl div span{
+    float: left;
+    font-size: 16px;
+    color: #ff9730;
+}
+.header .container .top .menu.fl div span.top01{
+    margin-top: 1px;
+}
+.header .container .top .menu.fl div span.first {
+    color: #FAFAFA;
+}
+.header .container .top .menu.fl div a{
+    float: left;
+    font-size: 16px;
+    color: #FAFAFA;
+}
+.header .container .top .menu.fl div a:hover{
+    color: #ff9730;
+}
 .header .container .bottom{
     width: 100%;
     height: 50px;
@@ -2119,6 +2154,11 @@ a.x_gray_text.x_more{
     text-decoration: underline ;
     color: #e41f2b;
 }
+.footer-section ul>li:hover a.no-link{
+    text-decoration: none;
+    color: #fff;
+    cursor: default;
+}
 .footer-section .about{
     float: left;
     margin-right: 90px;
@@ -2319,6 +2359,28 @@ a.x_gray_text.x_more{
     color: #fff;
 }
 /*sidebar*/
+
+/* 头部公告样式 */
+.article-top{
+    position:relative;
+    line-height: 30px;
+    height:30px;
+    text-align: center;
+    color:#473D16;
+    font-size:12px;
+    background: #FFFABE;
+}
+.article-top span{
+    margin-left:40px;
+    cursor:pointer;
+}
+
+.article-top a{
+    cursor:pointer;
+    color:#E30011;
+    text-decoration:none;
+}
+
 /*返回顶部*/
 #sidebar .sidebar-content .go-top{
     margin-top: 8px;

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

@@ -1,4 +1,9 @@
 $(function () {
+    // 公告关闭
+    $('.article-top span').click(function() {
+        $('.article-top').hide(500)
+    })
+
     // 自动轮播
     $('#myCarousel').carousel({
         interval: 5000

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

@@ -611,7 +611,7 @@
 					<div class="k_width">
 						<img src="${CTPATH}/assets/images/k_01.png" alt="">
 						<p>原厂解答</p>
-						<span>原厂10余年经验FAE高级工程师，免费解答技术问题</span>
+						<span>原厂10余年经验FAE技术工程师，免费解答技术问题</span>
 						<div class="k_btn">
 							<a href="http://bbs.uuzcc.com/forum.php?mod=post&action=newthread&fid=0&type=answer">我要提问</a>
 						</div>
@@ -621,7 +621,7 @@
 					<div class="k_width">
 						<img src="${CTPATH}/assets/images/k_02.png" alt="">
 						<p>资料下载</p>
-						<span>国内外最新芯片资料资源，可进行免费下载</span>
+						<span>国内外芯片资料资源，可进行免费下载</span>
 						<div class="k_btn">
 							<a href="http://bbs.uuzcc.com/forum.php?mod=data">我要下载</a>
 						</div>