合并修改

element-vue/src/components/personalMessage.vue

@@ -5,41 +5,39 @@
         </h1>
         <div class="personal-message">
             <!--            未编辑状态-->
-            <el-table v-if="!edit" :data="tableData" stripe>
-                <el-table-column prop="name" width="200"></el-table-column>
-                <el-table-column prop="data"></el-table-column>
-            </el-table>
-            <!--            编辑状态-->
-            <div v-if="edit">
             <el-form :model="data" label-width="100px" class="demo-ruleForm">
                 <el-form-item label="工号" prop="name">
-                        <el-input v-model="data.id" disabled></el-input>
+                    <el-input v-model="data.username" disabled></el-input>
                 </el-form-item>
                 <el-form-item label="姓名" prop="name">
-                        <el-input v-model="data.name"></el-input>
+                    <el-input v-model="data.nickname" :disabled="!edit"></el-input>
                 </el-form-item>
                 <el-form-item label="联系电话" prop="name">
-                        <el-input v-model="data.tel"></el-input>
+                    <el-input v-model="data.tel" :disabled="!edit"></el-input>
                 </el-form-item>
                 <el-form-item label="办公室" prop="name">
-                        <el-input v-model="data.office"></el-input>
+                    <el-input v-model="data.office" :disabled="!edit"></el-input>
                 </el-form-item>
                 <el-form-item label="邮箱" prop="name">
-                        <el-input v-model="data.email"></el-input>
+                    <el-input v-model="data.email" :disabled="!edit"></el-input>
                 </el-form-item>
-                    <el-form-item>
+                <el-form-item v-if="edit">
                     <el-button type="primary" @click="submit">修改</el-button>
                     <el-button @click="editClick">取消</el-button>
                 </el-form-item>
             </el-form>
         </div>
     </div>
-    </div>
 </template>
 
 <script>
     import {get, post} from "~/utils";
+<<<<<<< HEAD
     import {showDialog, showSuccess} from "~/utils/dialog";
+=======
+    import axios from "axios"
+    import {closeLoading, showDialog, showLoading, showSuccess} from "~/utils/dialog";
+>>>>>>> e51d44ad1213257fbd60443a010ff4ba74fd6927
 
     export default {
         data() {
@@ -62,8 +60,8 @@
                     data: '123456789@hzu.com',
                 }],
                 data: {
-                    id: '12345',
-                    name: '王小虎',
+                    username: '12345',
+                    nickname: '王小虎',
                     tel: '13123456789',
                     office: '5#101',
                     email: '123456789@hzu.com'
@@ -80,16 +78,24 @@
                 this.data = await get('lb/user/getUserInfo')
             },
             async submit() {
-                await showDialog('确定要修改吗？',this)
-                console.log(this.data)
+                await showDialog('确定要修改吗？', this)
+                const loading = showLoading("正在修改...",this)
                 // 提交表单，修改用户信息
-                await post('lb/user/updateInfo', {
-                    data: this.data
+                await post('lb/user/updateBySelf', {
+                    username: this.data.username,
+                    nickname: this.data.nickname,
+                    tel: this.data.tel,
+                    office: this.data.office,
+                    email: this.data.email
                 })
                 // 修改后重载用户数据
+                setTimeout(()=>{
+                    closeLoading(loading)
                     this.load()
                     this.edit = false
-                showSuccess('修改成功')
+                    showSuccess('修改成功',this)
+                },1000)
+
             }
         },
         async mounted() {

element-vue/src/utils/dialog.js

@@ -24,3 +24,18 @@ export function showFail(content,that) {
         message: content
     });
 }
+
+// 加载
+export function showLoading(content,that) {
+    return that.$loading({
+        lock: true,
+        text: content,
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+    })
+}
+
+// 关闭加载
+export function closeLoading(loading) {
+    loading.close()
+}