Kaynağa Gözat

Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

wutt 5 yıl önce
ebeveyn
işleme
9cfe8114dc
25 değiştirilmiş dosya ile 762 ekleme ve 58 silme
  1. 1 1
      .idea/misc.xml
  2. 14 0
      website/src/main/java/com/hssx/website/controller/ArticleController.java
  3. 1 1
      website/src/main/resources/application.properties
  4. 33 5
      website/src/main/resources/templates/about.html
  5. 203 0
      website/src/main/resources/templates/apply.html
  6. 18 4
      website/src/main/resources/templates/case.html
  7. 18 4
      website/src/main/resources/templates/caseDetail.html
  8. 123 0
      website/src/main/resources/templates/css/custom.css
  9. 16 7
      website/src/main/resources/templates/css/style.blue.css
  10. 168 0
      website/src/main/resources/templates/goods.html
  11. 35 0
      website/src/main/resources/templates/img/apply.svg
  12. BIN
      website/src/main/resources/templates/img/background_bottom.jpg
  13. BIN
      website/src/main/resources/templates/img/job1.jpeg
  14. BIN
      website/src/main/resources/templates/img/job2.jpg
  15. BIN
      website/src/main/resources/templates/img/job3.jpeg
  16. BIN
      website/src/main/resources/templates/img/job4.jpeg
  17. BIN
      website/src/main/resources/templates/img/subSuccess.png
  18. 23 9
      website/src/main/resources/templates/index.html
  19. 18 4
      website/src/main/resources/templates/job1.html
  20. 18 4
      website/src/main/resources/templates/job2.html
  21. 18 4
      website/src/main/resources/templates/job3.html
  22. 18 4
      website/src/main/resources/templates/job4.html
  23. 1 3
      website/src/main/resources/templates/js/front.js
  24. 18 4
      website/src/main/resources/templates/partner.html
  25. 18 4
      website/src/main/resources/templates/product.html

+ 1 - 1
.idea/misc.xml

@@ -12,5 +12,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_171" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

+ 14 - 0
website/src/main/java/com/hssx/website/controller/ArticleController.java

@@ -36,6 +36,20 @@ public class ArticleController {
         return "index";
     }
 
+    @ApiOperation("公司产品")
+    @GetMapping("/goods")
+    public String goods(Model model) {
+        model = articleService.getList(model);
+        return "goods";
+    }
+
+    @ApiOperation("申请")
+    @GetMapping("/apply")
+    public String apply(Model model) {
+        model = articleService.getList(model);
+        return "apply";
+    }
+
     @ApiOperation("添加留言")
     @PostMapping("/add")
     @ResponseBody

+ 1 - 1
website/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 # ####################################################################################################
 # ·þÎñ¶ËÅäÖÃ
-server.port=8099
+server.port=8098
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.max-http-post-size=-1

+ 33 - 5
website/src/main/resources/templates/about.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -259,15 +266,31 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>
             </footer>
+            <div class="public">
+                <div class="close">X</div>
+                <div>
+                    <img class="public-success" src="img/subSuccess.png">
+                    <div class="public-success-text">提交成功!</div>
+                </div>
+                <img class="public-qrcode" src="img/qrCode.png">
+                <div>关注公众号,获取更多信息</div>
+            </div>
         </div>
         <!-- Javascript files-->
         <script src="vendor/jquery/jquery.min.js"></script>
@@ -297,11 +320,16 @@
                             comment: comment
                         }, function (response) {
                             if(response.code == "ok"){
-                                alert("留言成功");
+                                // alert("");
+                                $(".public").show();
                             }
                         })
                     }
                 });
+
+                $(".public").click(function(){
+                    $(".public").hide();
+                });
             });
         </script>
     </body>

+ 203 - 0
website/src/main/resources/templates/apply.html

@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>塑维</title>
+        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+        <meta name="description" content="塑维智造是一款云端制造协同系统,通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点,帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程,实现数据驱动下的精益制造。"/>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="all,follow">
+        <!-- Bootstrap CSS-->
+        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome CSS-->
+        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+        <!-- Google fonts - Roboto-->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+        <!-- Bootstrap Select-->
+        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+        <!-- owl carousel-->
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+        <!-- theme stylesheet-->
+        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+        <!-- Custom stylesheet - for your changes-->
+        <link rel="stylesheet" href="css/custom.css">
+        <!-- Favicon and apple touch icons-->
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+
+        <!--<link rel="apple-touch-icon" href="img/apple-touch-icon.png">-->
+        <!--<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">-->
+        <!--<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">-->
+        <!--<link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">-->
+        <!--<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">-->
+        <!--<link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">-->
+        <!--<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">-->
+        <!--<link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">-->
+        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    </head>
+    <body>
+        <div id="all" class="about">
+            <!-- Navbar Start-->
+            <header class="nav-holder make-sticky">
+                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+                <div class="container">
+                    <a href="index" class="navbar-brand home">
+                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                    </a>
+                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                    <div id="navigation" class="navbar-collapse collapse">
+                        <ul class="nav navbar-nav ml-auto">
+                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown dropdown"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item menu-large">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                </div>
+            </header>
+            <!-- Navbar End-->
+            <div id="content" class="form-apply">
+                <section class="bar bg-gray">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="heading text-center">
+                                <h2>在线申请</h2>
+                            </div>
+                        </div>
+                        <div class="col-md-8 mx-auto">
+                            <!--<form>-->
+                            <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="phone">手机号</label>
+                                        <input id="phone" type="text" class="form-control" placeholder="请输入手机号(必填)">
+                                    </div>
+                                </div>
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="name">姓名</label>
+                                        <input id="name" type="text" class="form-control" placeholder="请输入姓名(必填)">
+                                    </div>
+                                </div>
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="enterprise">企业名称</label>
+                                        <input id="enterprise" type="text" class="form-control" placeholder="请输入企业名称(必填)">
+                                    </div>
+                                </div>
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="email">邮箱</label>
+                                        <input id="email" type="text" class="form-control" placeholder="请输入邮箱(必填)">
+                                    </div>
+                                </div>
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="message">备注</label>
+                                        <textarea id="message" rows="8"  class="form-control" placeholder="需求备注(选填):输入更多需求信息,如:工装模具管理,减少生产浪费"></textarea>
+                                    </div>
+                                </div>
+                                <div class="col-sm-12 text-center">
+                                    <button id="sub" class="btn btn-template-outlined">
+                                        <i class="fa fa-envelope-o"></i> 提交申请</button>
+                                </div>
+                            </div>
+                            <!--</form>-->
+                        </div>
+                    </div>
+                </section>
+                <div class="img-apply">
+                    <img src="img/qrCode.png">
+                    <div>关注公众号,获取更多信息</div>
+                </div>
+            </div>
+            <!-- FOOTER -->
+            <footer class="main-footer">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-3">
+                            <h4 class="h6">联系我们</h4>
+                            <p class="text-uppercase">
+                                <br>电话: 400-1086-011
+                                <br>网址:<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">塑维产品</h4>
+                            <p class="text-uppercase">
+                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
+                                <br>官网:<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
+                            </p>
+                        </div>
+                        <div class="col-lg-6 bottom-code">
+                            <ul class="list-inline photo-stream">
+                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
+                            </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
+                        </div>
+                    </div>
+                </div>
+            </footer>
+        </div>
+        <!-- Javascript files-->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/popper.js/umd/popper.min.js"> </script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+        <script src="js/jquery.parallax-1.1.3.js"></script>
+        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+        <script src="js/front.js"></script>
+        <script>
+            $(function(){
+                $("#sub").click(function(){
+                    var phone = $("#phone").val();
+                    var name = $("#name").val();
+                    var enterprise = $("#enterprise").val();
+                    var email = $("#enterprise").val();
+                    var comment = $("#message").val();
+                    if(name == "" || phone == "" || comment == "" || enterprise == "" || email == ""){
+                        alert("请填写完整信息");
+                    }else{
+                        $.post("/add", {
+                            name: name,
+                            phone: phone,
+                            comment: comment
+                        }, function (response) {
+                            if(response.code == "ok"){
+                                alert("留言成功");
+                            }
+                        })
+                    }
+                });
+            });
+        </script>
+    </body>
+</html>

+ 18 - 4
website/src/main/resources/templates/case.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown active"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -109,11 +116,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>

+ 18 - 4
website/src/main/resources/templates/caseDetail.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown active"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -106,11 +113,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>

+ 123 - 0
website/src/main/resources/templates/css/custom.css

@@ -3,10 +3,133 @@
     z-index: 10;
 }
 
+body {
+    overflow-x: hidden;
+}
+
 footer.main-footer a {
     text-transform:none;
 }
 
+#navigation > ul li:last-child {
+    position: relative;
+}
+
+#navbar .menu-large:last-child {
+    position: relative!important;
+}
+
+.qrcode {
+    position: absolute;
+    display:none;
+    background: #fff;
+    /*padding: 10px;*/
+    top: 52px;
+    box-shadow: 5px 5px 10px rgba(120,120,120,0.5);
+    z-index: 9999;
+    width: 140px;
+}
+
+.qrcode img {
+    width: 120px;
+    margin: 10px;
+    z-index: 9999;
+}
+
+.qrcode div {
+    font-size: 12px;
+    color: #333;
+    font-weight: 600;
+    margin: 0 10px;
+    text-align: center;
+    z-index: 9999;
+}
+
+#navigation > ul li:last-child:hover .qrcode {
+    display: block;
+}
+
+.main-footer .container .row .bottom-code {
+    text-align: center;
+}
+
+.main-footer .container .row .bottom-Copyright {
+    font-size: 0.9rem;
+    color: #aaa;
+}
+
+/* 二维码 */
+.public {
+    display: none;
+    position: fixed;
+    top: 0;
+    background: rgba(0,0,0,0.9);
+    width: 100%;
+    height: 100%;
+    text-align: center;
+    padding: 14% 19%;
+}
+
+.public-success {
+    width: 80px;
+}
+
+.public-qrcode {
+    width: 180px;
+    margin: 20px 0 0 0;
+}
+
+.public-success-text {
+    color: #fff;
+    margin: 20px 0;
+    font-size: 16px;
+    font-weight: 600;
+}
+
+.public div {
+    color: #fff;
+    margin-top: 10px;
+}
+
+.public div.close {
+    color: #fff;
+    margin: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: 20px;
+    border-radius: 0 0 0 50%;
+    background: #666;
+}
+
+/* 申请 */
+.form-apply {
+    background:#e9ecef !important;
+    position: relative;
+}
+
+.form-apply .bar {
+    width: 50%;
+    margin: 0 auto;
+}
+
+.img-apply {
+    text-align: center;
+    margin-bottom: 0.3rem;
+    position: absolute;
+    right: 15%;
+    top: 10rem;
+}
+
+.img-apply div {
+    color: #333;
+    font-size: 0.9rem;
+}
+
+.img-apply img {
+    width: 115px;
+    margin-bottom: 0.5rem;
+}
 
 /* 首页 */
 .background_video {

+ 16 - 7
website/src/main/resources/templates/css/style.blue.css

@@ -753,21 +753,30 @@ header.nav-holder.sticky {
 }
 
 #navbar .navbar-nav > li > a {
-  margin: 0;
-  padding: 1.4rem 1rem 1.6rem;
+  /*margin: 0;*/
+  /*padding: 1.4rem 1rem 1.6rem;*/
+  /*color: #fff;*/
+  /*font-weight: 600;*/
+  /*text-transform: uppercase;*/
+  /*letter-spacing: 0.1em;*/
+  /*font-size: 0.9rem;*/
+  /*text-decoration: none;*/
+  /*border-top: .3rem solid transparent;*/
+  margin: 0 1.6rem;
+  padding: 0.6rem 0 0.2rem;
   color: #fff;
   font-weight: 600;
   text-transform: uppercase;
   letter-spacing: 0.1em;
-  font-size: 0.9rem;
+  font-size: 1em;
   text-decoration: none;
-  border-top: .3rem solid transparent;
+  border-bottom: .2rem solid transparent;
 }
 
 #navbar .navbar-nav > li > a:hover {
   /* background: rgba(70, 127, 191, 0.5);
   border-color: rgba(70, 127, 191, 0.8); */
-  background: rgba(255, 255, 255, 0.2);
+  /*background: rgba(255, 255, 255, 0.2);*/
   border-color: rgba(255, 255, 255, 0.8);
   color:#fff;
 }
@@ -2187,8 +2196,8 @@ footer.main-footer .photo-stream li {
 }
 
 footer.main-footer .photo-stream a {
-  width: 80px;
-  height: 80px;
+  width: 120px;
+  height: 120px;
   padding: 5px;
   display: block;
 }

+ 168 - 0
website/src/main/resources/templates/goods.html

@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>塑维</title>
+        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+        <meta name="description" content="塑维智造是一款云端制造协同系统,通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点,帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程,实现数据驱动下的精益制造。"/>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="all,follow">
+        <!-- Bootstrap CSS-->
+        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome CSS-->
+        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+        <!-- Google fonts - Roboto-->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+        <!-- Bootstrap Select-->
+        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+        <!-- owl carousel-->
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+        <!-- theme stylesheet-->
+        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+        <!-- Custom stylesheet - for your changes-->
+        <link rel="stylesheet" href="css/custom.css">
+        <!-- Favicon and apple touch icons-->
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <!--<link rel="apple-touch-icon" href="img/apple-touch-icon.png">-->
+        <!--<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">-->
+        <!--<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">-->
+        <!--<link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">-->
+        <!--<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">-->
+        <!--<link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">-->
+        <!--<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">-->
+        <!--<link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">-->
+        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    </head>
+    <body>
+        <div id="all" class="about">
+            <!-- Navbar Start-->
+            <header class="nav-holder make-sticky">
+                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+                <div class="container">
+                    <a href="index" class="navbar-brand home">
+                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                    </a>
+                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                    <div id="navigation" class="navbar-collapse collapse">
+                        <ul class="nav navbar-nav ml-auto">
+                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown active"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                </div>
+            </header>
+            <!-- Navbar End-->
+            <div id="content">
+                <div class="container">
+                    <section class="bar">
+                        <!-- Image box with hover-->
+                        <div class="heading">
+                            <h2>成功案例</h2>
+                        </div>
+                        <div class="row mb-4">
+                            <!--<div class="col-lg-4 col-md-6" th:each="item : ${case}">-->
+                                <!--<div class="box-image-text">-->
+                                    <!--<div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">-->
+                                        <!--<div class="overlay d-flex align-items-center justify-content-center">-->
+                                            <!--<a th:href="@{'caseDetail?id='+${item.id}}" class="btn btn-template-outlined-white">-->
+                                                <!--<i class="fa fa-chain"> </i> 详情-->
+                                            <!--</a>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="content">-->
+                                        <!--<h4><a th:href="@{'caseDetail?id='+${item.id}}" th:text="${item.title}">Print</a></h4>-->
+                                        <!--<p th:text="${item.introduction}">shewing do an</p>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                            <div class="col-lg-4 col-md-6">
+                                <div class="box-image-text">
+                                    <div class="image"><img src="./" alt="..." class="img-fluid">
+                                        <div class="overlay d-flex align-items-center justify-content-center">
+                                            <a class="btn btn-template-outlined-white" href="apply">
+                                                <i class="fa fa-video-camera"> </i> 获取产品展示
+                                            </a>
+                                            <a class="btn btn-template-outlined-white">
+                                                <i class="fa fa-chain"> </i> 进入系统
+                                            </a>
+                                        </div>
+                                    </div>
+                                    <div class="content">
+                                        <h4><a>Print</a></h4>
+                                        <p>shewing do an</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </section>
+                </div>
+            </div>
+            <!-- FOOTER -->
+            <footer class="main-footer">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-3">
+                            <h4 class="h6">联系我们</h4>
+                            <p class="text-uppercase">
+                                <br>电话: 400-1086-011
+                                <br>网址:<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">塑维产品</h4>
+                            <p class="text-uppercase">
+                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
+                                <br>官网:<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
+                            </p>
+                        </div>
+                        <div class="col-lg-6 bottom-code">
+                            <ul class="list-inline photo-stream">
+                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
+                            </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
+                        </div>
+                    </div>
+                </div>
+            </footer>
+        </div>
+        <!-- Javascript files-->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/popper.js/umd/popper.min.js"> </script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+        <script src="js/jquery.parallax-1.1.3.js"></script>
+        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+        <script src="js/front.js"></script>
+    </body>
+</html>

+ 35 - 0
website/src/main/resources/templates/img/apply.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="303px" height="60px" viewBox="0 0 303 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
+    <title>process-first</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="process-first" transform="translate(-1.000000, 0.000000)">
+            <circle id="Oval-7" fill="#02B980" fill-rule="nonzero" cx="30" cy="15" r="15"></circle>
+            <g id="完善资料" transform="translate(0.000000, 42.000000)" fill="#02B980" font-family="PingFangSC-Regular, PingFang SC" font-size="14" font-weight="normal">
+                <text>
+                    <tspan x="0.992" y="15.672">完善资料</tspan>
+                </text>
+            </g>
+            <g id="申请成功" transform="translate(248.000000, 42.000000)" fill="#8E98AE" font-family="PingFangSC-Regular, PingFang SC" font-size="14" font-weight="normal">
+                <text>
+                    <tspan x="0.992" y="15.672">申请成功</tspan>
+                </text>
+            </g>
+            <circle id="Oval-7-Copy" fill="#EAECF1" fill-rule="nonzero" cx="278" cy="15" r="15"></circle>
+            <rect id="Rectangle-23" fill="#EAECF1" fill-rule="nonzero" x="44" y="11" width="220" height="8"></rect>
+            <path d="M44,11 L150,11 C152.209139,11 154,12.790861 154,15 C154,17.209139 152.209139,19 150,19 L44,19 L44,11 Z" id="Rectangle-23" fill="#02B980" fill-rule="nonzero"></path>
+            <g id="1" transform="translate(26.000000, 2.000000)" fill="#FFFFFF" font-family="PingFangSC-Regular, PingFang SC" font-size="18" font-weight="normal">
+                <text>
+                    <tspan x="0.391" y="19">1</tspan>
+                </text>
+            </g>
+            <g id="2" transform="translate(272.000000, 2.000000)" fill="#8E98AE" font-family="PingFangSC-Regular, PingFang SC" font-size="18" font-weight="normal">
+                <text>
+                    <tspan x="0.6" y="19">2</tspan>
+                </text>
+            </g>
+        </g>
+    </g>
+</svg>

BIN
website/src/main/resources/templates/img/background_bottom.jpg


BIN
website/src/main/resources/templates/img/job1.jpeg


BIN
website/src/main/resources/templates/img/job2.jpg


BIN
website/src/main/resources/templates/img/job3.jpeg


BIN
website/src/main/resources/templates/img/job4.jpeg


BIN
website/src/main/resources/templates/img/subSuccess.png


+ 23 - 9
website/src/main/resources/templates/index.html

@@ -55,10 +55,17 @@
                 <div id="navigation" class="navbar-collapse collapse">
                     <ul class="nav navbar-nav ml-auto">
                         <li class="nav-item dropdown active"><a href="index">首页 <b class="caret"></b></a></li>
-                        <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                        <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                         <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                         <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                        <li class="nav-item dropdown"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                        <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                        <li class="nav-item dropdown">
+                            <a href="about.html">关于我们 <b class="caret"></b></a>
+                            <div class="qrcode">
+                                <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                <div>请关注塑维公众号</div>
+                            </div>
+                        </li>
                     </ul>
                 </div>
             </div>
@@ -74,12 +81,12 @@
                 <!-- <div class="dark-mask mask-primary"></div> -->
                 <div>
                     <div class="homepage owl-carousel">
-                        <div class="item" th:each="item : ${pictures}">
+                        <div class="item" th:each="item : ${pictures}">-->
                             <img th:src="${{item.url}}" src="img/banner1.png" alt="" class="img-fluid">
                         </div>
-                        <!--<div class="item">-->
-                        <!--<img src="img/background_bottom.jpg" alt="" class="img-fluid">-->
-                        <!--</div>-->
+                        <!-- <div class="item">
+                            <img src="img/banner2.png" alt="" class="img-fluid">
+                        </div> -->
                     </div>
                 </div>
             </div>
@@ -218,7 +225,7 @@
             <!-- Carousel End-->
         </div>
     </section>
-    <section style="background: url(img/background_bottom.png) center top no-repeat; background-size: cover;"
+    <section style="background: url(img/background_bottom.jpg) center top no-repeat; background-size: cover;"
              class="bar no-mb color-white text-center bg-fixed relative-positioned">
         <div class="dark-mask"></div>
         <div class="container">
@@ -279,11 +286,18 @@
                         <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                     </p>
                 </div>
-                <div class="col-lg-3">
-                    <h4 class="h6">官方微信公众号</h4>
+                <div class="col-lg-6 bottom-code">
                     <ul class="list-inline photo-stream">
                         <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                     </ul>
+                    <h4 class="h6">官方微信公众号</h4>
+                </div>
+            </div>
+        </div>
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-12 bottom-Copyright">
+                    Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                 </div>
             </div>
         </div>

+ 18 - 4
website/src/main/resources/templates/job1.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -103,11 +110,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>

+ 18 - 4
website/src/main/resources/templates/job2.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown">
+                            <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -103,11 +110,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>

+ 18 - 4
website/src/main/resources/templates/job3.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown">
+                            <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -103,11 +110,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>

+ 18 - 4
website/src/main/resources/templates/job4.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown">
+                            <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -103,11 +110,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>

+ 1 - 3
website/src/main/resources/templates/js/front.js

@@ -1,7 +1,4 @@
 $(function () {
-
-
-
     // ------------------------------------------------------- //
     // Navbar Sticky
     // ------------------------------------------------------ //
@@ -13,6 +10,7 @@ $(function () {
             $('header.nav-holder.make-sticky').removeClass('sticky');
             $('body').css('padding-top', '0');
         }
+
         if($(window).scrollTop() >= $('.owl-stage').height() - 10) {
             $(".indexHead #navbar").css({
                 "background": "#467fbf",

+ 18 - 4
website/src/main/resources/templates/partner.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown active"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -105,11 +112,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>

+ 18 - 4
website/src/main/resources/templates/product.html

@@ -52,10 +52,17 @@
                     <div id="navigation" class="navbar-collapse collapse">
                         <ul class="nav navbar-nav ml-auto">
                             <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown active"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large">
+                                <a href="about.html">关于我们 <b class="caret"></b></a>
+                                <div class="qrcode">
+                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                    <div>请关注塑维公众号</div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -96,11 +103,18 @@
                                 <br>云模:<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">官方微信公众号</h4>
+                        <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
                             </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
                         </div>
                     </div>
                 </div>