申请维修

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -76,7 +76,7 @@ public class RedirectController {
      */
     @GetMapping("/html/repair/view/mt-entry-index.jsp")
     public String torepair() {
-		return "redirect:/repair/index.html";
+		return "redirect:/repair.html";
 	}
 
     /**

src/main/java/com/caimei/www/controller/unlimited/RepairController.java

@@ -1,36 +0,0 @@
-package com.caimei.www.controller.unlimited;
-
-import com.caimei.www.controller.BaseController;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-/**
- * 维修保养
- *
- * @author : Charles
- * @date : 2020/7/21
- */
-@Controller
-public class RepairController extends BaseController {
-	/** 维修保养介绍页 */
-	private static final String REPAIR_PATH = "repair/index";
-	/** 维修保申请页 */
-	private static final String REPAIR_FORM_PATH = "repair/form";
-
-    /**
-     * 维修保养介绍页
-     */
-    @GetMapping("/repair/index.html")
-    public String repair(final Model model) {
-        return REPAIR_PATH;
-    }
-    /**
-     * 维修保养申请页
-     */
-    @GetMapping("/repair/form.html")
-    public String repairForm(final Model model) {
-        return REPAIR_FORM_PATH;
-    }
-
-}

src/main/java/com/caimei/www/controller/unlimited/SinglePageController.java

@@ -38,6 +38,8 @@ public class SinglePageController extends BaseController {
 	private static final String LIVE_PATH = "single-page/live";
 	/** 品牌招商介绍页 */
 	private static final String INVESTMENT_PATH = "single-page/investment";
+	/** 维修保养介绍页 */
+	private static final String REPAIR_PATH = "single-page/repair";
 
     private SinglePageService singlePageService;
     @Autowired
@@ -100,6 +102,14 @@ public class SinglePageController extends BaseController {
         return INVESTMENT_PATH;
     }
 
+    /**
+     * 维修保养介绍页
+     */
+    @GetMapping("/repair.html")
+    public String repair(final Model model) {
+        return REPAIR_PATH;
+    }
+
     /**
      * 二级专题数据
      * @return

src/main/resources/static/css/repair/index.css → src/main/resources/static/css/single-page/repair.css

@@ -10,7 +10,7 @@ li{list-style:none}
 .content{width:1184px;margin:0 auto;background:#FFF}
 .content img{display:block;width:100%}
 .content .btnBox{height:214px}
-.fixedBtn{display:block;width:706px;height:214px;margin:0 auto;background:url(/img/repair/btn.png) no-repeat center center;cursor:pointer}
+.fixedBtn{display:block;width:706px;height:214px;margin:0 auto;background:url(/img/repair/repair-btn.png) no-repeat center center;cursor:pointer}
 .fixedBtn,.fixedBtn:hover{color:transparent}
 .fixedBtn.fixed{position:fixed;right:50%;margin-right:-353px;bottom:0}
 
@@ -26,7 +26,7 @@ li{list-style:none}
 .content{width:100vw;margin:0 auto;background:#FFF}
 .content img{display:block;width:100%}
 .content .btnBox{height:21.4vw}
-.fixedBtn{display:block;width:70.6vw;height:21.4vw;margin:0 auto;background:url(/img/repair/btn.png) no-repeat center center;background-size:100%;cursor:pointer}
+.fixedBtn{display:block;width:70.6vw;height:21.4vw;margin:0 auto;background:url(/img/repair/repair-btn.png) no-repeat center center;background-size:100%;cursor:pointer}
 .fixedBtn,.fixedBtn:hover{color:transparent}
 .fixedBtn.fixed{position:fixed;right:50%;margin-right:-35.3vw;bottom:0}
 

src/main/resources/templates/components/header.html

@@ -116,7 +116,7 @@
                     </li>
                 </ul>
             </div>
-            <a class="service nav" href="/repair/index.html">维修</a>
+            <a class="service nav" href="/repair.html">维修</a>
         </div>
         <div id="mainClassify" class="classifyBox mFixed">
             <div v-if="!isPC" class="clsHead clear">

src/main/resources/templates/index.html

@@ -42,7 +42,7 @@
                     </div>
                 </div>
             </li>
-            <li class="first"><a class="nav mIcon" href="/repair/index.html"><span>维修</span></a></li>
+            <li class="first"><a class="nav mIcon" href="/repair.html"><span>维修</span></a></li>
         </ul>
     </div>
     <!--页面主体数据-->
@@ -214,6 +214,6 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/index.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/repair.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/repair/form.html

@@ -1,79 +0,0 @@
-<!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/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/repair/form.css(v=${version})}" rel="stylesheet" type="text/css">
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-
-<!-- 维修申请 -->
-<div id="repairForm">
-    <div class="repair">
-        <h1 class="title">申请维修</h1>
-        <p class="desc">未注册用户可直接填写维修申请；已注册用户为了方便您查看后续服务进展，请在登录账号后再填写维修申请。</p>
-        <form>
-            <div class="formLine">
-                <p><em>*</em>问题描述：</p>
-                <textarea  v-model.trim="postData.question" placeholder="请输入您的问题描述(不超过200字)…" maxlength="200" needverify></textarea>
-                <i class="checked icon mIcon"></i>
-                <span class="errTips icon mIcon" tips="请输入您的问题描述"></span>
-            </div>
-            <div class="formLine">
-                <p><em>*</em>联系人：</p>
-                <input type="text" v-model.trim="postData.linkman" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
-                <i class="checked icon mIcon"></i>
-                <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
-            </div>
-            <div class="formLine">
-                <p><em>*</em>联系电话：</p>
-                <input type="text" v-model.trim="postData.phone" placeholder="请输入联系电话" :rule="rule.phone" maxlength="12" @blur="blurHandle($event)" needverify>
-                <i class="checked icon mIcon"></i>
-                <span class="errTips icon mIcon" tips="请输入有效的联系电话"></span>
-            </div>
-            <div class="formLine">
-                <p><em>*</em>联系地址：</p>
-                <div class="address">
-                    <select><option value="">请选择</option></select>
-                    <select><option value="">请选择</option></select>
-                    <select><option value="">请选择</option></select>
-                    <textarea v-model.trim="postData.address" placeholder="建议您如实填写详细收货地址，例如：街道名称，门牌号码，楼层和房间号等信息"></textarea>
-                </div>
-                <i class="checked icon mIcon"></i>
-                <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
-            </div>
-            <div class="formLine">
-                <p><em>*</em>仪器名称：</p>
-                <input type="text" v-model.trim="postData.name" placeholder="请输入仪器名称" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
-                <i class="checked icon mIcon"></i>
-                <span class="errTips icon mIcon" tips="请输入正确的仪器名称"></span>
-            </div>
-            <div class="formLine">
-                <p>生产厂家：</p>
-                <input type="text" v-model.trim="postData.shopName" placeholder="请输入生产厂家" :rule="rule.name" maxlength="50" @blur="blurHandle($event)">
-                <i class="checked icon mIcon"></i>
-                <span class="errTips icon mIcon" tips="请输入正确的公司名称"></span>
-            </div>
-            <div class="formLine">
-                <p>上传图片：</p>
-                <input type="file" v-model="postData.image">
-                <span class="errTips icon mIcon"></span>
-                <p class="fileInfo">请尽量上传仪器全照或者仪器故障图片，方便您的维修事宜上传jpg/png格式照片，单个照片不能超过5M,最多不超过5张</p>
-            </div>
-            <div class="subLine">
-                <button class="btn" type="button" @click="submitData()">提交</button>
-            </div>
-        </form>
-    </div>
-</div>
-
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/repair/form.js(v=${version})}"></script>
-</body>
-</html>

src/main/resources/templates/repair/index.html → src/main/resources/templates/single-page/repair.html

@@ -4,7 +4,7 @@
 <head>
     <title>采美365网-采美仪器维修保养介绍</title>
     <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/repair/index.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/single-page/repair.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
@@ -15,12 +15,12 @@
     <div class="wrap">
         <h1 class="title">
             <span>采美仪器维修介绍</span>
-            <a href="/repair/form.html" class="btn">申请维修</a>
+            <a href="/user/repair/form.html" class="btn">申请维修</a>
         </h1>
         <div class="content">
             <img src="/img/repair/repair.jpg" alt="采美仪器维修介绍">
             <div class="btnBox">
-                <a href="/repair/form.html" class="fixedBtn">申请维修</a>
+                <a href="/user/repair/form.html" class="fixedBtn">申请维修</a>
             </div>
         </div>
     </div>
@@ -29,6 +29,6 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/repair/index.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/single-page/repair.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier/index.html

@@ -166,6 +166,6 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier/index.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier/repair.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/user-center/repair/form.html

@@ -2,22 +2,78 @@
 <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>
+    <title>采美365网-维修申请</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/user-center/repair.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
-<!-- 我的采美 -->
-<div>
-
+<!-- 维修申请 -->
+<div id="repairForm">
+    <div class="repair">
+        <h1 class="title">申请维修</h1>
+        <p class="desc">未注册用户可直接填写维修申请；已注册用户为了方便您查看后续服务进展，请在登录账号后再填写维修申请。</p>
+        <form>
+            <div class="formLine">
+                <p><em>*</em>问题描述：</p>
+                <textarea  v-model.trim="postData.question" placeholder="请输入您的问题描述(不超过200字)…" maxlength="200" needverify></textarea>
+                <i class="checked icon mIcon"></i>
+                <span class="errTips icon mIcon" tips="请输入您的问题描述"></span>
+            </div>
+            <div class="formLine">
+                <p><em>*</em>联系人：</p>
+                <input type="text" v-model.trim="postData.linkman" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                <i class="checked icon mIcon"></i>
+                <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
+            </div>
+            <div class="formLine">
+                <p><em>*</em>联系电话：</p>
+                <input type="text" v-model.trim="postData.phone" placeholder="请输入联系电话" :rule="rule.phone" maxlength="12" @blur="blurHandle($event)" needverify>
+                <i class="checked icon mIcon"></i>
+                <span class="errTips icon mIcon" tips="请输入有效的联系电话"></span>
+            </div>
+            <div class="formLine">
+                <p><em>*</em>联系地址：</p>
+                <div class="address">
+                    <select><option value="">请选择</option></select>
+                    <select><option value="">请选择</option></select>
+                    <select><option value="">请选择</option></select>
+                    <textarea v-model.trim="postData.address" placeholder="建议您如实填写详细收货地址，例如：街道名称，门牌号码，楼层和房间号等信息"></textarea>
+                </div>
+                <i class="checked icon mIcon"></i>
+                <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
+            </div>
+            <div class="formLine">
+                <p><em>*</em>仪器名称：</p>
+                <input type="text" v-model.trim="postData.name" placeholder="请输入仪器名称" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                <i class="checked icon mIcon"></i>
+                <span class="errTips icon mIcon" tips="请输入正确的仪器名称"></span>
+            </div>
+            <div class="formLine">
+                <p>生产厂家：</p>
+                <input type="text" v-model.trim="postData.shopName" placeholder="请输入生产厂家" :rule="rule.name" maxlength="50" @blur="blurHandle($event)">
+                <i class="checked icon mIcon"></i>
+                <span class="errTips icon mIcon" tips="请输入正确的公司名称"></span>
+            </div>
+            <div class="formLine">
+                <p>上传图片：</p>
+                <input type="file" v-model="postData.image">
+                <span class="errTips icon mIcon"></span>
+                <p class="fileInfo">请尽量上传仪器全照或者仪器故障图片，方便您的维修事宜上传jpg/png格式照片，单个照片不能超过5M,最多不超过5张</p>
+            </div>
+            <div class="subLine">
+                <button class="btn" type="button" @click="submitData()">提交</button>
+            </div>
+        </form>
+    </div>
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/repair.js(v=${version})}"></script>
 </body>
 </html>