Home Explore Help
Sign In
caimei365
/
caimei365-www
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

文章列表

chao 4 years ago
parent
c482345cbc
commit
5e78f81986
7 changed files with 48 additions and 9 deletions
Unified View Show Diff Stats
  1. 1 0
      src/main/resources/static/css/base/base.pc.css
  2. 1 1
      src/main/resources/static/css/base/init.css
  3. 8 5
      src/main/resources/static/js/base.js
  4. 0 0
      src/main/resources/templates/account/components/header.html
  5. 1 1
      src/main/resources/templates/account/login.html
  6. 35 0
      src/main/resources/templates/article/components/header.html
  7. 2 2
      src/main/resources/templates/article/list.html

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

@@ -63,6 +63,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 
 .baseHeadCenter.account .accountLogin{font-size:20px;float:right;line-height:44px}
 
 .baseHeadCenter.account .accountLogin{font-size:20px;float:right;line-height:44px}
 
 .baseHeadCenter.account .accountLogin a{color:#E15616;margin-left:10px}
 
 .baseHeadCenter.account .accountLogin a{color:#E15616;margin-left:10px}
 
 .baseHeadCenter.account .accountLogin a:hover{text-decoration:underline}
 
 .baseHeadCenter.account .accountLogin a:hover{text-decoration:underline}
 
+.articleTopNav{width:100%;font-size:16px;height:44px;line-height:44px;color:#4a4f58;background:#FFF;}
 
 
 
 /* 购物车 */
 
 /* 购物车 */
 
 .baseHeadCenter .headCart{width:184px;height:44px;float:right;position:relative;}
 
 .baseHeadCenter .headCart{width:184px;height:44px;float:right;position:relative;}

+ 1 - 1
src/main/resources/static/css/base/init.css
View File 

@@ -17,7 +17,7 @@ header li,footer li{list-style:none;}
 
 [v-cloak]{display:none;}
 
 [v-cloak]{display:none;}
 
 table{border-collapse: collapse;}
 
 table{border-collapse: collapse;}
 
 table,td,th{border: 1px solid #EBECEF;}
 
 table,td,th{border: 1px solid #EBECEF;}
 
-.favicon.ico{background: url(/static/img/web.ico)}
 
+.favicon.ico{background: url(/img/web.ico)}
 
 /* checkbox */
 
 /* checkbox */
 
 input[type=checkbox]{width:16px;height:16px;text-align:center;outline:none;cursor:copy;}
 
 input[type=checkbox]{width:16px;height:16px;text-align:center;outline:none;cursor:copy;}
 
 input[type=checkbox]:focus{outline:none}
 
 input[type=checkbox]:focus{outline:none}

+ 8 - 5
src/main/resources/static/js/base.js
View File 

@@ -186,15 +186,18 @@ $(function(){
 
             });
 
             });
 
             return false;
 
             return false;
 
         }
 
         }
 
-        if (type === 2) {
 
-            // 项目仪器
 
-            window.location.href = '/equipment/list.html?keyword='+encodeURIComponent(keyword);
 
+        if (type === 0) {
 
+            // 商品
 
+            window.location.href = '/product/list.html?keyword='+encodeURIComponent(keyword);
 
         } else if(type === 1) {
 
         } else if(type === 1) {
 
             // 供应商
 
             // 供应商
 
             window.location.href = '/supplier/list.html?keyword='+encodeURIComponent(keyword);
 
             window.location.href = '/supplier/list.html?keyword='+encodeURIComponent(keyword);
 
+        } else if (type === 2) {
 
+            // 项目仪器
 
+            window.location.href = '/equipment/list.html?keyword=' + encodeURIComponent(keyword);
 
         } else{
 
         } else{
 
-            // 商品
 
-            window.location.href = '/product/list.html?keyword='+encodeURIComponent(keyword);
 
+            // 文章
 
+            window.location.href = '/article/list.html?keyword=' + encodeURIComponent(keyword);
 
         }
 
         }
 
     }).on('keyup', '.keyword', function(event) {
 
     }).on('keyup', '.keyword', function(event) {
 
         // 搜索输入框 按回车键搜索
 
         // 搜索输入框 按回车键搜索

+ 0 - 0
src/main/resources/templates/components/header-account.html → src/main/resources/templates/account/components/header.html
View File


+ 1 - 1
src/main/resources/templates/account/login.html
View File 

@@ -9,7 +9,7 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <!-- 引用头部 -->
 
 <!-- 引用头部 -->
 
-<template th:replace="components/header-account"></template>
 
+<template th:replace="account/components/header"></template>
 
 
 
 <!-- 二级页面 -->
 
 <!-- 二级页面 -->
 
 <div id="loginPage">
 
 <div id="loginPage">

+ 35 - 0
src/main/resources/templates/article/components/header.html
View File 

@@ -0,0 +1,35 @@
 
+<header id="articleHead" xmlns:th="http://www.w3.org/1999/xhtml">
 
+    <div class="articleTopNav">
 
+        <div class="wrap">
 
+            <a href="/index.html" target="_blank">商城首页</a>
 
+            <a href="/info/center-3-1.html" class="typeBtn" typeid="3">新品上线</a>
 
+            <a href="/info/center-2-1.html" class="current typeBtn" typeid="2">商城促销</a>
 
+            <a href="/info/center-6-1.html" class="typeBtn" typeid="6">热门和推荐</a>
 
+            <a href="/info/center-8-1.html" class="typeBtn" typeid="8">医美直播专栏</a>
 
+            <a href="/info/center-1-1.html" class="typeBtn" typeid="1">采美动态</a>
 
+            <a href="/info/center-4-1.html" class="typeBtn" typeid="4">美业科普</a>
 
+        </div>
 
+    </div>
 
+    <!--搜索-->
 
+    <div class="baseHeadCenter article">
 
+        <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>
 
+            <div class="mf h5Only mUserCenter">
 
+                <a :href="loginStatus?'/shopping/cart.html':'javascript:void(0);'" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车"></a>
 
+                <a href="javascript:void(0);" :class="loginStatus?'mUserIcon mIcon':'mUserIcon mIcon toLogin'" title="个人中心"></a>
 
+            </div>
 
+            <div class="searchBox" id="topSearch">
 
+                <div class="search">
 
+                    <input class="keyword" type="text" placeholder="请输入关键字" />
 
+                    <a class="searchBtn icon mIcon" href="javascript:void(0);"></a>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <input type="hidden" th:value="${spiServer}" id="spiServer">
 
+    <input type="hidden" th:value="${agent}" id="userAgent">
 
+</header>

+ 2 - 2
src/main/resources/templates/article/list.html
View File 

@@ -2,13 +2,13 @@
 
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
       xsi:schemaLocation="https://www.thymeleaf.org ">
 
       xsi:schemaLocation="https://www.thymeleaf.org ">
 
 <head>
 
 <head>
 
-    <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
 
+    <title>采美365网-文章列表</title>
 
     <template th:replace="components/head-link"></template>
 
     <template th:replace="components/head-link"></template>
 
     <link th:href="@{/css/article/list.css(v=${version})}" rel="stylesheet" type="text/css">
 
     <link th:href="@{/css/article/list.css(v=${version})}" rel="stylesheet" type="text/css">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <!-- 引用头部 -->
 
 <!-- 引用头部 -->
 
-<template th:replace="components/header"></template>
 
+<template th:replace="article/components/header"></template>
 
 
 
 <!-- 文章列表 -->
 
 <!-- 文章列表 -->
 
 <div id="articleList">
 
 <div id="articleList">