From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-vue/src/views/system/user/profile/userInfo.vue |   98 +++++++++++++++++++++++++++----------------------
 1 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/zhitan-vue/src/views/system/user/profile/userInfo.vue b/zhitan-vue/src/views/system/user/profile/userInfo.vue
index f1d67b5..187c02e 100644
--- a/zhitan-vue/src/views/system/user/profile/userInfo.vue
+++ b/zhitan-vue/src/views/system/user/profile/userInfo.vue
@@ -1,67 +1,77 @@
 <template>
-   <el-form ref="userRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
-         <el-input v-model="form.nickName" maxlength="30" />
-      </el-form-item>
-      <el-form-item label="鎵嬫満鍙风爜" prop="phoneNumber">
-         <el-input v-model="form.phoneNumber" maxlength="11" />
-      </el-form-item>
-      <el-form-item label="閭" prop="email">
-         <el-input v-model="form.email" maxlength="50" />
-      </el-form-item>
-      <el-form-item label="鎬у埆">
-         <el-radio-group v-model="form.sex">
-            <el-radio label="0">鐢�</el-radio>
-            <el-radio label="1">濂�</el-radio>
-         </el-radio-group>
-      </el-form-item>
-      <el-form-item>
-      <el-button type="primary" @click="submit">淇濆瓨</el-button>
+  <el-form ref="userRef" :model="form" :rules="rules" label-width="80px">
+    <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
+      <el-input v-model="form.nickName" maxlength="30" />
+    </el-form-item>
+    <el-form-item label="鎵嬫満鍙风爜" prop="phoneNumber">
+      <el-input v-model="form.phoneNumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="閭" prop="email">
+      <el-input v-model="form.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="鎬у埆">
+      <el-radio-group v-model="form.sex">
+        <el-radio label="0">鐢�</el-radio>
+        <el-radio label="1">濂�</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <!-- <el-button type="primary" @click="submit">淇濆瓨</el-button> -->
       <el-button type="danger" @click="close">鍏抽棴</el-button>
-      </el-form-item>
-   </el-form>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script setup>
-import { updateUserProfile } from "@/api/system/user";
+import { updateUserProfile } from "@/api/system/user"
 
 const props = defineProps({
   user: {
-    type: Object
-  }
-});
+    type: Object,
+  },
+})
 
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance()
 
-const form = ref({});
+const form = ref({})
 const rules = ref({
   nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }],
-  email: [{ required: true, message: "閭鍦板潃涓嶈兘涓虹┖", trigger: "blur" }, { type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
-  phoneNumber: [{ required: true, message: "鎵嬫満鍙风爜涓嶈兘涓虹┖", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }],
-});
+  email: [
+    { required: true, message: "閭鍦板潃涓嶈兘涓虹┖", trigger: "blur" },
+    { type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] },
+  ],
+  phoneNumber: [
+    { required: true, message: "鎵嬫満鍙风爜涓嶈兘涓虹┖", trigger: "blur" },
+    { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" },
+  ],
+})
 
 /** 鎻愪氦鎸夐挳 */
 function submit() {
-  proxy.$refs.userRef.validate(valid => {
+  proxy.$refs.userRef.validate((valid) => {
     if (valid) {
-      updateUserProfile(form.value).then(response => {
-        proxy.$modal.msgSuccess("淇敼鎴愬姛");
-        props.user.phoneNumber = form.value.phoneNumber;
-        props.user.email = form.value.email;
-      });
+      updateUserProfile(form.value).then((response) => {
+        proxy.$modal.msgSuccess("淇敼鎴愬姛")
+        props.user.phoneNumber = form.value.phoneNumber
+        props.user.email = form.value.email
+      })
     }
-  });
-};
+  })
+}
 
 /** 鍏抽棴鎸夐挳 */
 function close() {
-  proxy.$tab.closePage();
-};
+  proxy.$tab.closePage()
+}
 
 // 鍥炴樉褰撳墠鐧诲綍鐢ㄦ埛淇℃伅
-watch(() => props.user, user => {
-  if (user) {
-    form.value = { nickName: user.nickName, phoneNumber: user.phoneNumber, email: user.email, sex: user.sex };
-  }
-},{ immediate: true });
+watch(
+  () => props.user,
+  (user) => {
+    if (user) {
+      form.value = { nickName: user.nickName, phoneNumber: user.phoneNumber, email: user.email, sex: user.sex }
+    }
+  },
+  { immediate: true }
+)
 </script>

--
Gitblit v1.9.3