diff --git a/backend/src/test/java/com/backend/pojo/Express.java b/backend/src/test/java/com/backend/pojo/Express.java new file mode 100644 index 0000000..d33aeed --- /dev/null +++ b/backend/src/test/java/com/backend/pojo/Express.java @@ -0,0 +1,23 @@ +package com.backend.pojo; + +import com.backend.anno.State; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class Express { + private String expressid; + private String sename; + private String sephone; + private String seaddress; + private String rename; + private String rephone; + private String readdress; + @State + private String issigned; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy年MM月dd日") + private Date signtime; + +} diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index eeb7825..cf9672b 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -4,8 +4,8 @@ import Layout from "../view/Layout.vue"; import Home from "../view/Home.vue"; import Index from "../view/user/Index.vue"; import MyInfo from "../view/user/MyInfo.vue"; -import ExpressList from "../view/user/ExpressList.vue"; -import ExpressForm from "../view/user/ExpressForm.vue"; +import ExpressList from "../view/express/ExpressList.vue"; +import ExpressForm from "../view/express/ExpressForm.vue"; import UserInfo from "../view/user/UserInfo.vue"; import UserAvatar from "../view/user/UserAvatar.vue"; import UserResetPassword from "../view/user/UserResetPassword.vue"; @@ -26,13 +26,13 @@ const routes = [ component: Login, }, { - path: '/index', - name: 'Index', - component: Index, + path: '/Layout', + name: 'Layout', + component: Layout, children: [ { - path: '/myInfo', - component: MyInfo + path: '/userInfo', + component: UserInfo }, { path: '/expressList', @@ -41,7 +41,8 @@ const routes = [ { path: '/expressForm', component: ExpressForm - } + }, + {path: '/user/resetPassword', component: UserResetPassword}, ] },