Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

src/main/java/com/caimei/www/controller/authorized/user/UserPageController.java

@@ -27,7 +27,7 @@ public class UserPageController extends BaseController {
     /** 申请维修 */
 	private static final String REPAIR_FORM = "user-center/repair/form";
     /** 申请维修 */
-	private static final String REPAIR_ADDFORM = "user-center/repair/addform";
+	private static final String REPAIR_FORM_USER = "user-center/repair/form-user";
     /** 地址管理 */
 	private static final String ADDRESS_LIST = "user-center/address/list";
     /** 添加地址 */
@@ -71,22 +71,22 @@ public class UserPageController extends BaseController {
         return OPERATION_DETAIL;
     }
 
-    /** 维修列表 */
+    /** 用户维修列表 */
     @GetMapping("/user/repair/list.html")
     public String repairList() {
         return REPAIR_LIST;
     }
 
-    /** 申请维修 */
+    /** 用户申请维修 */
     @GetMapping("/user/repair/form.html")
-    public String repairForm() {
-        return REPAIR_FORM;
+    public String repairFormUser() {
+        return REPAIR_FORM_USER;
     }
 
-    /** 用户申请维修 */
-    @GetMapping("/user/repair/addform.html")
-    public String repairAddForm() {
-        return REPAIR_ADDFORM;
+    /** 申请维修(未登录) */
+    @GetMapping("/repair/form.html")
+    public String repairForm() {
+        return REPAIR_FORM;
     }
 
     /** 地址管理 */

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

@@ -15,12 +15,12 @@
     <div class="wrap">
         <h1 class="title">
             <span>采美仪器维修介绍</span>
-            <a href="/user/repair/form.html" class="btn">申请维修</a>
+            <a href="/repair/form.html" class="btn">申请维修</a>
         </h1>
         <div class="content">
             <img src="/img/repair/repair.jpg" alt="采美仪器维修介绍">
             <div class="btnBox">
-                <a href="/user/repair/form.html" class="fixedBtn">申请维修</a>
+                <a href="/repair/form.html" class="fixedBtn">申请维修</a>
             </div>
         </div>
     </div>