Merge branch 'dev' of ssh://cloud.wodcloud.com:10022/apaas/apaas-ui into dev

src/pages/user/user_info.vue

@@ -370,8 +370,7 @@ export default {
         ],
         email: [
           {
-            pattern:
-              /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[-|_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/,
+            pattern: /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[-|_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/,
             message: "请输入正确的邮箱",
           },
         ],
@@ -544,11 +543,11 @@ export default {
           origin_password: CryptoJS.AES.encrypt(
             this.form.passwordOld,
             "swuE9cmCZQwrkYRV"
-          ),
+          ).toString(),
           new_password: CryptoJS.AES.encrypt(
             this.form.passwordNew,
             "swuE9cmCZQwrkYRV"
-          ),
+          ).toString(),
         },
       };
       this.$api.user.editUserPassword(query).then((response) => {