浏览代码

注册init

chao 4 年之前
父节点
当前提交
d8a1ef91f2
共有 30 个文件被更改,包括 240 次插入53 次删除
  1. 6 6
      src/main/resources/config/dev/application-dev.yml
  2. 2 2
      src/main/resources/static/css/account/login.css
  3. 72 0
      src/main/resources/static/css/account/sign-up.css
  4. 1 1
      src/main/resources/static/css/base/base.h5.css
  5. 1 1
      src/main/resources/static/css/base/base.pc.css
  6. 0 0
      src/main/resources/static/img/account/login.png
  7. 0 0
      src/main/resources/static/img/account/login_m.png
  8. 0 0
      src/main/resources/static/img/account/to_login.png
  9. 0 0
      src/main/resources/static/img/account/to_login_m.png
  10. 9 1
      src/main/resources/static/js/account/login.js
  11. 52 3
      src/main/resources/static/js/account/sign-up.js
  12. 3 3
      src/main/resources/templates/account/login.html
  13. 64 6
      src/main/resources/templates/account/sign-up.html
  14. 0 0
      src/main/resources/templates/components/foot-link.html
  15. 0 0
      src/main/resources/templates/components/head-link.html
  16. 2 2
      src/main/resources/templates/index.html
  17. 2 2
      src/main/resources/templates/instrument/detail.html
  18. 2 2
      src/main/resources/templates/instrument/list.html
  19. 2 2
      src/main/resources/templates/maintenance/form.html
  20. 2 2
      src/main/resources/templates/maintenance/index.html
  21. 2 2
      src/main/resources/templates/product/detail.html
  22. 2 2
      src/main/resources/templates/product/list.html
  23. 2 2
      src/main/resources/templates/shopping/cart.html
  24. 2 2
      src/main/resources/templates/single-page/investment.html
  25. 2 2
      src/main/resources/templates/single-page/live.html
  26. 2 2
      src/main/resources/templates/single-page/page.html
  27. 2 2
      src/main/resources/templates/single-page/promotions.html
  28. 2 2
      src/main/resources/templates/single-page/topic.html
  29. 2 2
      src/main/resources/templates/supplier/index.html
  30. 2 2
      src/main/resources/templates/supplier/list.html

+ 6 - 6
src/main/resources/config/dev/application-dev.yml

@@ -2,12 +2,12 @@ spring:
   #数据源连接--start
   datasource:
     #driverClassName: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://192.168.1.11:3306/caimei@20180509?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-#    username: developer
-#    password: 05bZ/OxTB:X+yd%1
-    url: jdbc:mysql://119.29.0.46:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: general
-    password: 6#xsI%b4o@5c3RoE
+    url: jdbc:mysql://192.168.1.11:3306/caimei@20180509?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: developer
+    password: 05bZ/OxTB:X+yd%1
+#    url: jdbc:mysql://119.29.0.46:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#    username: general
+#    password: 6#xsI%b4o@5c3RoE
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari:

+ 2 - 2
src/main/resources/static/css/account/login.css

@@ -6,7 +6,7 @@ li{list-style:none}
 @media screen and (min-width:768px){
 footer .footTop{display:none;}
 .baseHeadCenter .wrap{padding-top:20px}
-.loginWrap{width:950px;height:366px;overflow:hidden;background:#FFF url(/img/base/login.png) no-repeat 30px center;margin:95px auto;box-sizing:border-box;box-shadow:0 10px 20px 0 rgba(255,180,150,0.17);border-radius:2px}
+.loginWrap{width:950px;height:366px;overflow:hidden;background:#FFF url(/img/account/login.png) no-repeat 30px center;margin:95px auto;box-sizing:border-box;box-shadow:0 10px 20px 0 rgba(255,180,150,0.17);border-radius:2px}
 .loginForm{float:right;width:400px;padding:20px 24px;font-size:14px;position:relative}
 .loginForm h1{color:#22272e;font-size:24px;font-weight:bold;line-height:30px}
 .loginForm h2{color:#22272e;font-size:16px;font-weight:normal;line-height:24px}
@@ -51,7 +51,7 @@ footer{display:none}
 header .baseHeadCenter{height:13.4vw;border-bottom:solid 1px #ebecef}
 header .closeLogin{float:right;padding:3.5vw 2.8vw;width:6.4vw;height:6.4vw;text-align:center}
 header .closeLogin:before{content:'\2715';font-size:4.5vw;font-weight:bold}
-.loginForm{padding-top:4vw;text-align:center;background:#FFF url(/img/base/login_m.png) no-repeat center 25vw;background-size:57vw 43.2vw}
+.loginForm{padding-top:4vw;text-align:center;background:#FFF url(/img/account/login_m.png) no-repeat center 25vw;background-size:57vw 43.2vw}
 .loginForm h1{color:#22272e;font-size:6.4vw;font-weight:bold;line-height:10vw}
 .loginForm h2{font-size:3.1vw;font-weight:normal;line-height:5.4vw;color:#627386}
 .loginForm form{width:93.4vw;margin:54vw auto 0}

+ 72 - 0
src/main/resources/static/css/account/sign-up.css

@@ -0,0 +1,72 @@
+@charset "utf-8";
+li{list-style:none}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+body{background:#FFF;}
+footer .footTop{display:none;}
+.baseHeadCenter {border-bottom: solid 1px #ebecef;}
+.baseHeadCenter .wrap{padding-top:20px}
+.baseHeadCenter .toLogin {
+    font-size: 20px;
+    float: right;
+    line-height: 44px;
+}
+.baseHeadCenter .toLogin a{
+   color:#E15616;margin-left:10px;
+}
+.baseHeadCenter .toLogin a:hover{text-decoration: underline;}
+.selectAccount{
+    width:1184px;
+    height:558px;
+    margin:0 auto;
+    text-align: center;
+}
+.selectAccount .title{
+	height: 42px;
+	font-size: 32px;
+	font-weight: normal;
+	line-height: 42px;
+	color: #22272e;
+	margin-top: 102px;
+}
+.selectAccount .cont{
+    margin-top:44px;
+}
+.selectAccount .cont span{
+    display: inline-block;
+    width:168px;
+    margin:0 55px;
+    line-height:42px;
+    color:#3b77ff;
+    font-size: 24px;
+    cursor: pointer;
+}
+.selectAccount .cont span:before{
+    content:'';
+    display: inline-block;
+    width:168px;
+    height:168px;
+    background-color:#c2d8fa;
+    border-radius: 84px;
+}
+
+
+
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+body{background:#FFF}
+footer{display:none}
+header .baseHeadCenter{height:13.4vw;border-bottom:solid 1px #ebecef}
+header .closeLogin{float:right;padding:3.5vw 2.8vw;width:6.4vw;height:6.4vw;text-align:center}
+header .closeLogin:before{content:'\2715';font-size:4.5vw;font-weight:bold}
+
+
+
+}

+ 1 - 1
src/main/resources/static/css/base/base.h5.css

@@ -115,7 +115,7 @@
 /* 登录弹框 */
 .loginAlert{padding-top:1vw;text-align:center;}
 .loginAlert span{display:block}
-.loginAlert:before{content:'';display:block;width:26.7vw;height:26.7vw;background:url(/img/base/to_login_m.png) no-repeat left top;background-size:100% 100%;margin:0 auto}
+.loginAlert:before{content:'';display:block;width:26.7vw;height:26.7vw;background:url(/img/account/to_login_m.png) no-repeat left top;background-size:100% 100%;margin:0 auto}
 
 /* 咨询,回到顶部 */
 #scrollTop{display:none;position:fixed;right:0;;z-index:9999;bottom:4vw;}

+ 1 - 1
src/main/resources/static/css/base/base.pc.css

@@ -192,7 +192,7 @@ body{min-width:1184px;}
 /* 登录弹框 */
 .loginAlert{padding-top:5px;}
 .loginAlert span:first-child:after{content: ',';}
-.loginAlert:after{content:'';display:block;width:125px;height:125px;background:url(/img/base/to_login.png) no-repeat left top;background-size:100% 100%;margin:10px 0 0 15px;}
+.loginAlert:after{content:'';display:block;width:125px;height:125px;background:url(/img/account/to_login.png) no-repeat left top;background-size:100% 100%;margin:10px 0 0 15px;}
 /* 咨询,回到顶部 */
 #scrollTop{display:none;position:fixed;right:50%;margin-right:-700px;width:88px;z-index:9999;bottom:120px;}
 #scrollTop .item{width:100%;background-color:#fff;box-sizing:border-box;text-align:center;box-shadow:0 2px 4px rgb(254,246,243);border-radius:2px;margin-bottom:10px;font-size:12px;position:relative}

+ 0 - 0
src/main/resources/static/img/base/login.png → src/main/resources/static/img/account/login.png


+ 0 - 0
src/main/resources/static/img/base/login_m.png → src/main/resources/static/img/account/login_m.png


+ 0 - 0
src/main/resources/static/img/base/to_login.png → src/main/resources/static/img/account/to_login.png


+ 0 - 0
src/main/resources/static/img/base/to_login_m.png → src/main/resources/static/img/account/to_login_m.png


+ 9 - 1
src/main/resources/static/js/account/login.js

@@ -133,6 +133,14 @@ var loginPage = new Vue({
         var _self = this;
         $('body').on("focus",'[needverify]:visible',function(){
             $(this).siblings('.errTips').removeClass("show").siblings('.checked').removeClass("show");
-        })
+        });
+        //enter键登录
+        $(document).keyup(function (e) {
+            var e = e || event;
+            e.stopPropagation();
+            if (e.keyCode === 13) {
+                _self.loginSubmit();
+            }
+        });
     }
 });

+ 52 - 3
src/main/resources/static/js/account/sign-up.js

@@ -1,13 +1,62 @@
 var signPage = new Vue({
-    el: "#signPage",
+    el: "#signUpPage",
     data: {
-
+        advisoryStatus: false,
+        advisory:{
+            name: '',
+            phone: ''
+        }
     },
     computed: {
 
     },
     methods: {
-
+        // 失去焦点校验
+        blurHandle: function(event) {
+            var el = event.currentTarget;
+            verifyHandle(el);
+        },
+        // 验证表单
+        verifyForm: function () {
+            var _self = this;
+            $("[needverify]:visible").each(function (index, ele) {
+                if (!$(ele).siblings('.checked').hasClass("show")) {
+                    verifyHandle(ele);
+                }
+            });
+            var len = $('.errTips.show:visible').length;
+            return (len === 0);
+        },
+        // 入住咨询提交
+        postAdvisory: function(){
+            var _self = this;
+            $('.advisoryInfo').find("[needverify]:visible").each(function (index, ele) {
+                if (!$(ele).siblings('.checked').hasClass("show")) {
+                    verifyHandle(ele);
+                }
+            });
+            var pass = ($('.errTips.show:visible').length === 0);
+            if (this.advisoryStatus) { return false; }
+            this.$nextTick(function(){
+                if (!pass) { return false; }
+                _self.advisoryStatus = true;
+                $.post(spiServer + '/club/advisory',{
+                    name: _self.advisory.name,
+                    mobile: _self.advisory.phone
+                }).done(function(res){
+                    _self.advisoryStatus = false;
+                    if(res.code === 0){
+                        alertInfo("您的信息已提交成功,采美工作人员会第一时间联系您");
+                    } else {
+                        alertInfo(res.msg);
+                    }
+                }).fail(function(err){
+                    console.log(err);
+                    alertInfo('提交失败,请稍后重试!');
+                    _self.advisoryStatus = false;
+                });
+            });
+        },
 
     },
     created: function () {

+ 3 - 3
src/main/resources/templates/account/login.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/account/login.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -11,7 +11,7 @@
 <header>
     <div class="baseHeadCenter">
         <div class="wrap clear">
-            <a href="javascript:void(0);" class="h5Only mClassBtn mIcon" title="分类"></a>
+            <a href="/index.html" class="h5Only mClassBtn mIcon" title="主页"></a>
             <a href="/" class="logo">
                 <img class="pcOnly" src="/img/base/logo.png" alt="采美 生美/医美采购服务平台"/>
                 <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
@@ -66,7 +66,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/account/login.js(v=${version})}"></script>
 </body>

+ 64 - 6
src/main/resources/templates/account/sign-up.html

@@ -3,21 +3,79 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/account/sign-up.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
+<!--头部-->
+<header>
+    <div class="baseHeadCenter">
+        <div class="wrap clear">
+            <a href="/index.html" class="h5Only mClassBtn mIcon" title="主页"></a>
+            <a href="/" class="logo">
+                <img class="pcOnly" src="/img/base/logo.png" alt="采美 生美/医美采购服务平台"/>
+                <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
+            </a>
+            <a href="javascript:void(0);" title="关闭" class="h5Only closeLogin"></a>
+            <p class="toLogin">已有账号?请直接<a href="/login.html">登录</a></p>
+        </div>
+    </div>
+    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${agent}" id="userAgent">
+</header>
 
-<!-- 二级页面 -->
-<div id="signPage">
+<!-- 注册账号 -->
+<div id="signUpPage">
+    <div class="selectAccount">
+        <div class="title">请选择账户类型</div>
+        <div class="cont">
+            <span class="a">机构</span>
+            <span class="b">供应商</span>
+        </div>
+    </div>
+    <div class="clubUser">
+        <div class="title">欢迎机构入驻</div>
+        <div class="advisory">
+            <span class="icon">入住咨询</span>
+            <div class="advisoryInfo">
+                <div class="info">若暂不方便入驻机构或无法入驻,您可以留下您的姓名和联系方式,采美工作人员会第一时间联系您。</div>
+                <label>
+                    <span><em>*</em>姓名:</span>
+                    <input type="text" v-model="advisory.name" placeholder="请输入您的姓名" rule="^[a-zA-Z]+(\s*[a-zA-Z]+){1,}$" maxlength="50" @blur="blurHandle($event)" needverify>
+                    <i class="checked icon mIcon"></i>
+                    <span class="errTips icon mIcon" tips="请最少以两个英文输入"></span>
+                </label>
+                <label>
+                    <span><em>*</em>姓名:</span>
+                    <input type="text" v-model="advisory.phone" placeholder="请输入您的常用手机号" rule="^\\d{6,12}$" maxlength="12" @blur="blurHandle($event)" needverify>
+                    <i class="checked icon mIcon"></i>
+                    <span class="errTips icon mIcon" tips="请输入有效电话号码"></span>
+                </label>
+                <button class="btn" type="button" @click="postAdvisory()">提交</button>
+            </div>
+        </div>
 
+
+
+
+
+
+
+
+
+
+
+
+
+    </div>
+    <div class="supplierUser">
+
+    </div>
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/account/sign-up.js(v=${version})}"></script>
 </body>
 </html>

+ 0 - 0
src/main/resources/templates/components/footLink.html → src/main/resources/templates/components/foot-link.html


+ 0 - 0
src/main/resources/templates/components/headLink.html → src/main/resources/templates/components/head-link.html


+ 2 - 2
src/main/resources/templates/index.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/index/index.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/index/index.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
 </head>
@@ -185,7 +185,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/index.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/instrument/detail.html

@@ -5,7 +5,7 @@
     <title th:text="'采美365网-'+${instrument.title}"></title>
     <meta http-equiv="keywords" th:content="${instrument.keywords}">
     <meta http-equiv="description" th:content="${instrument.description}">
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/instrument/detail.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/single-page/topic.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
@@ -74,7 +74,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/instrument/detail.js(v=${version})}"></script>
 </body>

+ 2 - 2
src/main/resources/templates/instrument/list.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-项目仪器列表</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/instrument/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -52,7 +52,7 @@
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/instrument/cart.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/maintenance/form.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-维修申请</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/maintenance/form.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -17,7 +17,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/maintenance/form.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/maintenance/index.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-采美仪器维修保养介绍</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/maintenance/index.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -28,7 +28,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/maintenance/index.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/product/detail.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title th:text="'采美365网-'+${product.name}">采美365网-商品详情</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/product/detail.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/product/detail.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
 </head>
@@ -179,7 +179,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/detail.js(v=${version})}"></script>
 </body>

+ 2 - 2
src/main/resources/templates/product/list.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-商品列表</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/product/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -152,7 +152,7 @@
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/list.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/shopping/cart.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-购物车列表</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/shopping/cart.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -150,7 +150,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/shopping/cart.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/single-page/investment.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-品牌招商介绍</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <style type="text/css">
         /** PC */
         @media screen and (min-width:768px){#investment .wrap{width:1184px;margin:0 auto -30px auto}
@@ -72,7 +72,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script type="text/javascript">
 var investment = new Vue({
     el: "#investment",

+ 2 - 2
src/main/resources/templates/single-page/live.html

@@ -5,7 +5,7 @@
     <title th:text="'采美365网-'+${pageData.title}"></title>
     <meta http-equiv="keywords" th:content="${pageData.keywords}">
     <meta http-equiv="description" th:content="${pageData.description}">
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/single-page/live.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -73,7 +73,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/single-page/live.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/single-page/page.html

@@ -5,7 +5,7 @@
     <title th:text="'采美365网-'+${pageData.title}"></title>
     <meta http-equiv="keywords" th:content="${pageData.keywords}">
     <meta http-equiv="description" th:content="${pageData.description}">
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <style type="text/css">
         /** PC端 */
         @media screen and (min-width:768px){
@@ -34,6 +34,6 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/single-page/promotions.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-商品专题</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/single-page/promotions.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -40,7 +40,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/single-page/promotions.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/single-page/topic.html

@@ -5,7 +5,7 @@
     <title th:text="'采美365网-'+${pageData.title}"></title>
     <meta http-equiv="keywords" th:content="${pageData.keywords}">
     <meta http-equiv="description" th:content="${pageData.description}">
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/single-page/topic.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -45,7 +45,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/single-page/topic.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/supplier/index.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title th:text="'采美365网-'+${supplier.name}">采美365网-供应商首页</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/supplier/index.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -165,7 +165,7 @@
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier/index.js(v=${version})}"></script>
 </body>
 </html>

+ 2 - 2
src/main/resources/templates/supplier/list.html

@@ -3,7 +3,7 @@
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
     <title>采美365网-供应商列表</title>
-    <template th:replace="components/headLink"></template>
+    <template th:replace="components/head-link"></template>
     <link th:href="@{/css/supplier/list.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -73,7 +73,7 @@
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
-<template th:replace="components/footLink"></template>
+<template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier/cart.js(v=${version})}"></script>
 </body>
 </html>