4 gadi atpakaļ · 5ae69b6335
--- a/src/main/java/com/caimei/www/controller/RedirectController.java
+++ b/src/main/java/com/caimei/www/controller/RedirectController.java
@@ -78,7 +78,6 @@ public class RedirectController {
 
				 	public String toArticleList(@PathVariable("id") Integer id) {
			
 
				 		return "redirect:/article/list.html?type=" + id;
			
 
				 	}
			
 
				-
			
 
				 	/**
			
 
				 	 * 文章列表【旧label】
			
 
				 	 */
			
@@ -93,4 +92,28 @@ public class RedirectController {
 
				 	public String toArticleDetail(@PathVariable("id") Integer id) {
			
 
				 		return "redirect:/article/detail.html?id=" + id;
			
 
				 	}
			
 
				+
			
 
				+    /**
			
 
				+     * 二手市场介绍
			
 
				+     */
			
 
				+    @GetMapping("/html/secondHand/introduction.jsp")
			
 
				+    public String toFleaMarket() {
			
 
				+        return "redirect:/flea-market/intro.html";
			
 
				+    }
			
 
				+    /**
			
 
				+     * 二手商品列表
			
 
				+     */
			
 
				+    @GetMapping("/html/secondHand/secondList.jsp")
			
 
				+    public String toFleaMarketList() {
			
 
				+        return "redirect:/flea-market/list.html";
			
 
				+    }
			
 
				+    /**
			
 
				+     * 二手商品列表
			
 
				+     */
			
 
				+    @GetMapping("/html/maintenance/view/secondtransactions.jsp")
			
 
				+    public String toFleaMarketForm() {
			
 
				+        return "redirect:/flea-market/form.html";
			
 
				+    }
			
 
				+
			
 
				+
			
 
				 }
			
--- a/src/main/java/com/caimei/www/controller/unlimited/FleaMarketController.java
+++ b/src/main/java/com/caimei/www/controller/unlimited/FleaMarketController.java
@@ -0,0 +1,44 @@
 
				+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 FleaMarketController extends BaseController {
			
 
				+
			
 
				+	private static final String FLEA_MARKET_INTRO = "flea-market/intro";
			
 
				+	private static final String FLEA_MARKET_LIST = "flea-market/list";
			
 
				+	private static final String FLEA_MARKET_FORM = "flea-market/form";
			
 
				+
			
 
				+    /**
			
 
				+     * 二手市场介绍
			
 
				+     */
			
 
				+    @GetMapping("/flea-market/intro.html")
			
 
				+    public String fleaMarket() {
			
 
				+        return FLEA_MARKET_INTRO;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 二手市场介绍
			
 
				+     */
			
 
				+    @GetMapping("/flea-market/list.html")
			
 
				+    public String fleaMarketList() {
			
 
				+        return FLEA_MARKET_LIST;
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 发布二手商品
			
 
				+     */
			
 
				+    @GetMapping("/flea-market/form.html")
			
 
				+    public String fleaMarketForm() {
			
 
				+        return FLEA_MARKET_FORM;
			
 
				+    }
			
 
				+
			
 
				+}
			
--- a/src/main/resources/templates/article/detail.html
+++ b/src/main/resources/templates/article/detail.html
@@ -12,7 +12,7 @@
 
				 
			
 
				 <!-- 文章详情 -->
			
 
				 <div id="articleDetail">
			
 
				-    <h1>文章详情（二期）</h1>
			
 
				+    <h1 style="text-align:center">文章详情（二期）</h1>
			
 
				 </div>
			
 
				 
			
 
				 <!-- 引入底部 -->
			
--- a/src/main/resources/templates/article/list.html
+++ b/src/main/resources/templates/article/list.html
@@ -12,7 +12,7 @@
 
				 
			
 
				 <!-- 文章列表 -->
			
 
				 <div id="articleList">
			
 
				-    <h1>文章列表（二期）</h1>
			
 
				+    <h1 style="text-align:center">文章列表（二期）</h1>
			
 
				 </div>
			
 
				 
			
 
				 <!-- 引入底部 -->
			
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.html
@@ -1,13 +1,21 @@
 
				-<!doctype html>
			
 
				-<html lang="en">
			
 
				+<!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>
			
 
				-    <meta charset="UTF-8">
			
 
				-    <meta name="viewport"
			
 
				-          content="width=device-width, account-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
			
 
				-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
			
 
				-    <title>Document</title>
			
 
				+    <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
			
 
				+    <template th:replace="components/head-link"></template>
			
 
				 </head>
			
 
				 <body>
			
 
				-404
			
 
				+<!-- 引用头部 -->
			
 
				+<template th:replace="components/header"></template>
			
 
				+
			
 
				+<!-- 帮助页面 -->
			
 
				+<div id="errorPage">
			
 
				+    <h1 style="text-align:center">404（二期）</h1>
			
 
				+</div>
			
 
				+
			
 
				+<!-- 引入底部 -->
			
 
				+<template th:replace="components/footer"></template>
			
 
				+<template th:replace="components/foot-link"></template>
			
 
				 </body>
			
 
				 </html>
			
--- a/src/main/resources/templates/flea-market/form.html
+++ b/src/main/resources/templates/flea-market/form.html
@@ -0,0 +1,21 @@
 
				+<!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>
			
 
				+</head>
			
 
				+<body>
			
 
				+<!-- 引用头部 -->
			
 
				+<template th:replace="components/header"></template>
			
 
				+
			
 
				+<!-- 二手商品发布 -->
			
 
				+<div id="fleaMarketForm">
			
 
				+    <h1 style="text-align:center">二手商品发布（二期）</h1>
			
 
				+</div>
			
 
				+
			
 
				+<!-- 引入底部 -->
			
 
				+<template th:replace="components/footer"></template>
			
 
				+<template th:replace="components/foot-link"></template>
			
 
				+</body>
			
 
				+</html>
			
--- a/src/main/resources/templates/flea-market/intro.html
+++ b/src/main/resources/templates/flea-market/intro.html
@@ -0,0 +1,21 @@
 
				+<!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>
			
 
				+</head>
			
 
				+<body>
			
 
				+<!-- 引用头部 -->
			
 
				+<template th:replace="components/header"></template>
			
 
				+
			
 
				+<!-- 二手市场介绍 -->
			
 
				+<div id="fleaMarket">
			
 
				+    <h1 style="text-align:center">二手市场介绍（二期）</h1>
			
 
				+</div>
			
 
				+
			
 
				+<!-- 引入底部 -->
			
 
				+<template th:replace="components/footer"></template>
			
 
				+<template th:replace="components/foot-link"></template>
			
 
				+</body>
			
 
				+</html>
			
--- a/src/main/resources/templates/flea-market/list.html
+++ b/src/main/resources/templates/flea-market/list.html
@@ -0,0 +1,21 @@
 
				+<!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>
			
 
				+</head>
			
 
				+<body>
			
 
				+<!-- 引用头部 -->
			
 
				+<template th:replace="components/header"></template>
			
 
				+
			
 
				+<!-- 二手商品列表 -->
			
 
				+<div id="fleaMarketList">
			
 
				+    <h1 style="text-align:center">二手商品列表（二期）</h1>
			
 
				+</div>
			
 
				+
			
 
				+<!-- 引入底部 -->
			
 
				+<template th:replace="components/footer"></template>
			
 
				+<template th:replace="components/foot-link"></template>
			
 
				+</body>
			
 
				+</html>
			
--- a/src/main/resources/templates/help/help.html
+++ b/src/main/resources/templates/help/help.html
@@ -12,7 +12,7 @@
 
				 
			
 
				 <!-- 帮助页面 -->
			
 
				 <div id="helpPage">
			
 
				-    <h1>帮助中心（二期）</h1>
			
 
				+    <h1 style="text-align:center">帮助中心（二期）</h1>
			
 
				 </div>
			
 
				 
			
 
				 <!-- 引入底部 -->