diff --git a/jnpf-app/api/yys/me.js b/jnpf-app/api/yys/me.js
new file mode 100644
index 0000000..f7ffc69
--- /dev/null
+++ b/jnpf-app/api/yys/me.js
@@ -0,0 +1,21 @@
+import request from "@/utils/request";
+
+// 获取当前用户个人资料
+export function UserBaseInfo() {
+ return request({
+ url: "/api/permission/Users/Current/BaseInfo",
+ method: "GET",
+ });
+}
+
+// 账号注销
+export function logoutCurrentUser(token) {
+ return request({
+ url: '/api/oauth/logoutCurrentUser',
+ method: 'post',
+ token,
+ header: {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ }
+ })
+}
\ No newline at end of file
diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 4a6f0b2..6b3e074 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -1063,7 +1063,7 @@
"text": "我的",
"iconPath": "static/tabs/user_default.png",
"selectedIconPath": "static/tabs/user_selected.png"
- },
+ }
// {
// "pagePath": "pages/index/portal",
// "text": "首页",
@@ -1088,12 +1088,12 @@
// "iconPath": "static/image/tabbar/message.png",
// "selectedIconPath": "static/image/tabbar/messageHL.png"
// },
- {
- "pagePath": "pages/index/my",
- "text": "我",
- "iconPath": "static/image/tabbar/my.png",
- "selectedIconPath": "static/image/tabbar/myHL.png"
- }
+ // {
+ // "pagePath": "pages/index/my",
+ // "text": "我",
+ // "iconPath": "static/image/tabbar/my.png",
+ // "selectedIconPath": "static/image/tabbar/myHL.png"
+ // }
]
},
"globalStyle": {
diff --git a/jnpf-app/pages/index/my.vue b/jnpf-app/pages/index/my.vue
index 1121413..9da6227 100644
--- a/jnpf-app/pages/index/my.vue
+++ b/jnpf-app/pages/index/my.vue
@@ -1,270 +1,319 @@
-
-
-
-
-
-
- {{baseInfo.realName}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 退出登录
-
-
+
+
+
+
+
+
+ {{ baseInfo.realName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 退出登录
+
+
\ No newline at end of file
+ .f-right {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ text-align: center;
+ }
+}
+
diff --git a/jnpf-app/pages/me/index.vue b/jnpf-app/pages/me/index.vue
index a23a079..219dd42 100644
--- a/jnpf-app/pages/me/index.vue
+++ b/jnpf-app/pages/me/index.vue
@@ -5,8 +5,50 @@
-
-
+
+
+
+
+
+
+
+
+ {{ userInfo.realName }}
+
+
+ {{ userInfo.account }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改密码
+
+
+
+
+ 退出登录
+
+
+
@@ -14,45 +56,68 @@
diff --git a/jnpf-app/pages/my/modifyPsd/index.vue b/jnpf-app/pages/my/modifyPsd/index.vue
index 2fb9d26..0f56cb1 100644
--- a/jnpf-app/pages/my/modifyPsd/index.vue
+++ b/jnpf-app/pages/my/modifyPsd/index.vue
@@ -79,16 +79,16 @@
callback(new Error('新密码必须包含小写字母'));
}
}
- if (this.baseForm.includeUppercaseLetters) {
- if (!includeUppercaseLetters.test(value)) {
- callback(new Error('新密码必须包含大写字字母'));
- }
- }
- if (this.baseForm.containsCharacters) {
- if (!containsCharacters.test(value)) {
- callback(new Error('新密码必须包含字符'));
- }
- }
+ // if (this.baseForm.includeUppercaseLetters) {
+ // if (!includeUppercaseLetters.test(value)) {
+ // callback(new Error('新密码必须包含大写字字母'));
+ // }
+ // }
+ // if (this.baseForm.containsCharacters) {
+ // if (!containsCharacters.test(value)) {
+ // callback(new Error('新密码必须包含字符'));
+ // }
+ // }
callback();
} else {
callback();