From 81aa39a1dbc98aeb4ca11718ffdd71d172d35e9c Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Fri, 23 Aug 2024 09:40:04 +0800
Subject: [PATCH] =?UTF-8?q?app=E9=80=80=E5=87=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jnpf-app/api/yys/me.js                |  21 +
 jnpf-app/pages.json                   |  14 +-
 jnpf-app/pages/index/my.vue           | 569 ++++++++++++++------------
 jnpf-app/pages/me/index.vue           | 119 ++++--
 jnpf-app/pages/my/modifyPsd/index.vue |  20 +-
 5 files changed, 439 insertions(+), 304 deletions(-)
 create mode 100644 jnpf-app/api/yys/me.js

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 @@
 <template>
-	<view class="my-v" v-if="loading">
-		<view class="u-flex user-box u-p-l-20 u-p-r-10 u-p-b-20">
-			<view class="u-m-r-10">
-				<u-avatar size="140" @click='chooseAvatar' :src='avatarSrc'></u-avatar>
-			</view>
-			<view class="u-flex-1 f-right" @click="personalPage('/pages/my/personalData/index')">
-				<view class="u-font-18 u-m-l-16">{{baseInfo.realName}}</view>
-				<view class="u-m-l-10 u-p-10">
-					<u-icon name="arrow-right" color="#969799" size="28"></u-icon>
-				</view>
-			</view>
-		</view>
-		<view class="u-m-t-20">
-			<view class="" style="background-color: #fff;">
-				<u-cell-group style="padding: 0 20rpx;" :border="false">
-					<u-cell-item title="我的组织" @click="openPage('/pages/my/business/index','Organize')"
-						:title-style="titleStyle">
-						<text class="icon-ym icon-ym-zuzhi u-m-r-16 u-font-36" slot="icon" style="color: #303133;" />
-					</u-cell-item>
-					<u-cell-item title=" 我的岗位" @click="openPage('/pages/my/business/index','Position')"
-						:title-style="titleStyle">
-						<text class="icon-ym icon-ym-position1 u-m-r-16 u-font-36" slot="icon"
-							style="color: #303133;" />
-					</u-cell-item>
-					<u-cell-item title="我的下属" @click="openPage('/pages/my/subordinate/index')"
-						:title-style="titleStyle">
-						<text class="icon-ym icon-ym-generator-section u-m-r-16 u-font-36" slot="icon"
-							style="color: #303133;" />
-					</u-cell-item>
-					<!-- #ifndef H5 -->
-					<u-cell-item title="扫一扫" @click="scanCode()" :title-style="titleStyle">
-						<text class="icon-ym icon-ym-scanCode1 u-m-r-16 u-font-36"
-							style="font-weight: bold;color: #303133;" slot="icon" />
-					</u-cell-item>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<u-cell-item title="账号安全" @click="openPage('/pages/my/accountSecurity/index')"
-						:title-style="titleStyle">
-						<text class="icon-ym icon-ym-zhanghao u-m-r-16 u-font-36" slot="icon" style="color: #303133;" />
-					</u-cell-item>
-					<!-- #endif -->
-					<u-cell-item title="设置" @click="openPage('/pages/my/settings/index')" :title-style="titleStyle"
-						:border-bottom="false">
-						<text class="icon-ym icon-ym-shezhi u-m-r-16 u-font-36" slot="icon" style="color: #303133;" />
-					</u-cell-item>
-				</u-cell-group>
-			</view>
-		</view>
-		<view class="u-p-t-20">
-			<view class="logout-cell" hover-class="u-cell-hover" @click="logout">退出登录</view>
-		</view>
-	</view>
+  <view class="my-v" v-if="loading">
+    <view class="u-flex user-box u-p-l-20 u-p-r-10 u-p-b-20">
+      <view class="u-m-r-10">
+        <u-avatar size="140" @click="chooseAvatar" :src="avatarSrc"></u-avatar>
+      </view>
+      <view
+        class="u-flex-1 f-right"
+        @click="personalPage('/pages/my/personalData/index')"
+      >
+        <view class="u-font-18 u-m-l-16">{{ baseInfo.realName }}</view>
+        <view class="u-m-l-10 u-p-10">
+          <u-icon name="arrow-right" color="#969799" size="28"></u-icon>
+        </view>
+      </view>
+    </view>
+    <view class="u-m-t-20">
+      <view class="" style="background-color: #fff">
+        <u-cell-group style="padding: 0 20rpx" :border="false">
+          <u-cell-item
+            title="我的组织"
+            @click="openPage('/pages/my/business/index', 'Organize')"
+            :title-style="titleStyle"
+          >
+            <text
+              class="icon-ym icon-ym-zuzhi u-m-r-16 u-font-36"
+              slot="icon"
+              style="color: #303133"
+            />
+          </u-cell-item>
+          <u-cell-item
+            title=" 我的岗位"
+            @click="openPage('/pages/my/business/index', 'Position')"
+            :title-style="titleStyle"
+          >
+            <text
+              class="icon-ym icon-ym-position1 u-m-r-16 u-font-36"
+              slot="icon"
+              style="color: #303133"
+            />
+          </u-cell-item>
+          <u-cell-item
+            title="我的下属"
+            @click="openPage('/pages/my/subordinate/index')"
+            :title-style="titleStyle"
+          >
+            <text
+              class="icon-ym icon-ym-generator-section u-m-r-16 u-font-36"
+              slot="icon"
+              style="color: #303133"
+            />
+          </u-cell-item>
+          <!-- #ifndef H5 -->
+          <u-cell-item
+            title="扫一扫"
+            @click="scanCode()"
+            :title-style="titleStyle"
+          >
+            <text
+              class="icon-ym icon-ym-scanCode1 u-m-r-16 u-font-36"
+              style="font-weight: bold; color: #303133"
+              slot="icon"
+            />
+          </u-cell-item>
+          <!-- #endif -->
+          <!-- #ifdef APP-PLUS -->
+          <u-cell-item
+            title="账号安全"
+            @click="openPage('/pages/my/accountSecurity/index')"
+            :title-style="titleStyle"
+          >
+            <text
+              class="icon-ym icon-ym-zhanghao u-m-r-16 u-font-36"
+              slot="icon"
+              style="color: #303133"
+            />
+          </u-cell-item>
+          <!-- #endif -->
+          <u-cell-item
+            title="设置"
+            @click="openPage('/pages/my/settings/index')"
+            :title-style="titleStyle"
+            :border-bottom="false"
+          >
+            <text
+              class="icon-ym icon-ym-shezhi u-m-r-16 u-font-36"
+              slot="icon"
+              style="color: #303133"
+            />
+          </u-cell-item>
+        </u-cell-group>
+      </view>
+    </view>
+    <view class="u-p-t-20">
+      <view class="logout-cell" hover-class="u-cell-hover" @click="logout"
+        >退出登录</view
+      >
+    </view>
+  </view>
 </template>
 <script>
-	import IndexMixin from './mixin.js'
-	import {
-		UpdateAvatar
-	} from '@/api/common'
-	import {
-		UserSettingInfo
-	} from '@/api/common'
-	export default {
-		mixins: [IndexMixin],
-		data() {
-			return {
-				titleStyle: {
-					color: '#303133'
-				},
-				avatarSrc: '',
-				baseInfo: {},
-				loading: false
-			}
-		},
-		computed: {
-			baseURL() {
-				return this.define.comUploadUrl
-			},
-			baseURL2() {
-				return this.define.baseURL
-			},
-			token() {
-				return this.$store.getters.token
-			},
-			report() {
-				return this.define.report
-			}
-		},
-		onShow() {
-			UserSettingInfo().then(res => {
-				this.baseInfo = res.data || {}
-				this.avatarSrc = this.baseURL2 + this.baseInfo.avatar
-				this.loading = true
-			})
-		},
-		methods: {
-			chooseAvatar() {
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['original', 'compressed'],
-					success: (res) => {
-						let tempFilePaths = res.tempFilePaths[0]
-						uni.uploadFile({
-							url: this.baseURL + 'userAvatar',
-							filePath: tempFilePaths,
-							name: 'file',
-							header: {
-								'Authorization': this.token
-							},
-							success: (uploadFileRes) => {
-								let data = JSON.parse(uploadFileRes.data)
-								UpdateAvatar(data.data.name).then(res => {
-									this.$u.toast('头像更换成功')
-									this.avatarSrc = this.baseURL2 + data.data.url
-								})
-							},
-							fail: (err) => {
-								this.$u.toast('头像更换失败')
-							}
-						});
-					}
-				});
-			},
-			openPage(path, type) {
-				if (!path) return
-				let url = !!type ? path + '?majorType=' + type : path
-				uni.navigateTo({
-					url: url
-				})
-			},
-			personalPage(path) {
-				if (!path) return
-				uni.navigateTo({
-					url: path + '?baseInfo=' + encodeURIComponent(JSON
-						.stringify(this.baseInfo))
-				})
-			},
-			isJSON(str) {
-				try {
-					var obj = JSON.parse(str);
-					if (typeof obj == 'object' && obj) {
-						return true;
-					} else {
-						return false;
-					}
-				} catch (e) {
-					return false;
-				}
-			},
-			logout() {
-				uni.showModal({
-					title: '提示',
-					content: '确定退出当前账号吗？',
-					success: res => {
-						if (res.confirm) {
-							this.$store.dispatch('user/logout').then(() => {
-								uni.closeSocket()
-								uni.reLaunch({
-									url: '/pages/login/index'
-								})
-							})
-						}
-					}
-				})
-			},
-			scanCode() {
-				uni.scanCode({
-					success: res => {
-						if (this.isJSON(res.result.trim())) {
-							const result = JSON.parse(res.result.trim())
-							if (result.t === 'ADP') {
-								let config = {
-									isPreview: 1,
-									moduleId: result.id,
-									previewType: result.previewType
-								}
-								uni.navigateTo({
-									url: '/pages/apply/dynamicModel/index?config=' + this.base64
-										.encode(JSON.stringify(config), "UTF-8"),
-									fail: (err) => {
-										this.$u.toast("暂无此页面")
-									}
-								})
-							}
-							if (result.t === 'DFD') {
-								uni.navigateTo({
-									url: '/pages/apply/dynamicModel/scanForm?config=' + JSON.stringify(
-										result),
-									fail: (err) => {
-										this.$u.toast("暂无此页面")
-									}
-								})
-							}
-							if (result.t === 'WFP') {
-								uni.navigateTo({
-									url: '/pages/workFlow/scanForm/index?config=' + JSON.stringify(
-										result),
-									fail: (err) => {
-										this.$u.toast("暂无")
-									}
-								})
-							}
-							if (result.t === 'report') {
-								let url =
-									`${this.report}/preview.html?id=${result.id}&token=${this.token}&page=1&from=menu`
-								uni.navigateTo({
-									url: '/pages/apply/externalLink/index?url=' +
-										encodeURIComponent(
-											url) + '&fullName= ' + result.fullName,
-									fail: (err) => {
-										this.$u.toast("暂无")
-									}
-								})
-							}
-							if (result.t === 'portal') {
-								uni.navigateTo({
-									url: '/pages/index/scanProtal?id=' + result.id,
-									fail: (err) => {
-										this.$u.toast("暂无")
-									}
-								})
-							}
-						} else {
-							uni.navigateTo({
-								url: '/pages/my/scanResult/index?result=' + res.result,
-								fail: (err) => {
-									this.$u.toast("暂无此页面")
-								}
-							})
-						}
-					}
-				});
-			}
-		}
-	}
+import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+import IndexMixin from "./mixin.js";
+import { UpdateAvatar } from "@/api/common";
+import { UserSettingInfo } from "@/api/common";
+export default {
+  mixins: [IndexMixin],
+  data() {
+    return {
+      titleStyle: {
+        color: "#303133",
+      },
+      avatarSrc: "",
+      baseInfo: {},
+      loading: false,
+    };
+  },
+  computed: {
+    baseURL() {
+      return this.define.comUploadUrl;
+    },
+    baseURL2() {
+      return this.define.baseURL;
+    },
+    token() {
+      return this.$store.getters.token;
+    },
+    report() {
+      return this.define.report;
+    },
+  },
+  onShow() {
+    UserSettingInfo().then((res) => {
+      this.baseInfo = res.data || {};
+      this.avatarSrc = this.baseURL2 + this.baseInfo.avatar;
+      this.loading = true;
+    });
+  },
+  methods: {
+    chooseAvatar() {
+      uni.chooseImage({
+        count: 1,
+        sizeType: ["original", "compressed"],
+        success: (res) => {
+          let tempFilePaths = res.tempFilePaths[0];
+          uni.uploadFile({
+            url: this.baseURL + "userAvatar",
+            filePath: tempFilePaths,
+            name: "file",
+            header: {
+              Authorization: this.token,
+            },
+            success: (uploadFileRes) => {
+              let data = JSON.parse(uploadFileRes.data);
+              UpdateAvatar(data.data.name).then((res) => {
+                this.$u.toast("头像更换成功");
+                this.avatarSrc = this.baseURL2 + data.data.url;
+              });
+            },
+            fail: (err) => {
+              this.$u.toast("头像更换失败");
+            },
+          });
+        },
+      });
+    },
+    openPage(path, type) {
+      if (!path) return;
+      let url = !!type ? path + "?majorType=" + type : path;
+      uni.navigateTo({
+        url: url,
+      });
+    },
+    personalPage(path) {
+      if (!path) return;
+      uni.navigateTo({
+        url:
+          path +
+          "?baseInfo=" +
+          encodeURIComponent(JSON.stringify(this.baseInfo)),
+      });
+    },
+    isJSON(str) {
+      try {
+        var obj = JSON.parse(str);
+        if (typeof obj == "object" && obj) {
+          return true;
+        } else {
+          return false;
+        }
+      } catch (e) {
+        return false;
+      }
+    },
+    logout() {
+      uni.showModal({
+        title: "提示",
+        content: "确定退出当前账号吗？",
+        success: (res) => {
+          if (res.confirm) {
+            this.$store.dispatch("user/logout").then(() => {
+              uni.closeSocket();
+              uni.reLaunch({
+                url: "/pages/login/index",
+              });
+            });
+          }
+        },
+      });
+    },
+    scanCode() {
+      uni.scanCode({
+        success: (res) => {
+          if (this.isJSON(res.result.trim())) {
+            const result = JSON.parse(res.result.trim());
+            if (result.t === "ADP") {
+              let config = {
+                isPreview: 1,
+                moduleId: result.id,
+                previewType: result.previewType,
+              };
+              uni.navigateTo({
+                url:
+                  "/pages/apply/dynamicModel/index?config=" +
+                  this.base64.encode(JSON.stringify(config), "UTF-8"),
+                fail: (err) => {
+                  this.$u.toast("暂无此页面");
+                },
+              });
+            }
+            if (result.t === "DFD") {
+              uni.navigateTo({
+                url:
+                  "/pages/apply/dynamicModel/scanForm?config=" +
+                  JSON.stringify(result),
+                fail: (err) => {
+                  this.$u.toast("暂无此页面");
+                },
+              });
+            }
+            if (result.t === "WFP") {
+              uni.navigateTo({
+                url:
+                  "/pages/workFlow/scanForm/index?config=" +
+                  JSON.stringify(result),
+                fail: (err) => {
+                  this.$u.toast("暂无");
+                },
+              });
+            }
+            if (result.t === "report") {
+              let url = `${this.report}/preview.html?id=${result.id}&token=${this.token}&page=1&from=menu`;
+              uni.navigateTo({
+                url:
+                  "/pages/apply/externalLink/index?url=" +
+                  encodeURIComponent(url) +
+                  "&fullName= " +
+                  result.fullName,
+                fail: (err) => {
+                  this.$u.toast("暂无");
+                },
+              });
+            }
+            if (result.t === "portal") {
+              uni.navigateTo({
+                url: "/pages/index/scanProtal?id=" + result.id,
+                fail: (err) => {
+                  this.$u.toast("暂无");
+                },
+              });
+            }
+          } else {
+            uni.navigateTo({
+              url: "/pages/my/scanResult/index?result=" + res.result,
+              fail: (err) => {
+                this.$u.toast("暂无此页面");
+              },
+            });
+          }
+        },
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #f0f2f6;
-	}
+page {
+  background-color: #f0f2f6;
+}
 
-	.my-v {
-		/deep/ .u-cell {
-			height: 112rpx;
-			padding: 0;
-		}
+.my-v {
+  /deep/ .u-cell {
+    height: 112rpx;
+    padding: 0;
+  }
 
-		.user-box {
-			background-color: #fff;
-		}
+  .user-box {
+    background-color: #fff;
+  }
 
-		.logout-cell {
-			text-align: center;
-			font-size: 28rpx;
-			height: 112rpx;
-			background-color: #fff;
-			color: #d9001b;
-			line-height: 112rpx;
-		}
+  .logout-cell {
+    text-align: center;
+    font-size: 28rpx;
+    height: 112rpx;
+    background-color: #fff;
+    color: #d9001b;
+    line-height: 112rpx;
+  }
 
-		.f-right {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-			text-align: center;
-		}
-	}
-</style>
\ No newline at end of file
+  .f-right {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    text-align: center;
+  }
+}
+</style>
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 @@
     </template>
     <template v-else>
       <CustomNavbar />
-      <view class="cont">
-      </view>
+      <u-row gutter="16">
+        <u-col span="3">
+          <view :style="{ padding: '15px' }">
+            <u-avatar :src="userInfo.avatar" size="100"></u-avatar>
+          </view>
+        </u-col>
+        <u-col span="9">
+          <view>
+            <text>{{ userInfo.realName }}</text>
+          </view>
+          <view>
+            <text>{{ userInfo.account }}</text>
+          </view>
+        </u-col>
+      </u-row>
+      <u-row gutter="16">
+        <u-col span="12">
+          <view :style="{ padding: '20px 15px' }">
+            <image
+              class="icon"
+              src="/static/images/my-empty.png"
+              mode="aspectFit"
+            ></image>
+          </view>
+        </u-col>
+      </u-row>
+      <u-row gutter="16">
+        <u-col span="12">
+          <view :style="{ padding: '15px' }">
+            <u-button
+              :custom-style="{ color: '#ffffff', backgroundColor: '#6F89DD' }"
+              shape="circle"
+              :plain="false"
+              @click="fnEditPwd('/pages/my/modifyPsd/index')"
+              >修改密码</u-button
+            >
+          </view>
+        </u-col>
+        <u-col span="12">
+          <view :style="{ padding: '15px' }">
+            <u-button shape="circle" @click="fnLoginOut">退出登录</u-button>
+          </view>
+        </u-col>
+      </u-row>
     </template>
   </view>
 </template>
@@ -14,45 +56,68 @@
 <script>
 import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 import { mapGetters } from "vuex";
-import { getIMReply, relocation } from "@/api/message.js";
+import { UserBaseInfo, logoutCurrentUser } from "@/api/yys/me.js";
 import CustomNavbar from "./components/CustomNavbar";
 export default {
   components: {
-    CustomNavbar
+    CustomNavbar,
   },
   mixins: [],
   data() {
     return {
       isLoading: false,
-      categoryList: [
-        {
-          key: "product",
-          children: [
-            {
-              path: "productionReport",
-              name: "采购协同",
-              auth: true,
-              imgUrl: "/static/images/caigouxietong@1x.png",
-              defaultImgUrl: "/static/images/caigouxietong-wuquanxian@1x.png",
-            },
-            {
-              path: "assembleReport",
-              name: "报工确认",
-              auth: true,
-              imgUrl: "/static/images/baogongqueren@1x.png",
-              defaultImgUrl: "/static/images/baogongqueren-wuquanxian@1x.png",
-            },
-          ],
-        },
-      ],
+      userInfo: {},
     };
   },
   watch: {},
-  computed: {},
+  computed: {
+    token() {
+      return this.$store.getters.token;
+    },
+  },
   onLoad() {
+    console.log("onLoad");
+    this.fnUserBaseInfo();
   },
   onUnload() {},
-  methods: {},
+  methods: {
+    fnUserBaseInfo() {
+      UserBaseInfo()
+        .then((res) => {
+          if (res.code == 200) {
+            this.userInfo = { ...res.data };
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    fnLoginOut() {
+      uni.showModal({
+        title: "提示",
+        content: "确定退出当前账号吗？",
+        success: (res) => {
+          if (res.confirm) {
+            this.$store.dispatch("user/logout").then(() => {
+              uni.closeSocket();
+              uni.reLaunch({
+                url: "/pages/login/index",
+              });
+            });
+            console.log("用户点击确定");
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
+        },
+      });
+    },
+    fnEditPwd(path) {
+      if (!path) return;
+      uni.navigateTo({
+        url: path,
+      });
+    },
+  },
 };
 </script>
 
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();