diff --git a/admin-fe/src/assets/app.css b/admin-fe/src/assets/app.css index 8fa6f98..ab97519 100644 --- a/admin-fe/src/assets/app.css +++ b/admin-fe/src/assets/app.css @@ -118,4 +118,14 @@ body { .pointer-cursor { cursor: pointer; +} +table{ + width: 100%; + border-left: solid 1px #eee; + border-top: solid 1px #eee; +} +td,th { + border-right: solid 1px #eee; + border-bottom: solid 1px #eee; + padding:2px 4px; } \ No newline at end of file diff --git a/admin-fe/src/router/routes.ts b/admin-fe/src/router/routes.ts index e303f6f..dc51321 100644 --- a/admin-fe/src/router/routes.ts +++ b/admin-fe/src/router/routes.ts @@ -2,21 +2,22 @@ import {RouteRecordRaw} from "vue-router"; import Home from '../views/admin/Home.vue' import Login from '../views/Login.vue' import NotFound from '../views/NotFound.vue' -import Test from '../views/Test.vue' import AdminLayout from '../views/layout/AdminLayout.vue' +import UserIndex from '../views/user/index.vue' const routes: RouteRecordRaw[] = [ { path: '/', component: AdminLayout, + redirect: '/home', children: [ { path: 'home', component: Home }, { - path: 'test', - component: Test + path: 'user', + component: UserIndex } ] }, diff --git a/admin-fe/src/service/store.ts b/admin-fe/src/service/store.ts index b77113f..5499002 100644 --- a/admin-fe/src/service/store.ts +++ b/admin-fe/src/service/store.ts @@ -6,15 +6,21 @@ import {useRouter} from "vue-router"; // store的id必须唯一 export const useTestStore = defineStore('test-store', { - state: () => ({ - info: { - nickname: '' + state: () => { + return { + info: { + nickname: 'default name' + } } - }), + }, getters: { nickname: (state) => state.info.nickname }, - actions: {} + actions: { + setNickname(newName) { + this.info.nickname = newName + } + } }) // 保存数据的key const TOKEN_KEY = "user-login-token"; @@ -50,4 +56,4 @@ export const useUserStore = defineStore('user-store', () => { } return {userinfo, login, logout, updateInfo, token} -}) \ No newline at end of file +}) diff --git a/admin-fe/src/service/types.d.ts b/admin-fe/src/service/types.d.ts index 8328c9b..7db2801 100644 --- a/admin-fe/src/service/types.d.ts +++ b/admin-fe/src/service/types.d.ts @@ -3,4 +3,27 @@ type AdminLoginModel = { account: string; password?: string; token: string; +} +type PointInfoModel = { + uid: number; + totalPoint: number; + validPoint?: number; + expirePoint?: number; + expireTime?: any; + updateTime?: string; +} +type UserInfoModel = { + id: number; + openId: string; + nickname: string; + headImage: string; + gender?: number; + province?: string; + city?: string; + parentId: number; + firstLoginTime: string; + updateTime?: string; + status: number; + pointInfo: PointInfoModel; + parent?: UserInfoModel | null; } \ No newline at end of file diff --git a/admin-fe/src/util/http.ts b/admin-fe/src/util/http.ts index 58076b5..f4cc384 100644 --- a/admin-fe/src/util/http.ts +++ b/admin-fe/src/util/http.ts @@ -22,6 +22,16 @@ export type ResponseModel = { data: T trace?: string } +export type DataListModel = { + /** + * 数据列表 + */ + items: T[]; + /** + * 查询到的总数 + */ + total: number; +} class Http { post(url, data) { diff --git a/admin-fe/src/views/layout/AdminLayout.vue b/admin-fe/src/views/layout/AdminLayout.vue index 1bbc216..196bebc 100644 --- a/admin-fe/src/views/layout/AdminLayout.vue +++ b/admin-fe/src/views/layout/AdminLayout.vue @@ -9,17 +9,18 @@
-
左侧的菜单 -
- TEST -
-
- HOME +
+
积分管理系统
+
- +
+ +
@@ -33,23 +34,23 @@ const userStore = useUserStore(); \ No newline at end of file diff --git a/admin-fe/src/views/user/index.vue b/admin-fe/src/views/user/index.vue new file mode 100644 index 0000000..05e8de2 --- /dev/null +++ b/admin-fe/src/views/user/index.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file