4 anni fa · 40d1961d7b
--- a/src/main/java/com/caimei/www/controller/RedirectController.java
+++ b/src/main/java/com/caimei/www/controller/RedirectController.java
@@ -71,4 +71,26 @@ public class RedirectController {
 
				 		return "redirect:/maintenance/index.html";
			
 
				 	}
			
 
				 
			
 
				+	/**
			
 
				+	 * 文章列表【旧center】
			
 
				+	 */
			
 
				+	@GetMapping("/info/center-{id}-1.html")
			
 
				+	public String toArticleList(@PathVariable("id") Integer id) {
			
 
				+		return "redirect:/article/list.html?type=" + id;
			
 
				+	}
			
 
				+
			
 
				+	/**
			
 
				+	 * 文章列表【旧label】
			
 
				+	 */
			
 
				+	@GetMapping("/info/label-{id}-1.html")
			
 
				+	public String toArticleList2(@PathVariable("id") Integer id) {
			
 
				+		return "redirect:/article/list.html?label=" + id;
			
 
				+	}
			
 
				+	/**
			
 
				+	 * 文章详情【旧】
			
 
				+	 */
			
 
				+	@GetMapping("/info/detail-{id}-1.html")
			
 
				+	public String toArticleDetail(@PathVariable("id") Integer id) {
			
 
				+		return "redirect:/article/detail.html?id=" + id;
			
 
				+	}
			
 
				 }
			
--- a/src/main/java/com/caimei/www/controller/unlimited/ArticleController.java
+++ b/src/main/java/com/caimei/www/controller/unlimited/ArticleController.java
@@ -0,0 +1,35 @@
 
				+package com.caimei.www.controller.unlimited;
			
 
				+
			
 
				+import com.caimei.www.controller.BaseController;
			
 
				+import org.springframework.stereotype.Controller;
			
 
				+import org.springframework.web.bind.annotation.GetMapping;
			
 
				+
			
 
				+/**
			
 
				+ * Description
			
 
				+ *
			
 
				+ * @author : Charles
			
 
				+ * @date : 2020/7/31
			
 
				+ */
			
 
				+@Controller
			
 
				+public class ArticleController extends BaseController {
			
 
				+
			
 
				+	private static final String ARTICLE_LIST_PATH = "article/list";
			
 
				+	private static final String ARTICLE_DETAIL_PATH = "article/detail";
			
 
				+
			
 
				+    /**
			
 
				+     * 文章列表页
			
 
				+     */
			
 
				+    @GetMapping("/article/list.html")
			
 
				+    public String articleList() {
			
 
				+        return ARTICLE_LIST_PATH;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 文章详情页
			
 
				+     */
			
 
				+    @GetMapping("/article/detail.html")
			
 
				+    public String articleDetail() {
			
 
				+        return ARTICLE_DETAIL_PATH;
			
 
				+    }
			
 
				+
			
 
				+}
			
--- a/src/main/java/com/caimei/www/controller/unlimited/HelpPageController.java
+++ b/src/main/java/com/caimei/www/controller/unlimited/HelpPageController.java
@@ -0,0 +1,27 @@
 
				+package com.caimei.www.controller.unlimited;
			
 
				+
			
 
				+import com.caimei.www.controller.BaseController;
			
 
				+import org.springframework.stereotype.Controller;
			
 
				+import org.springframework.web.bind.annotation.GetMapping;
			
 
				+
			
 
				+/**
			
 
				+ * Description
			
 
				+ *
			
 
				+ * @author : Charles
			
 
				+ * @date : 2020/7/31
			
 
				+ */
			
 
				+@Controller
			
 
				+public class HelpPageController extends BaseController {
			
 
				+
			
 
				+	private static final String HELP_PAGE_PATH = "help/help";
			
 
				+
			
 
				+    /**
			
 
				+     * 帮助页
			
 
				+     */
			
 
				+    @GetMapping("/help.html")
			
 
				+    public String help() {
			
 
				+        return HELP_PAGE_PATH;
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+}
			
--- a/src/main/resources/static/css/article/detail.css
+++ b/src/main/resources/static/css/article/detail.css
@@ -0,0 +1,17 @@
 
				+@charset "utf-8";
			
 
				+li{list-style:none}
			
 
				+/**
			
 
				+ * PC端
			
 
				+ */
			
 
				+@media screen and (min-width:768px){
			
 
				+
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+* 移动端
			
 
				+*/
			
 
				+@media screen and (max-width:768px){
			
 
				+
			
 
				+
			
 
				+}
			
 
				+
			
--- a/src/main/resources/static/css/article/list.css
+++ b/src/main/resources/static/css/article/list.css
@@ -0,0 +1,17 @@
 
				+@charset "utf-8";
			
 
				+li{list-style:none}
			
 
				+/**
			
 
				+ * PC端
			
 
				+ */
			
 
				+@media screen and (min-width:768px){
			
 
				+
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+* 移动端
			
 
				+*/
			
 
				+@media screen and (max-width:768px){
			
 
				+
			
 
				+
			
 
				+}
			
 
				+
			
--- a/src/main/resources/static/css/help/help.css
+++ b/src/main/resources/static/css/help/help.css
@@ -0,0 +1,17 @@
 
				+@charset "utf-8";
			
 
				+li{list-style:none}
			
 
				+/**
			
 
				+ * PC端
			
 
				+ */
			
 
				+@media screen and (min-width:768px){
			
 
				+
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+* 移动端
			
 
				+*/
			
 
				+@media screen and (max-width:768px){
			
 
				+
			
 
				+
			
 
				+}
			
 
				+
			
--- a/src/main/resources/static/js/article/detail.js
+++ b/src/main/resources/static/js/article/detail.js
--- a/src/main/resources/static/js/article/list.js
+++ b/src/main/resources/static/js/article/list.js
--- a/src/main/resources/static/js/help/help.js
+++ b/src/main/resources/static/js/help/help.js
--- a/src/main/resources/templates/article/detail.html
+++ b/src/main/resources/templates/article/detail.html
@@ -0,0 +1,23 @@
 
				+<!DOCTYPE html>
			
 
				+<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 ">
			
 
				+<head>
			
 
				+    <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
			
 
				+    <template th:replace="components/head-link"></template>
			
 
				+    <link th:href="@{/css/article/detail.css(v=${version})}" rel="stylesheet" type="text/css">
			
 
				+</head>
			
 
				+<body>
			
 
				+<!-- 引用头部 -->
			
 
				+<template th:replace="components/header"></template>
			
 
				+
			
 
				+<!-- 文章详情 -->
			
 
				+<div id="articleDetail">
			
 
				+    <h1>文章详情（二期）</h1>
			
 
				+</div>
			
 
				+
			
 
				+<!-- 引入底部 -->
			
 
				+<template th:replace="components/footer"></template>
			
 
				+<template th:replace="components/foot-link"></template>
			
 
				+<script charset="utf-8" type="text/javascript" th:src="@{/js/article/detail.js(v=${version})}"></script>
			
 
				+</body>
			
 
				+</html>
			
--- a/src/main/resources/templates/article/list.html
+++ b/src/main/resources/templates/article/list.html
@@ -0,0 +1,23 @@
 
				+<!DOCTYPE html>
			
 
				+<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 ">
			
 
				+<head>
			
 
				+    <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
			
 
				+    <template th:replace="components/head-link"></template>
			
 
				+    <link th:href="@{/css/article/list.css(v=${version})}" rel="stylesheet" type="text/css">
			
 
				+</head>
			
 
				+<body>
			
 
				+<!-- 引用头部 -->
			
 
				+<template th:replace="components/header"></template>
			
 
				+
			
 
				+<!-- 文章列表 -->
			
 
				+<div id="articleList">
			
 
				+    <h1>文章列表（二期）</h1>
			
 
				+</div>
			
 
				+
			
 
				+<!-- 引入底部 -->
			
 
				+<template th:replace="components/footer"></template>
			
 
				+<template th:replace="components/foot-link"></template>
			
 
				+<script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
			
 
				+</body>
			
 
				+</html>
			
--- a/src/main/resources/templates/components/header.html
+++ b/src/main/resources/templates/components/header.html
@@ -42,8 +42,8 @@
 
				                 <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
			
 
				             </a>
			
 
				             <div class="mf h5Only mUserCenter">
			
 
				-                <a href="javascript:void(0);" class="mAddCart mIcon" title="购物车"></a>
			
 
				-                <a href="javascript:void(0);" class="mUserIcon mIcon" title="个人中心"></a>
			
 
				+                <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">
			
--- a/src/main/resources/templates/help/help.html
+++ b/src/main/resources/templates/help/help.html
@@ -0,0 +1,23 @@
 
				+<!DOCTYPE html>
			
 
				+<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 ">
			
 
				+<head>
			
 
				+    <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
			
 
				+    <template th:replace="components/head-link"></template>
			
 
				+    <link th:href="@{/css/help/help.css(v=${version})}" rel="stylesheet" type="text/css">
			
 
				+</head>
			
 
				+<body>
			
 
				+<!-- 引用头部 -->
			
 
				+<template th:replace="components/header"></template>
			
 
				+
			
 
				+<!-- 帮助页面 -->
			
 
				+<div id="helpPage">
			
 
				+    <h1>帮助中心（二期）</h1>
			
 
				+</div>
			
 
				+
			
 
				+<!-- 引入底部 -->
			
 
				+<template th:replace="components/footer"></template>
			
 
				+<template th:replace="components/foot-link"></template>
			
 
				+<script charset="utf-8" type="text/javascript" th:src="@{/js/help/help.js(v=${version})}"></script>
			
 
				+</body>
			
 
				+</html>