1

src/views/manager/index.vue

@@ -54,12 +54,12 @@
       <el-container>
         <el-header style="text-align: right; font-size: 12px;background-color: #a9b3a9">
           <el-dropdown>
-            <span>
-              <el-avatar :size="50">
-                <img :src="avatarURL">
+            <div>
+              <el-avatar :size="50" class="imgTitle">
+                <img :src="avatarURL"/>
               </el-avatar>
               <span>巴扎黑</span>
-            </span>
+            </div>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="editAvatar">修改头像</el-dropdown-item>
               <el-dropdown-item @click.native="updateUserInfo">修改用户信息</el-dropdown-item>
@@ -91,8 +91,7 @@
             :autoCropWidth="option.autoCropWidth"
             :autoCropHeight="option.autoCropHeight"
             :fixedBox="option.fixedBox"
-            @realTime="realTime"
-          ></vueCropper>
+            @realTime="realTime"></vueCropper>
         </div>
         <div class="previewBox">
           <div :style="previews.div" class="preview">
@@ -123,8 +122,8 @@
         </div>
       </el-row>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="editAvatarDialog = false">取 消</el-button>
         <el-button type="primary" @click="saveEditAvatar">确 定</el-button>
+        <el-button @click="editAvatarDialog = false">取 消</el-button>
       </span>
     </el-dialog>
 
@@ -160,13 +159,14 @@
 
 
         <el-form-item prop="phone" label="电话：" :label-width="formLabelWidth">
-          <el-input v-model="addAndEditFormData.phone" placeholder="请输入电话" style="width:90%" type="number" min="0" clearable
+          <el-input v-model="addAndEditFormData.phone" placeholder="请输入电话" style="width:90%" type="number" min="0"
+                    clearable
                     autosize></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handleConfirmEvent('addAndEditElForm')">确 定</el-button>
-        <el-button @click="handleDialogClose">返 回</el-button>
+        <el-button @click="handleDialogClose">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -200,8 +200,7 @@ export default {
       classIds: [],
 
       // 头像相关参数
-      // avatarURL: '../../assets/img/w1.png',
-      avatarURL:  require("@/assets/img/w1.png"),
+      avatarURL: require("@/assets/img/w1.png"),
       editAvatarDialog: false,
       previews: {},
       option: {
@@ -365,6 +364,10 @@ export default {
   margin: 10px 30%;
 }
 
+.imgTitle {
+  /*margin-top: 6px;*/
+}
+
 /*用户头像修改*/
 .previewBox {
   text-align: center;