reghao 1 jaar geleden
bovenliggende
commit
72d31c8917
4 gewijzigde bestanden met toevoegingen van 41 en 41 verwijderingen
  1. 4 4
      src/router/my.js
  2. 1 1
      src/views/Index.vue
  3. 9 9
      src/views/my/My.vue
  4. 27 27
      src/views/my/MyProfile.vue

+ 4 - 4
src/router/my.js

@@ -21,25 +21,25 @@ export default {
       meta: { needAuth: true }
     },
     {
-      path: '/my/account/contact',
+      path: '/my/contact',
       name: '联系人',
       component: MyContact,
       meta: { needAuth: true }
     },
     {
-      path: '/my/account/realname',
+      path: '/my/realname',
       name: '实名认证',
       component: MyRealname,
       meta: { needAuth: true }
     },
     {
-      path: '/my/account/vip',
+      path: '/my/vip',
       name: '小会员',
       component: MyVip,
       meta: { needAuth: true }
     },
     {
-      path: '/my/account/wallet',
+      path: '/my/wallet',
       name: '钱包',
       component: MyWallet,
       meta: { needAuth: true }

+ 1 - 1
src/views/Index.vue

@@ -19,7 +19,7 @@ export default {
     return {
       isCollapse: false,
       navList: [
-        { path: '/my/account', name: '我的帐号', icon: 'el-icon-upload' }
+        { path: '/my', name: '我的帐号', icon: 'el-icon-upload' }
       ]
     }
   },

+ 9 - 9
src/views/my/My.vue

@@ -40,25 +40,25 @@
           class="el-menu-vertical-demo"
           :unique-opened="true"
         >
-          <el-menu-item index="/my/account/contact">
+          <el-menu-item index="/my/contact">
             <i class="el-icon-user" />
             <span slot="title">联系人</span>
           </el-menu-item>
-          <el-menu-item index="/my/account/realname">
-            <i class="el-icon-film" />
-            <span slot="title">实名认证</span>
+          <el-menu-item index="/my/message">
+            <i class="el-icon-message" />
+            <span slot="title">我的消息</span>
           </el-menu-item>
-          <el-menu-item index="/my/account/vip">
+          <el-menu-item index="/my/vip">
             <i class="el-icon-film" />
             <span slot="title">我的会员</span>
           </el-menu-item>
-          <el-menu-item index="/my/account/wallet">
+          <el-menu-item index="/my/wallet">
             <i class="el-icon-wallet" />
             <span slot="title">我的钱包</span>
           </el-menu-item>
-          <el-menu-item index="/my/message">
-            <i class="el-icon-message" />
-            <span slot="title">我的消息</span>
+          <el-menu-item index="/my/realname">
+            <i class="el-icon-film" />
+            <span slot="title">实名认证</span>
           </el-menu-item>
         </el-menu>
       </el-aside>

+ 27 - 27
src/views/my/MyProfile.vue

@@ -1,31 +1,5 @@
 <template>
   <el-row class="movie-list">
-    <el-col :md="8" style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
-      <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>更新我的头像</span>
-          </div>
-          <div class="text item">
-            <el-tooltip class="item" effect="dark" content="点击更新我的头像" placement="top-end">
-              <el-upload
-                class="avatar-uploader"
-                :action="imgOssUrl"
-                :headers="imgHeaders"
-                :data="imgData"
-                :with-credentials="true"
-                :show-file-list="false"
-                :before-upload="beforeAvatarUpload"
-                :on-success="handleAvatarSuccess"
-              >
-                <img v-if="loginUser" :src="loginUser.avatarUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon" />
-              </el-upload>
-            </el-tooltip>
-          </div>
-        </el-card>
-      </el-row>
-    </el-col>
     <el-col :md="8" style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
       <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
         <el-card class="box-card">
@@ -62,13 +36,39 @@
         </el-card>
       </el-row>
     </el-col>
+    <el-col :md="8" style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
+      <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>更新我的头像</span>
+          </div>
+          <div class="text item">
+            <el-tooltip class="item" effect="dark" content="点击更新我的头像" placement="top-end">
+              <el-upload
+                class="avatar-uploader"
+                :action="imgOssUrl"
+                :headers="imgHeaders"
+                :data="imgData"
+                :with-credentials="true"
+                :show-file-list="false"
+                :before-upload="beforeAvatarUpload"
+                :on-success="handleAvatarSuccess"
+              >
+                <img v-if="loginUser" :src="loginUser.avatarUrl" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon" />
+              </el-upload>
+            </el-tooltip>
+          </div>
+        </el-card>
+      </el-row>
+    </el-col>
   </el-row>
 </template>
 
 <script>
 import { updateAvatar } from '@/api/account'
 import { getAuthedUser, updateAuthedUser } from '@/utils/auth'
-import {getAvatarChannelInfo} from "@/api/file";
+import { getAvatarChannelInfo } from '@/api/file'
 
 export default {
   name: 'MyProfile',